Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / lib / activityhandlerplugin.php

diff --git a/lib/activityhandlerplugin.php b/lib/activityhandlerplugin.php
index 529749cc1ddc46b32373a6f12b65744db19657c2..988a6c30a3f5f5ead193123b5dc2a317eb319eca 100644 (file)
--- 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) {
@@ -233,6 +233,9 @@ abstract class ActivityHandlerPlugin extends Plugin
     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;
     }
 
     /**
@@ -281,10 +284,14 @@ abstract class ActivityHandlerPlugin extends Plugin
      *
      * @return boolean hook value
      */
-    function onNoticeDeleteRelated(Notice $notice)
+    public function onNoticeDeleteRelated(Notice $notice)
     {
         if ($this->isMyNotice($notice)) {
-            $this->deleteRelated($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.
@@ -301,10 +308,7 @@ abstract class ActivityHandlerPlugin extends Plugin
             return true;
         }
 
-        $this->notifyMentioned($stored, $mentioned_ids);
-
-        // If it was _our_ notice, only we should do anything with the mentions.
-        return false;
+        return $this->notifyMentioned($stored, $mentioned_ids);
     }
 
     /**
@@ -377,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();
@@ -389,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;
@@ -413,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;
@@ -436,14 +440,13 @@ abstract class ActivityHandlerPlugin extends Plugin
     /**
      * Handle object posted via AtomPub
      *
-     * @param Activity &$activity Activity that was posted
+     * @param Activity  $activity Activity that was posted
      * @param Profile   $scoped   Profile of user posting
      * @param Notice   &$notice   Resulting notice
      *
      * @return boolean hook value
      */
-    // FIXME: Make sure we can really do strong Notice typing with a $notice===null without having =null here
-    public function onStartAtomPubNewActivity(Activity &$activity, Profile $scoped, Notice &$notice)
+    public function onStartAtomPubNewActivity(Activity $activity, Profile $scoped, Notice &$notice=null)
     {
         if (!$this->isMyActivity($activity)) {
             return true;
@@ -453,8 +456,6 @@ abstract class ActivityHandlerPlugin extends Plugin
 
         $notice = $this->saveNoticeFromActivity($activity, $scoped, $options);
 
-        Event::handle('EndAtomPubNewActivity', array($activity, $scoped, $notice));
-
         return false;
     }
 
@@ -584,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));
@@ -593,17 +595,9 @@ 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->showPermalink();
-
-        $nli->showNoticeOptions();
+        $nli->showNoticeHeaders();
+        $nli->showContent();
+        $nli->showNoticeFooter();
     }
 
     public function onStartShowNoticeItemNotice(NoticeListItem $nli)
@@ -632,7 +626,11 @@ abstract class ActivityHandlerPlugin extends Plugin
             return true;
         }
 
-        $this->showNoticeContent($stored, $out, $scoped);
+        try {
+            $this->showNoticeContent($stored, $out, $scoped);
+        } catch (Exception $e) {
+            $out->element('div', 'error', $e->getMessage());
+        }
         return false;
     }