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

Start handling salmon entries directly with Notice::saveActivity

Browse Source 
More to come...
This commit is contained in:
Mikael Nordfeldth
2016-01-16 17:25:29 +01:00
parent 1f76c1e4a9
commit f53ebdeadb
3 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/activityhandlerplugin.php
View File

@@ -380,6 +380,11 @@ abstract class ActivityHandlerPlugin extends Plugin
if (!$this->isMyActivity($activity)) {
return true;
}
if (!isset($this->oldSaveNew)) {
// Handle saveActivity in OStatus class for incoming salmon, remove this event
// handler when all plugins have gotten rid of "oldSaveNew".
return true;
}
$this->log(LOG_INFO, get_called_class()." checking {$activity->id} as a valid Salmon slap.");
@@ -428,11 +433,7 @@ abstract class ActivityHandlerPlugin extends Plugin
'is_local' => Notice::REMOTE,
'source' => 'ostatus');
if (!isset($this->oldSaveNew)) {
$notice = Notice::saveActivity($activity, $actor, $options);
} else {
$notice = $this->saveNoticeFromActivity($activity, $actor, $options);
}
$notice = $this->saveNoticeFromActivity($activity, $actor, $options);
return false;
}