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

Make it clearer that we're handling group IDs

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-11-08 23:31:45 +01:00
parent acd4980ab4
commit d0e7203d88
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
classes/Notice.php
View File

@ -845,7 +845,6 @@ class Notice extends Managed_DataObject
// If the original is private to a group, and notice has no group specified, // If the original is private to a group, and notice has no group specified,
// make it to the same group(s) // make it to the same group(s)
if (empty($groups) && ($reply->scope & Notice::GROUP_SCOPE)) { if (empty($groups) && ($reply->scope & Notice::GROUP_SCOPE)) {
$groups = array();
$replyGroups = $reply->getGroups(); $replyGroups = $reply->getGroups();
foreach ($replyGroups as $group) { foreach ($replyGroups as $group) {
if ($actor->isMember($group)) { if ($actor->isMember($group)) {
@ -958,11 +957,11 @@ class Notice extends Managed_DataObject
// Save per-notice metadata... // Save per-notice metadata...
$mentions = array(); $mentions = array();
$groups = array(); $group_ids = array();
// This event lets plugins filter out non-local recipients (attentions we don't care about) // This event lets plugins filter out non-local recipients (attentions we don't care about)
// Used primarily for OStatus (and if we don't federate, all attentions would be local anyway) // Used primarily for OStatus (and if we don't federate, all attentions would be local anyway)
Event::handle('GetLocalAttentions', array($actor, $act->context->attention, &$mentions, &$groups)); Event::handle('GetLocalAttentions', array($actor, $act->context->attention, &$mentions, &$group_ids));
if (!empty($mentions)) { if (!empty($mentions)) {
$stored->saveKnownReplies($mentions); $stored->saveKnownReplies($mentions);
@ -980,7 +979,7 @@ class Notice extends Managed_DataObject
// to avoid errors on duplicates. // to avoid errors on duplicates.
// Note: groups should always be set. // Note: groups should always be set.
$stored->saveKnownGroups($groups); $stored->saveKnownGroups($group_ids);
if (!empty($urls)) { if (!empty($urls)) {
$stored->saveKnownUrls($urls); $stored->saveKnownUrls($urls);
@ -1505,13 +1504,8 @@ class Notice extends Managed_DataObject
* best with generalizations on user_group to support * best with generalizations on user_group to support
* remote groups better. * remote groups better.
*/ */
function saveKnownGroups($group_ids) function saveKnownGroups(array $group_ids)
{ {
if (!is_array($group_ids)) {
// TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
throw new ServerException(_('Bad type provided to saveKnownGroups.'));
}
$groups = array(); $groups = array();
foreach (array_unique($group_ids) as $id) { foreach (array_unique($group_ids) as $id) {
$group = User_group::getKV('id', $id); $group = User_group::getKV('id', $id);