GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Link and distribute notices tagged for a group alias 

Correctly link and distribute notices tagged for a group alias. Added
a helper function, getForNickname(), to User_group, to make it easier
to get a group by its nickname or aliases.
This commit is contained in:
Evan Prodromou 2009-06-14 23:43:47 -07:00
parent ecbd7718d5
commit 1b6b00a6d0
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/Notice.php
View File

@ -752,16 +752,16 @@ class Notice extends Memcached_DataObject
foreach (array_unique($match[1]) as $nickname) {
/* XXX: remote groups. */
$group = User_group::staticGet('nickname', $nickname);
$group = User_group::getForNickname($nickname);
if (!$group) {
if (empty($group)) {
continue;
}
// we automatically add a tag for every group name, too
$tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($nickname),
'notice_id' => $this->id));
'notice_id' => $this->id));
if (is_null($tag)) {
$this->saveTag($nickname);

14
classes/User_group.php
View File

@ -225,4 +225,18 @@ class User_group extends Memcached_DataObject
return true;
}
static function getForNickname($nickname)
{
$nickname = common_canonical_nickname($nickname);
$group = User_group::staticGet('nickname', $nickname);
if (!empty($group)) {
return $group;
}
$alias = Group_alias::staticGet('alias', $nickname);
if (!empty($alias)) {
return User_group::staticGet('id', $alias->group_id);
}
return null;
}
}

2
lib/util.php
View File

@ -591,7 +591,7 @@ function common_at_link($sender_id, $nickname)
function common_group_link($sender_id, $nickname)
{
$sender = Profile::staticGet($sender_id);
$group = User_group::staticGet('nickname', common_canonical_nickname($nickname));
$group = User_group::getForNickname($nickname);
if ($group && $sender->isMember($group)) {
$attrs = array('href' => $group->permalink(),
'class' => 'url');