X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FUser_group.php;h=22b8d0bc04c7ab3004c93f9450ad8eaa9d00e3b2;hb=9b6633698c5abda07df3102b62c37cfb0847e1ea;hp=50f4b7ddc7cb232e10e1c5dd60c862f71b6fc746;hpb=64dbd93534444754bc39fafbc3a398b72809fc45;p=quix0rs-gnu-social.git diff --git a/classes/User_group.php b/classes/User_group.php index 50f4b7ddc7..22b8d0bc04 100644 --- a/classes/User_group.php +++ b/classes/User_group.php @@ -38,6 +38,7 @@ class User_group extends Managed_DataObject return array( 'fields' => array( 'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'), + 'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'), 'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'nickname for addressing'), 'fullname' => array('type' => 'varchar', 'length' => 255, 'description' => 'display name'), @@ -62,12 +63,35 @@ class User_group extends Managed_DataObject 'unique keys' => array( 'user_group_uri_key' => array('uri'), ), + 'foreign keys' => array( + 'user_group_id_fkey' => array('profile', array('profile_id' => 'id')), + ), 'indexes' => array( 'user_group_nickname_idx' => array('nickname'), + 'user_group_profile_id_idx' => array('profile_id'), //make this unique in future ), ); } + protected $_profile = null; + + /** + * @return Profile + * + * @throws UserNoProfileException if user has no profile + */ + public function getProfile() + { + if (!($this->_profile instanceof Profile)) { + $this->_profile = Profile::getKV('id', $this->profile_id); + if (!($this->_profile instanceof Profile)) { + throw new GroupNoProfileException($this); + } + } + + return $this->_profile; + } + public static function defaultLogo($size) { static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile', @@ -125,13 +149,6 @@ class User_group extends Managed_DataObject return $stream->getNotices($offset, $limit, $since_id, $max_id); } - - function allowedNickname($nickname) - { - static $blacklist = array('new'); - return !in_array($nickname, $blacklist); - } - function getMembers($offset=0, $limit=null) { $ids = null; if (is_null($limit) || $offset + $limit > User_group::CACHE_WINDOW) { @@ -210,7 +227,12 @@ class User_group extends Managed_DataObject return $members; } - function getMemberCount() + public function getAdminCount() + { + return $this->getAdmins()->N; + } + + public function getMemberCount() { $key = sprintf("group:member_count:%d", $this->id); @@ -382,7 +404,10 @@ class User_group extends Managed_DataObject } foreach ($to_insert as $insalias) { - $alias->alias = $insalias; + if ($insalias === $this->nickname) { + continue; + } + $alias->alias = Nickname::normalize($insalias, true); $result = $alias->insert(); if (!$result) { common_log_db_error($alias, 'INSERT', __FILE__); @@ -393,14 +418,14 @@ class User_group extends Managed_DataObject return true; } - static function getForNickname($nickname, $profile=null) + static function getForNickname($nickname, Profile $profile=null) { - $nickname = common_canonical_nickname($nickname); + $nickname = Nickname::normalize($nickname); // Are there any matching remote groups this profile's in? - if ($profile) { + if ($profile instanceof Profile) { $group = $profile->getGroups(0, null); - while ($group->fetch()) { + while ($group instanceof User_group && $group->fetch()) { if ($group->nickname == $nickname) { // @fixme is this the best way? return clone($group); @@ -409,13 +434,12 @@ class User_group extends Managed_DataObject } // If not, check local groups. - $group = Local_group::getKV('nickname', $nickname); - if (!empty($group)) { + if ($group instanceof Local_group) { return User_group::getKV('id', $group->group_id); } $alias = Group_alias::getKV('alias', $nickname); - if (!empty($alias)) { + if ($alias instanceof Group_alias) { return User_group::getKV('id', $alias->group_id); } return null; @@ -521,19 +545,6 @@ class User_group extends Managed_DataObject return $xs->getString(); } - /** - * Returns an XML string fragment with group information as an - * Activity Streams element. - * - * Assumes that 'activity' namespace has been previously defined. - * - * @return string - */ - function asActivitySubject() - { - return $this->asActivityNoun('subject'); - } - /** * Returns an XML string fragment with group information as an * Activity Streams noun object with the given element type. @@ -569,6 +580,8 @@ class User_group extends Managed_DataObject } } + $fields['nickname'] = Nickname::normalize($fields['nickname']); + // MAGICALLY put fields into current scope // @fixme kill extract(); it makes debugging absurdly hard @@ -588,8 +601,6 @@ class User_group extends Managed_DataObject $group = new User_group(); - $group->query('BEGIN'); - if (empty($uri)) { // fill in later... $uri = null; @@ -598,14 +609,33 @@ class User_group extends Managed_DataObject $mainpage = common_local_url('showgroup', array('nickname' => $nickname)); } - $group->nickname = $nickname; - $group->fullname = $fullname; - $group->homepage = $homepage; - $group->description = $description; - $group->location = $location; - $group->uri = $uri; - $group->mainpage = $mainpage; - $group->created = common_sql_now(); + // We must create a new, incrementally assigned profile_id + $profile = new Profile(); + $profile->nickname = $nickname; + $profile->fullname = $fullname; + $profile->profileurl = $mainpage; + $profile->homepage = $homepage; + $profile->bio = $description; + $profile->location = $location; + $profile->created = common_sql_now(); + + $group->nickname = $profile->nickname; + $group->fullname = $profile->fullname; + $group->homepage = $profile->homepage; + $group->description = $profile->bio; + $group->location = $profile->location; + $group->mainpage = $profile->profileurl; + $group->created = $profile->created; + + $profile->query('BEGIN'); + $id = $profile->insert(); + if ($id === false) { + $profile->query('ROLLBACK'); + throw new ServerException(_('Profile insertion failed')); + } + + $group->profile_id = $id; + $group->uri = $uri; if (isset($fields['join_policy'])) { $group->join_policy = intval($fields['join_policy']); @@ -623,7 +653,7 @@ class User_group extends Managed_DataObject $result = $group->insert(); - if (!$result) { + if ($result === false) { common_log_db_error($group, 'INSERT', __FILE__); // TRANS: Server exception thrown when creating a group failed. throw new ServerException(_('Could not create group.')); @@ -680,11 +710,11 @@ class User_group extends Managed_DataObject } } - $group->query('COMMIT'); - Event::handle('EndGroupSave', array($group)); } + $profile->query('COMMIT'); + return $group; } @@ -696,53 +726,94 @@ class User_group extends Managed_DataObject * are not de-cached in the UI, including the sidebar lists on * GroupsAction */ - function delete() + function delete($useWhere=false) { - if ($this->id) { + if (empty($this->id)) { + common_log(LOG_WARNING, "Ambiguous User_group->delete(); skipping related tables."); + return parent::delete($useWhere); + } - // Safe to delete in bulk for now + try { + $profile = $this->getProfile(); + $profile->delete(); + } catch (GroupNoProfileException $unp) { + common_log(LOG_INFO, "Group {$this->nickname} has no profile; continuing deletion."); + } - $related = array('Group_inbox', - 'Group_block', - 'Group_member', - 'Related_group'); + // Safe to delete in bulk for now - Event::handle('UserGroupDeleteRelated', array($this, &$related)); + $related = array('Group_inbox', + 'Group_block', + 'Group_member', + 'Related_group'); - foreach ($related as $cls) { + Event::handle('UserGroupDeleteRelated', array($this, &$related)); - $inst = new $cls(); - $inst->group_id = $this->id; + foreach ($related as $cls) { + $inst = new $cls(); + $inst->group_id = $this->id; - if ($inst->find()) { - while ($inst->fetch()) { - $dup = clone($inst); - $dup->delete(); - } + if ($inst->find()) { + while ($inst->fetch()) { + $dup = clone($inst); + $dup->delete(); } } + } + + // And related groups in the other direction... + $inst = new Related_group(); + $inst->related_group_id = $this->id; + $inst->delete(); + + // Aliases and the local_group entry need to be cleared explicitly + // or we'll miss clearing some cache keys; that can make it hard + // to create a new group with one of those names or aliases. + $this->setAliases(array()); + $local = Local_group::getKV('group_id', $this->id); + if ($local instanceof Local_group) { + $local->delete(); + } - // And related groups in the other direction... - $inst = new Related_group(); - $inst->related_group_id = $this->id; - $inst->delete(); + // blow the cached ids + self::blow('user_group:notice_ids:%d', $this->id); - // Aliases and the local_group entry need to be cleared explicitly - // or we'll miss clearing some cache keys; that can make it hard - // to create a new group with one of those names or aliases. - $this->setAliases(array()); + return parent::delete($useWhere); + } + + public function update($dataObject=false) + { + // Whenever the User_group is updated, find the Local_group + // and update its nickname too. + if ($this->nickname != $dataObject->nickname) { $local = Local_group::getKV('group_id', $this->id); - if ($local) { - $local->delete(); + if ($local instanceof Local_group) { + common_debug("Updating Local_group ({$this->id}) nickname from {$dataObject->nickname} to {$this->nickname}"); + $local->setNickname($this->nickname); } + } - // blow the cached ids - self::blow('user_group:notice_ids:%d', $this->id); - - } else { - common_log(LOG_WARNING, "Ambiguous user_group->delete(); skipping related tables."); + // Also make sure the Profile table is up to date! + $fields = array(/*group field => profile field*/ + 'nickname' => 'nickname', + 'fullname' => 'fullname', + 'mainpage' => 'profileurl', + 'homepage' => 'homepage', + 'description' => 'bio', + 'location' => 'location', + 'created' => 'created', + 'modified' => 'modified', + ); + $profile = $this->getProfile(); + $origpro = clone($profile); + foreach ($fields as $gf=>$pf) { + $profile->$pf = $this->$gf; + } + if ($profile->update($origpro) === false) { + throw new ServerException(_('Unable to update profile')); } - parent::delete(); + + return parent::update($dataObject); } function isPrivate() @@ -750,4 +821,37 @@ class User_group extends Managed_DataObject return ($this->join_policy == self::JOIN_POLICY_MODERATE && $this->force_scope == 1); } + + static function groupsFromText($text, Profile $profile) + { + $groups = array(); + + /* extract all !group */ + $count = preg_match_all('/(?:^|\s)!(' . Nickname::DISPLAY_FMT . ')/', + strtolower($text), + $match); + + if (!$count) { + return $groups; + } + + foreach (array_unique($match[1]) as $nickname) { + $group = self::getForNickname($nickname, $profile); + if ($group instanceof User_group && $profile->isMember($group)) { + $groups[] = clone($group); + } + } + + return $groups; + } + + static function idsFromText($text, Profile $profile) + { + $ids = array(); + $groups = self::groupsFromText($text, $profile); + foreach ($groups as $group) { + $ids[$group->id] = true; + } + return array_keys($ids); + } }