Force group scope on notices sent to a private-only group
For groups that require a private scope, we force every notice to be limited to group scope. Changed the group-discovery code so we only get groups once -- regardless if they were provided or not.
This commit is contained in:
parent
b41c62a27c
commit
660f1cd6b8
|
@ -433,6 +433,22 @@ class Notice extends Memcached_DataObject
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Force the scope for private groups
|
||||||
|
|
||||||
|
if (!isset($groups)) {
|
||||||
|
$groups = self::groupsFromText($notice->content, $profile);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($groups as $groupId) {
|
||||||
|
$group = User_group::staticGet('id', $groupId);
|
||||||
|
if (!empty($group)) {
|
||||||
|
if ($group->force_scope) {
|
||||||
|
$notice->scope |= Notice::GROUP_SCOPE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (Event::handle('StartNoticeSave', array(&$notice))) {
|
if (Event::handle('StartNoticeSave', array(&$notice))) {
|
||||||
|
|
||||||
// XXX: some of these functions write to the DB
|
// XXX: some of these functions write to the DB
|
||||||
|
@ -496,11 +512,9 @@ class Notice extends Memcached_DataObject
|
||||||
|
|
||||||
// Note: groups may save tags, so must be run after tags are saved
|
// Note: groups may save tags, so must be run after tags are saved
|
||||||
// to avoid errors on duplicates.
|
// to avoid errors on duplicates.
|
||||||
if (isset($groups)) {
|
// Note: groups should always be set.
|
||||||
$notice->saveKnownGroups($groups);
|
|
||||||
} else {
|
$notice->saveKnownGroups($groups);
|
||||||
$notice->saveGroups();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($urls)) {
|
if (isset($urls)) {
|
||||||
$notice->saveKnownUrls($urls);
|
$notice->saveKnownUrls($urls);
|
||||||
|
@ -940,7 +954,15 @@ class Notice extends Memcached_DataObject
|
||||||
common_log_db_error($gi, 'INSERT', __FILE__);
|
common_log_db_error($gi, 'INSERT', __FILE__);
|
||||||
}
|
}
|
||||||
|
|
||||||
// @fixme should we save the tags here or not?
|
// we automatically add a tag for every group name, too
|
||||||
|
|
||||||
|
$tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($group->nickname),
|
||||||
|
'notice_id' => $this->id));
|
||||||
|
|
||||||
|
if (is_null($tag)) {
|
||||||
|
$this->saveTag($group->nickname);
|
||||||
|
}
|
||||||
|
|
||||||
$groups[] = clone($group);
|
$groups[] = clone($group);
|
||||||
} else {
|
} else {
|
||||||
common_log(LOG_ERR, "Local delivery to group id $id skipped, doesn't exist");
|
common_log(LOG_ERR, "Local delivery to group id $id skipped, doesn't exist");
|
||||||
|
@ -962,36 +984,19 @@ class Notice extends Memcached_DataObject
|
||||||
return array();
|
return array();
|
||||||
}
|
}
|
||||||
|
|
||||||
$groups = array();
|
|
||||||
|
|
||||||
/* extract all !group */
|
|
||||||
$count = preg_match_all('/(?:^|\s)!(' . Nickname::DISPLAY_FMT . ')/',
|
|
||||||
strtolower($this->content),
|
|
||||||
$match);
|
|
||||||
if (!$count) {
|
|
||||||
return $groups;
|
|
||||||
}
|
|
||||||
|
|
||||||
$profile = $this->getProfile();
|
$profile = $this->getProfile();
|
||||||
|
|
||||||
|
$groups = self::groupsFromText($this->content, $profile);
|
||||||
|
|
||||||
/* Add them to the database */
|
/* Add them to the database */
|
||||||
|
|
||||||
foreach (array_unique($match[1]) as $nickname) {
|
foreach ($groups as $group) {
|
||||||
/* XXX: remote groups. */
|
/* XXX: remote groups. */
|
||||||
$group = User_group::getForNickname($nickname, $profile);
|
|
||||||
|
|
||||||
if (empty($group)) {
|
if (empty($group)) {
|
||||||
continue;
|
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));
|
|
||||||
|
|
||||||
if (is_null($tag)) {
|
|
||||||
$this->saveTag($nickname);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($profile->isMember($group)) {
|
if ($profile->isMember($group)) {
|
||||||
|
|
||||||
|
@ -2180,4 +2185,27 @@ class Notice extends Memcached_DataObject
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static function groupsFromText($text, $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 = User_group::getForNickname($nickname, $profile);
|
||||||
|
if (!empty($group) && $profile->isMember($group)) {
|
||||||
|
$groups[] = $group->id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $groups;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user