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

Subscription_queue::start does not mean Subscription exists

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-03-04 11:49:54 +01:00
parent ec4e432d55
commit 284705eeb8
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/Subscription.php
View File

@ -94,9 +94,12 @@ class Subscription extends Managed_DataObject
if (Event::handle('StartSubscribe', array($subscriber, $other))) { if (Event::handle('StartSubscribe', array($subscriber, $other))) {
$otherUser = User::getKV('id', $other->id); $otherUser = User::getKV('id', $other->id);
if ($otherUser instanceof User && $otherUser->subscribe_policy == User::SUBSCRIBE_POLICY_MODERATE && !$force) { if ($otherUser instanceof User && $otherUser->subscribe_policy == User::SUBSCRIBE_POLICY_MODERATE && !$force) {
// Will throw an AlreadyFulfilledException if this queue item already exists. try {
$sub = Subscription_queue::saveNew($subscriber, $other); $sub = Subscription_queue::saveNew($subscriber, $other);
$sub->notify(); $sub->notify();
} catch (AlreadyFulfilledException $e) {
$sub = Subscription_queue::getSubQueue($subscriber, $other);
}
} else { } else {
$sub = self::saveNew($subscriber->id, $other->id); $sub = self::saveNew($subscriber->id, $other->id);
$sub->notify(); $sub->notify();
@ -125,7 +128,7 @@ class Subscription extends Managed_DataObject
} }
} }
if ($sub instanceof Subscription) { // i.e. not SubscriptionQueue if ($sub instanceof Subscription) { // i.e. not Subscription_queue
Event::handle('EndSubscribe', array($subscriber, $other)); Event::handle('EndSubscribe', array($subscriber, $other));
} }
} }
@ -138,7 +141,6 @@ class Subscription extends Managed_DataObject
try { try {
$sub = self::start($subscriber, $other, $force); $sub = self::start($subscriber, $other, $force);
} catch (AlreadyFulfilledException $e) { } catch (AlreadyFulfilledException $e) {
// Nothing to see here, move along...
return self::getSubscription($subscriber, $other); return self::getSubscription($subscriber, $other);
} }
return $sub; return $sub;

12
classes/Subscription_queue.php
View File

@ -54,6 +54,18 @@ class Subscription_queue extends Managed_DataObject
return ($sub instanceof Subscription_queue); return ($sub instanceof Subscription_queue);
} }
static function getSubQueue(Profile $subscriber, Profile $other)
{
// This is essentially a pkeyGet but we have an object to return in NoResultException
$sub = new Subscription_queue();
$sub->subscriber = $subscriber->id;
$sub->subscribed = $other->id;
if (!$sub->find(true)) {
throw new NoResultException($sub);
}
return $sub;
}
/** /**
* Complete a pending subscription, as we've got approval of some sort. * Complete a pending subscription, as we've got approval of some sort.
* *