X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Factivityhandlerplugin.php;h=988a6c30a3f5f5ead193123b5dc2a317eb319eca;hb=5167b1fa408aa486ad75c8ddd3c71cb568dc84a3;hp=a6c5117f4e6b68a01d67bd126d702ef7ca61fdbe;hpb=ffb9d7ad3fb9ad5d9ed0ada9fb9b88fa7ae8e146;p=quix0rs-gnu-social.git diff --git a/lib/activityhandlerplugin.php b/lib/activityhandlerplugin.php index a6c5117f4e..988a6c30a3 100644 --- a/lib/activityhandlerplugin.php +++ b/lib/activityhandlerplugin.php @@ -104,7 +104,7 @@ abstract class ActivityHandlerPlugin extends Plugin function isMyVerb($verb) { $verb = $verb ?: ActivityVerb::POST; // post is the default verb - return ActivityUtils::compareTypes($verb, $this->verbs()); + return ActivityUtils::compareVerbs($verb, $this->verbs()); } function isMyType($type) { @@ -160,10 +160,11 @@ abstract class ActivityHandlerPlugin extends Plugin * @fixme are there any standard options? * * @param Activity $activity - * @param Profile $actor + * @param Notice $stored The notice in our database for this certain object * @param array $options=array() * - * @return Notice the resulting notice + * @return object If the verb handling plugin creates an object, it can be returned here (otherwise true) + * @throws exception On any error. */ protected function saveObjectFromActivity(Activity $activity, Notice $stored, array $options=array()) { @@ -174,7 +175,7 @@ abstract class ActivityHandlerPlugin extends Plugin * This usually gets called from Notice::saveActivity after a Notice object has been created, * so it contains a proper id and a uri for the object to be saved. */ - public function onStoreActivityObject(Activity $act, Notice $stored, array $options=array(), &$object) { + public function onStoreActivityObject(Activity $act, Notice $stored, array $options, &$object) { // $this->oldSaveNew is there during a migration period of plugins, to start using // Notice::saveActivity instead of Notice::saveNew if (!$this->isMyActivity($act) || isset($this->oldSaveNew)) { @@ -182,7 +183,13 @@ abstract class ActivityHandlerPlugin extends Plugin } $object = $this->saveObjectFromActivity($act, $stored, $options); try { - $act->context->attention = array_merge($act->context->attention, $object->getAttentionArray()); + // In the future we probably want to use something like ActivityVerb_DataObject for the kind + // of objects which are returned from saveObjectFromActivity. + if ($object instanceof Managed_DataObject) { + // If the verb handling plugin figured out some more attention URIs, add them here to the + // original activity. This is only done if a separate object is actually needed to be saved. + $act->context->attention = array_merge($act->context->attention, $object->getAttentionArray()); + } } catch (Exception $e) { common_debug('WARNING: Could not get attention list from object '.get_class($object).'!'); } @@ -223,6 +230,14 @@ abstract class ActivityHandlerPlugin extends Plugin */ abstract function deleteRelated(Notice $notice); + protected function notifyMentioned(Notice $stored, array &$mentioned_ids) + { + // pass through silently by default + + // If we want to stop any other plugin from notifying based on this activity, return false instead. + return true; + } + /** * Called when generating Atom XML ActivityStreams output from an * ActivityObject belonging to this plugin. Gives the plugin @@ -269,13 +284,31 @@ abstract class ActivityHandlerPlugin extends Plugin * * @return boolean hook value */ - function onNoticeDeleteRelated(Notice $notice) + public function onNoticeDeleteRelated(Notice $notice) { - if (!$this->isMyNotice($notice)) { + if ($this->isMyNotice($notice)) { + try { + $this->deleteRelated($notice); + } catch (AlreadyFulfilledException $e) { + // Nothing to see here, it's obviously already gone... + } + } + + // Always continue this event in our activity handling plugins. + return true; + } + + /** + * @param Notice $stored The notice being distributed + * @param array &$mentioned_ids List of profiles (from $stored->getReplies()) + */ + public function onStartNotifyMentioned(Notice $stored, array &$mentioned_ids) + { + if (!$this->isMyNotice($stored)) { return true; } - $this->deleteRelated($notice); + return $this->notifyMentioned($stored, $mentioned_ids); } /** @@ -348,7 +381,7 @@ abstract class ActivityHandlerPlugin extends Plugin return true; } - $this->log(LOG_INFO, "Checking {$activity->id} as a valid Salmon slap."); + $this->log(LOG_INFO, get_called_class()." checking {$activity->id} as a valid Salmon slap."); if ($target instanceof User_group || $target->isGroup()) { $uri = $target->getUri(); @@ -360,7 +393,7 @@ abstract class ActivityHandlerPlugin extends Plugin } elseif ($target instanceof Profile && $target->isLocal()) { $original = null; // FIXME: Shouldn't favorites show up with a 'target' activityobject? - if (!ActivityUtils::compareTypes($activity->verb, array(ActivityVerb::POST)) && isset($activity->objects[0])) { + if (!ActivityUtils::compareVerbs($activity->verb, array(ActivityVerb::POST)) && isset($activity->objects[0])) { // If this is not a post, it's a verb targeted at something (such as a Favorite attached to a note) if (!empty($activity->objects[0]->id)) { $activity->context->replyToID = $activity->objects[0]->id; @@ -384,7 +417,7 @@ abstract class ActivityHandlerPlugin extends Plugin $actor = $oactor->localProfile(); // FIXME: will this work in all cases? I made it work for Favorite... - if (ActivityUtils::compareTypes($activity->verb, array(ActivityVerb::POST))) { + if (ActivityUtils::compareVerbs($activity->verb, array(ActivityVerb::POST))) { $object = $activity->objects[0]; } else { $object = $activity; @@ -407,13 +440,13 @@ abstract class ActivityHandlerPlugin extends Plugin /** * Handle object posted via AtomPub * - * @param Activity &$activity Activity that was posted - * @param User $user User that posted it + * @param Activity $activity Activity that was posted + * @param Profile $scoped Profile of user posting * @param Notice &$notice Resulting notice * * @return boolean hook value */ - function onStartAtomPubNewActivity(Activity &$activity, $user, &$notice) + public function onStartAtomPubNewActivity(Activity $activity, Profile $scoped, Notice &$notice=null) { if (!$this->isMyActivity($activity)) { return true; @@ -421,10 +454,7 @@ abstract class ActivityHandlerPlugin extends Plugin $options = array('source' => 'atompub'); - // $user->getProfile() is a Profile - $notice = $this->saveNoticeFromActivity($activity, - $user->getProfile(), - $options); + $notice = $this->saveNoticeFromActivity($activity, $scoped, $options); return false; } @@ -555,7 +585,8 @@ abstract class ActivityHandlerPlugin extends Plugin try { $this->showNoticeListItem($nli); } catch (Exception $e) { - $nli->out->element('p', 'error', 'Error showing notice: '.htmlspecialchars($e->getMessage())); + common_log(LOG_ERR, 'Error showing notice '.$nli->getNotice()->getID().': ' . $e->getMessage()); + $nli->out->element('p', 'error', sprintf(_('Error showing notice: %s'), $e->getMessage())); } Event::handle('EndShowNoticeItem', array($nli)); @@ -564,18 +595,29 @@ abstract class ActivityHandlerPlugin extends Plugin protected function showNoticeListItem(NoticeListItem $nli) { - $nli->showNotice(); - $nli->showNoticeAttachments(); - $nli->showNoticeInfo(); - $nli->showNoticeOptions(); - - $nli->showNoticeLink(); - $nli->showNoticeSource(); - $nli->showNoticeLocation(); - $nli->showContext(); - $nli->showRepeat(); - - $nli->showNoticeOptions(); + $nli->showNoticeHeaders(); + $nli->showContent(); + $nli->showNoticeFooter(); + } + + public function onStartShowNoticeItemNotice(NoticeListItem $nli) + { + if (!$this->isMyNotice($nli->notice)) { + return true; + } + + $this->showNoticeItemNotice($nli); + + Event::handle('EndShowNoticeItemNotice', array($nli)); + return false; + } + + protected function showNoticeItemNotice(NoticeListItem $nli) + { + $nli->showNoticeTitle(); + $nli->showAuthor(); + $nli->showAddressees(); + $nli->showContent(); } public function onStartShowNoticeContent(Notice $stored, HTMLOutputter $out, Profile $scoped=null) @@ -584,7 +626,16 @@ abstract class ActivityHandlerPlugin extends Plugin return true; } - $out->text($stored->getContent()); + try { + $this->showNoticeContent($stored, $out, $scoped); + } catch (Exception $e) { + $out->element('div', 'error', $e->getMessage()); + } return false; } + + protected function showNoticeContent(Notice $stored, HTMLOutputter $out, Profile $scoped=null) + { + $out->text($stored->getContent()); + } }