Force notices to DMs when privacy = always
This commit is contained in:
parent
80a4b9c76f
commit
1d439ef5d8
|
@ -377,6 +377,86 @@ class GroupPrivateMessagePlugin extends Plugin
|
||||||
$action->elementEnd('li');
|
$action->elementEnd('li');
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When saving a notice, check its groups. If any of them has
|
||||||
|
* privacy == always, force a group private message to all mentioned groups.
|
||||||
|
* If any of the groups disallows private messages, skip it.
|
||||||
|
*
|
||||||
|
* @param
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
function onStartNoticeSave(&$notice) {
|
||||||
|
|
||||||
|
// Look for group tags
|
||||||
|
// FIXME: won't work for remote groups
|
||||||
|
|
||||||
|
$count = preg_match_all('/(?:^|\s)!([A-Za-z0-9]{1,64})/',
|
||||||
|
strtolower($notice->content),
|
||||||
|
$match);
|
||||||
|
|
||||||
|
$groups = array();
|
||||||
|
$ignored = array();
|
||||||
|
|
||||||
|
$forcePrivate = false;
|
||||||
|
|
||||||
|
if ($count > 0) {
|
||||||
|
|
||||||
|
/* Add them to the database */
|
||||||
|
|
||||||
|
foreach (array_unique($match[1]) as $nickname) {
|
||||||
|
|
||||||
|
$group = User_group::getForNickname($nickname, $profile);
|
||||||
|
|
||||||
|
if (empty($group)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$gps = Group_privacy_settings::forGroup($group);
|
||||||
|
|
||||||
|
switch ($gps->allow_privacy) {
|
||||||
|
case Group_privacy_settings::ALWAYS:
|
||||||
|
$forcePrivate = true;
|
||||||
|
// fall through
|
||||||
|
case Group_privacy_settings::SOMETIMES:
|
||||||
|
$groups[] = $group;
|
||||||
|
break;
|
||||||
|
case Group_privacy_settings::NEVER:
|
||||||
|
$ignored[] = $group;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($forcePrivate) {
|
||||||
|
|
||||||
|
foreach ($ignored as $group) {
|
||||||
|
common_log(LOG_NOTICE,
|
||||||
|
"Notice forced to group direct message ".
|
||||||
|
"but group ".$group->nickname." does not allow them.");
|
||||||
|
}
|
||||||
|
|
||||||
|
$user = User::staticGet('id', $notice->profile_id);
|
||||||
|
|
||||||
|
if (empty($user)) {
|
||||||
|
common_log(LOG_WARNING,
|
||||||
|
"Notice forced to group direct message ".
|
||||||
|
"but profile ".$notice->profile_id." is not a local user.");
|
||||||
|
} else {
|
||||||
|
foreach ($groups as $group) {
|
||||||
|
Group_message::send($user, $group, $notice->content);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Don't save the notice!
|
||||||
|
// FIXME: this is probably cheating.
|
||||||
|
throw new ClientException(sprintf(_('Forced notice to private group message.')),
|
||||||
|
200);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
function onPluginVersion(&$versions)
|
function onPluginVersion(&$versions)
|
||||||
{
|
{
|
||||||
|
|
|
@ -145,7 +145,7 @@ class Group_privacy_settings extends Memcached_DataObject
|
||||||
return array(false, false, false);
|
return array(false, false, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
function ensurePost($user, $group)
|
function forGroup($group)
|
||||||
{
|
{
|
||||||
$gps = Group_privacy_settings::staticGet('group_id', $group->id);
|
$gps = Group_privacy_settings::staticGet('group_id', $group->id);
|
||||||
|
|
||||||
|
@ -156,6 +156,13 @@ class Group_privacy_settings extends Memcached_DataObject
|
||||||
$gps->allow_sender = Group_privacy_settings::MEMBER;
|
$gps->allow_sender = Group_privacy_settings::MEMBER;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return $gps;
|
||||||
|
}
|
||||||
|
|
||||||
|
function ensurePost($user, $group)
|
||||||
|
{
|
||||||
|
$gps = self::forGroup($group);
|
||||||
|
|
||||||
if ($gps->allow_privacy == Group_privacy_settings::NEVER) {
|
if ($gps->allow_privacy == Group_privacy_settings::NEVER) {
|
||||||
throw new Exception(sprintf(_('Group %s does not allow private messages.'),
|
throw new Exception(sprintf(_('Group %s does not allow private messages.'),
|
||||||
$group->nickname));
|
$group->nickname));
|
||||||
|
|
Loading…
Reference in New Issue
Block a user