X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Factivityhandlerplugin.php;h=0a63bed13bb80a22913630cc0d2056dfc8bf13bf;hb=b224d9309821922f48fec2314ef6388e2e43db66;hp=2544179c5e2e96a6a196f75de45325fa737674f0;hpb=238d2a387623743fd98c84783ce360bf1d2db6ee;p=quix0rs-gnu-social.git

diff --git a/lib/activityhandlerplugin.php b/lib/activityhandlerplugin.php
index 2544179c5e..0a63bed13b 100644
--- a/lib/activityhandlerplugin.php
+++ b/lib/activityhandlerplugin.php
@@ -108,6 +108,7 @@ abstract class ActivityHandlerPlugin extends Plugin
     }
 
     function isMyType($type) {
+        // Third argument to compareTypes is true, to allow for notices with empty object_type for example (verb-only)
         return count($this->types())===0 || ActivityUtils::compareTypes($type, $this->types());
     }
 
@@ -146,7 +147,7 @@ abstract class ActivityHandlerPlugin extends Plugin
     *
     * This will handle just about all events where an activity
     * object gets saved, whether it is via AtomPub, OStatus
-    * (PuSH and Salmon transports), or ActivityStreams-based
+    * (WebSub and Salmon transports), or ActivityStreams-based
     * backup/restore of account data.
     *
     * You should be able to accept as input the output from an
@@ -182,17 +183,6 @@ abstract class ActivityHandlerPlugin extends Plugin
             return true;
         }
         $object = $this->saveObjectFromActivity($act, $stored, $options);
-        try {
-            // 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).'!');
-        }
         return false;
     }
 
@@ -203,7 +193,7 @@ abstract class ActivityHandlerPlugin extends Plugin
      *
      * This will be how your specialized notice gets output in
      * Atom feeds and JSON-based ActivityStreams output, including
-     * account backup/restore and OStatus (PuSH and Salmon transports).
+     * account backup/restore and OStatus (WebSub and Salmon transports).
      *
      * You should be able to round-trip data from this format back
      * through $this->saveNoticeFromActivity(). Where applicable, try
@@ -233,6 +223,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;
     }
 
     /**
@@ -286,6 +279,10 @@ abstract class ActivityHandlerPlugin extends Plugin
         if ($this->isMyNotice($notice)) {
             try {
                 $this->deleteRelated($notice);
+            } catch (NoProfileException $e) {
+                // we failed because of database lookup failure, Notice has no recognized profile as creator
+                // so we skip this. If we want to remove missing notices we should do a SQL constraints check
+                // in the affected plugin.
             } catch (AlreadyFulfilledException $e) {
                 // Nothing to see here, it's obviously already gone...
             }
@@ -305,10 +302,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);
     }
 
     /**
@@ -325,16 +319,12 @@ abstract class ActivityHandlerPlugin extends Plugin
             return true;
         }
 
-        try {
-            $object = $this->activityObjectFromNotice($notice);
-        } catch (NoResultException $e) {
-            $object = null; // because getKV returns null on failure
-        }
+        $object = $this->activityObjectFromNotice($notice);
         return false;
     }
 
     /**
-     * Handle a posted object from PuSH
+     * Handle a posted object from WebSub
      *
      * @param Activity        $activity activity to handle
      * @param Profile         $actor Profile for the feed
@@ -354,6 +344,7 @@ abstract class ActivityHandlerPlugin extends Plugin
 
         $options = array('uri' => $object->id,
                          'url' => $object->link,
+                         'self' => $object->selfLink,
                          'is_local' => Notice::REMOTE,
                          'source' => 'ostatus');
 
@@ -380,8 +371,13 @@ 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, "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();
@@ -425,14 +421,11 @@ abstract class ActivityHandlerPlugin extends Plugin
 
         $options = array('uri' => $object->id,
                          'url' => $object->link,
+                         'self' => $object->selfLink,
                          '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;
     }
@@ -480,6 +473,7 @@ abstract class ActivityHandlerPlugin extends Plugin
 
         $options = array('uri' => $object->id,
                          'url' => $object->link,
+                         'self' => $object->selfLink,
                          'source' => 'restore');
 
         // $user->getProfile() is a Profile
@@ -565,6 +559,11 @@ abstract class ActivityHandlerPlugin extends Plugin
         if ($nli->notice->scope != 0 && $nli->notice->scope != 1) {
             $class .= ' limited-scope';
         }
+        try {
+            $class .= ' notice-source-'.common_to_alphanumeric($nli->notice->source);
+        } catch (Exception $e) {
+            // either source or what we filtered out was a zero-length string
+        }
         $nli->out->elementStart('li', array('class' => $class,
                                             'id' => 'notice-' . $id));
     }
@@ -585,7 +584,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));
@@ -625,7 +625,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;
     }