X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FUser_group.php;h=df54b7987c7d7228ca507cd9b842a159b095005a;hb=be0c10e8f6f9c60b1cb840cda9ac6f42c8289738;hp=92092588746b10d2b0e70cbc45a0c450383f38a7;hpb=6ed66d9c7617332e9ea253e1f48583b4d9dbf45c;p=quix0rs-gnu-social.git diff --git a/classes/User_group.php b/classes/User_group.php index 9209258874..df54b7987c 100644 --- a/classes/User_group.php +++ b/classes/User_group.php @@ -15,18 +15,18 @@ class User_group extends Managed_DataObject public $__table = 'user_group'; // table name public $id; // int(4) primary_key not_null public $nickname; // varchar(64) - public $fullname; // varchar(255) - public $homepage; // varchar(255) + public $fullname; // varchar(191) not 255 because utf8mb4 takes more space + public $homepage; // varchar(191) not 255 because utf8mb4 takes more space public $description; // text - public $location; // varchar(255) - public $original_logo; // varchar(255) - public $homepage_logo; // varchar(255) - public $stream_logo; // varchar(255) - public $mini_logo; // varchar(255) + public $location; // varchar(191) not 255 because utf8mb4 takes more space + public $original_logo; // varchar(191) not 255 because utf8mb4 takes more space + public $homepage_logo; // varchar(191) not 255 because utf8mb4 takes more space + public $stream_logo; // varchar(191) not 255 because utf8mb4 takes more space + public $mini_logo; // varchar(191) not 255 because utf8mb4 takes more space public $created; // datetime not_null default_0000-00-00%2000%3A00%3A00 public $modified; // timestamp not_null default_CURRENT_TIMESTAMP - public $uri; // varchar(255) unique_key - public $mainpage; // varchar(255) + public $uri; // varchar(191) unique_key not 255 because utf8mb4 takes more space + public $mainpage; // varchar(191) not 255 because utf8mb4 takes more space public $join_policy; // tinyint public $force_scope; // tinyint @@ -41,27 +41,28 @@ class User_group extends Managed_DataObject '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'), - 'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL, cached so we dont regenerate'), + 'fullname' => array('type' => 'varchar', 'length' => 191, 'description' => 'display name'), + 'homepage' => array('type' => 'varchar', 'length' => 191, 'description' => 'URL, cached so we dont regenerate'), 'description' => array('type' => 'text', 'description' => 'group description'), - 'location' => array('type' => 'varchar', 'length' => 255, 'description' => 'related physical location, if any'), + 'location' => array('type' => 'varchar', 'length' => 191, 'description' => 'related physical location, if any'), - 'original_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'original size logo'), - 'homepage_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'homepage (profile) size logo'), - 'stream_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'stream-sized logo'), - 'mini_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'mini logo'), + 'original_logo' => array('type' => 'varchar', 'length' => 191, 'description' => 'original size logo'), + 'homepage_logo' => array('type' => 'varchar', 'length' => 191, 'description' => 'homepage (profile) size logo'), + 'stream_logo' => array('type' => 'varchar', 'length' => 191, 'description' => 'stream-sized logo'), + 'mini_logo' => array('type' => 'varchar', 'length' => 191, 'description' => 'mini logo'), 'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'), 'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'), - 'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universal identifier'), - 'mainpage' => array('type' => 'varchar', 'length' => 255, 'description' => 'page for group info to link to'), + 'uri' => array('type' => 'varchar', 'length' => 191, 'description' => 'universal identifier'), + 'mainpage' => array('type' => 'varchar', 'length' => 191, 'description' => 'page for group info to link to'), 'join_policy' => array('type' => 'int', 'size' => 'tiny', 'description' => '0=open; 1=requires admin approval'), 'force_scope' => array('type' => 'int', 'size' => 'tiny', 'description' => '0=never,1=sometimes,-1=always'), ), 'primary key' => array('id'), 'unique keys' => array( 'user_group_uri_key' => array('uri'), +// when it's safe and everyone's run upgrade.php 'user_profile_id_key' => array('profile_id'), ), 'foreign keys' => array( 'user_group_id_fkey' => array('profile', array('profile_id' => 'id')), @@ -73,23 +74,28 @@ class User_group extends Managed_DataObject ); } - protected $_profile = null; + protected $_profile = array(); /** * @return Profile * - * @throws UserNoProfileException if user has no profile + * @throws GroupNoProfileException 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)) { + if (!isset($this->_profile[$this->profile_id])) { + $profile = Profile::getKV('id', $this->profile_id); + if (!$profile instanceof Profile) { throw new GroupNoProfileException($this); } + $this->_profile[$this->profile_id] = $profile; } + return $this->_profile[$this->profile_id]; + } - return $this->_profile; + public function getNickname() + { + return $this->getProfile()->getNickname(); } public static function defaultLogo($size) @@ -107,7 +113,7 @@ class User_group extends Managed_DataObject // normally stored in mainpage, but older ones may be null if (!empty($this->mainpage)) { $url = $this->mainpage; - } else { + } elseif ($this->isLocal()) { $url = common_local_url('showgroup', array('nickname' => $this->nickname)); } @@ -122,7 +128,7 @@ class User_group extends Managed_DataObject if (Event::handle('StartUserGroupGetUri', array($this, &$uri))) { if (!empty($this->uri)) { $uri = $this->uri; - } else { + } elseif ($this->isLocal()) { $uri = common_local_url('groupbyid', array('id' => $this->id)); } @@ -135,8 +141,10 @@ class User_group extends Managed_DataObject { $url = null; if (Event::handle('StartUserGroupPermalink', array($this, &$url))) { - $url = common_local_url('groupbyid', - array('id' => $this->id)); + if ($this->isLocal()) { + $url = common_local_url('groupbyid', + array('id' => $this->id)); + } } Event::handle('EndUserGroupPermalink', array($this, &$url)); return $url; @@ -229,7 +237,11 @@ class User_group extends Managed_DataObject public function getAdminCount() { - return $this->getAdmins()->N; + $block = new Group_member(); + $block->group_id = $this->id; + $block->is_admin = 1; + + return $block->count(); } public function getMemberCount() @@ -274,62 +286,47 @@ class User_group extends Managed_DataObject return $queue->count(); } - function getAdmins($offset=0, $limit=null) + function getAdmins($offset=null, $limit=null) // offset is null because DataObject wants it, 0 would mean no results { - $qry = - 'SELECT profile.* ' . - 'FROM profile JOIN group_member '. - 'ON profile.id = group_member.profile_id ' . - 'WHERE group_member.group_id = %d ' . - 'AND group_member.is_admin = 1 ' . - 'ORDER BY group_member.modified ASC '; - - if ($limit != null) { - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; - } - } - $admins = new Profile(); + $admins->joinAdd(array('id', 'group_member:profile_id')); + $admins->whereAdd(sprintf('group_member.group_id = %u AND group_member.is_admin = 1', $this->id)); + $admins->orderBy('group_member.modified ASC'); + $admins->limit($offset, $limit); + $admins->find(); - $admins->query(sprintf($qry, $this->id)); return $admins; } - function getBlocked($offset=0, $limit=null) + function getBlocked($offset=null, $limit=null) // offset is null because DataObject wants it, 0 would mean no results { - $qry = - 'SELECT profile.* ' . - 'FROM profile JOIN group_block '. - 'ON profile.id = group_block.blocked ' . - 'WHERE group_block.group_id = %d ' . - 'ORDER BY group_block.modified DESC '; - - if ($limit != null) { - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; - } - } - $blocked = new Profile(); + $blocked->joinAdd(array('id', 'group_block:blocked')); + $blocked->whereAdd(sprintf('group_block.group_id = %u', $this->id)); + $blocked->orderBy('group_block.modified DESC'); + $blocked->limit($offset, $limit); + $blocked->find(); - $blocked->query(sprintf($qry, $this->id)); return $blocked; } function setOriginal($filename) { - $imagefile = new ImageFile($this->id, Avatar::path($filename)); + // This should be handled by the Profile->setOriginal function so user and group avatars are handled the same + $imagefile = new ImageFile(null, Avatar::path($filename)); + + $sizes = array('homepage_logo' => AVATAR_PROFILE_SIZE, + 'stream_logo' => AVATAR_STREAM_SIZE, + 'mini_logo' => AVATAR_MINI_SIZE); $orig = clone($this); $this->original_logo = Avatar::url($filename); - $this->homepage_logo = Avatar::url($imagefile->resize(AVATAR_PROFILE_SIZE)); - $this->stream_logo = Avatar::url($imagefile->resize(AVATAR_STREAM_SIZE)); - $this->mini_logo = Avatar::url($imagefile->resize(AVATAR_MINI_SIZE)); + foreach ($sizes as $name=>$size) { + $filename = Avatar::filename($this->profile_id, image_type_to_extension($imagefile->preferredType()), + $size, common_timestamp()); + $imagefile->resizeTo(Avatar::path($filename), array('width'=>$size, 'height'=>$size)); + $this->$name = Avatar::url($filename); + } common_debug(common_log_objstring($this)); return $this->update($orig); } @@ -418,14 +415,14 @@ class User_group extends Managed_DataObject return true; } - static function getForNickname($nickname, $profile=null) + static function getForNickname($nickname, Profile $profile=null) { $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); @@ -434,13 +431,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; @@ -630,7 +626,7 @@ class User_group extends Managed_DataObject $profile->query('BEGIN'); $id = $profile->insert(); - if (empty($id)) { + if ($id === false) { $profile->query('ROLLBACK'); throw new ServerException(_('Profile insertion failed')); } @@ -654,7 +650,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.')); @@ -727,11 +723,11 @@ 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 (empty($this->id)) { common_log(LOG_WARNING, "Ambiguous User_group->delete(); skipping related tables."); - return parent::delete(); + return parent::delete($useWhere); } try { @@ -771,6 +767,8 @@ class User_group extends Managed_DataObject // 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()); + + // $this->isLocal() but we're using the resulting object $local = Local_group::getKV('group_id', $this->id); if ($local instanceof Local_group) { $local->delete(); @@ -779,7 +777,42 @@ class User_group extends Managed_DataObject // blow the cached ids self::blow('user_group:notice_ids:%d', $this->id); - return parent::delete(); + 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 instanceof Local_group) { + common_debug("Updating Local_group ({$this->id}) nickname from {$dataObject->nickname} to {$this->nickname}"); + $local->setNickname($this->nickname); + } + } + + // 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')); + } + + return parent::update($dataObject); } function isPrivate() @@ -787,4 +820,43 @@ class User_group extends Managed_DataObject return ($this->join_policy == self::JOIN_POLICY_MODERATE && $this->force_scope == 1); } + + public function isLocal() + { + $local = Local_group::getKV('group_id', $this->id); + return ($local instanceof Local_group); + } + + 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); + } }