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

Call Notice::saveActivity instead of Ostatus_profile->processActivity

This commit is contained in:
Mikael Nordfeldth 2015-10-14 00:10:33 +02:00
parent 236bf0b0f5
commit b6aeff89c4
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/Share/SharePlugin.php
View File

@ -116,13 +116,7 @@ class SharePlugin extends ActivityVerbHandlerPlugin
// TODO: Remember to check Deleted_notice!
// TODO: If a post is shared that we can't retrieve - what to do?
$other = Ostatus_profile::ensureActivityObjectProfile($shared->actor);
$sharedNotice = $other->processActivity($shared, 'push'); // FIXME: push/salmon/what?
if (!$sharedNotice instanceof Notice) {
// And if we apparently can't get the shared notice, we'll abort the whole thing.
// TRANS: Client exception thrown when saving an activity share fails.
// TRANS: %s is a share ID.
throw new ClientException(sprintf(_m('Failed to save activity %s.'), $sharedUri));
}
$sharedNotice = Notice::saveActivity($shared, $other->localProfile(), array('source'=>'share'));
} catch (FeedSubException $e) {
// Remote feed could not be found or verified, should we
// transform this into an "RT @user Blah, blah, blah..."?