Commit d534ea7b authored by mmn's avatar mmn

Try the whole Salmon action for AlreadyFulfilledException

If we have already fulfilled the action, we don't have to send an error back.
parent c1dc13be
......@@ -113,8 +113,7 @@ class UsersalmonAction extends SalmonAction
$oprofile = $this->ensureProfile();
if ($oprofile instanceof Ostatus_profile) {
common_log(LOG_INFO, sprintf('Setting up subscription from remote %s to local %s', $oprofile->getUri(), $this->target->getNickname()));
Subscription::start($oprofile->localProfile(), $this->target);
} else {
common_log(LOG_INFO, "Can't set up subscription from remote; missing profile.");
......@@ -135,8 +134,6 @@ class UsersalmonAction extends SalmonAction
Subscription::cancel($oprofile->localProfile(), $this->target);
} catch (NoProfileException $e) {
common_debug('Could not find profile for Subscription: '.$e->getMessage());
} catch (AlreadyFulfilledException $e) {
common_debug('Subscription did not exist, so there was nothing to cancel');
} else {
common_log(LOG_ERR, "Can't cancel subscription from remote, didn't find the profile");
......@@ -158,7 +155,7 @@ class UsersalmonAction extends SalmonAction
if ($old instanceof Fave) {
// TRANS: Client exception.
throw new ClientException(_m('This is already a favorite.'));
throw new AlreadyFulfilledException(_m('This is already a favorite.'));
if (!Fave::addNew($profile, $notice)) {
......@@ -180,7 +177,7 @@ class UsersalmonAction extends SalmonAction
'notice_id' => $notice->id));
if (!$fave instanceof Fave) {
// TRANS: Client exception.
throw new ClientException(_m('Notice was not favorited!'));
throw new AlreadyFulfilledException(_m('Notice was not favorited!'));
......@@ -77,10 +77,10 @@ class SalmonAction extends Action
common_log(LOG_DEBUG, "Got a " . $this->activity->verb);
try {
if (Event::handle('StartHandleSalmonTarget', array($this->activity, $this->target)) &&
Event::handle('StartHandleSalmon', array($this->activity))) {
switch ($this->activity->verb)
switch ($this->activity->verb) {
case ActivityVerb::POST:
......@@ -122,6 +122,12 @@ class SalmonAction extends Action
Event::handle('EndHandleSalmon', array($this->activity));
Event::handle('EndHandleSalmonTarget', array($this->activity, $this->target));
} catch (AlreadyFulfilledException $e) {
// The action's results are already fulfilled. Maybe it was a
// duplicate? Maybe someone's database is out of sync?
// Let's just accept it and move on.
common_log(LOG_INFO, 'Salmon slap carried an event which had already been fulfilled.');
function handlePost()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment