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

If a user has a private stream, assume a moderated subscription policy

This commit is contained in:
Mikael Nordfeldth 2016-01-03 19:33:26 +01:00
parent df0f9547b5
commit b374e5f08b
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
classes/Profile.php
View File

@ -772,6 +772,25 @@ class Profile extends Managed_DataObject
return is_null($other) ? false : $other->isSubscribed($this);
}
function requiresSubscriptionApproval(Profile $other=null)
{
if (!$this->isLocal()) {
// We don't know for remote users, and we'll always be able to send
// the request. Whether it'll work immediately or require moderation
// can be determined in another function.
return false;
}
// Assume that profiles _we_ subscribe to are permitted. Could be made configurable.
if (!is_null($other) && $this->isSubscribed($other)) {
return false;
}
// If the local user either has a private stream (implies the following)
// or user has a moderation policy for new subscriptions, return true.
return $this->getUser()->private_stream || $this->getUser()->subscribe_policy === User::SUBSCRIBE_POLICY_MODERATE;
}
/**
* Check if a pending subscription request is outstanding for this...
*

5
classes/Subscription.php
View File

@ -92,8 +92,8 @@ class Subscription extends Managed_DataObject
}
if (Event::handle('StartSubscribe', array($subscriber, $other))) {
$otherUser = User::getKV('id', $other->id);
if ($otherUser instanceof User && $otherUser->subscribe_policy == User::SUBSCRIBE_POLICY_MODERATE && !$force) {
// unless subscription is forced, the user policy for subscription approvals is tested
if (!$force && $other->requiresSubscriptionApproval($subscriber)) {
try {
$sub = Subscription_queue::saveNew($subscriber, $other);
$sub->notify();
@ -101,6 +101,7 @@ class Subscription extends Managed_DataObject
$sub = Subscription_queue::getSubQueue($subscriber, $other);
}
} else {
$otherUser = User::getKV('id', $other->id);
$sub = self::saveNew($subscriber, $other);
$sub->notify();