Notices start saving selfLink from activities/objects

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

diff --git a/lib/activityhandlerplugin.php b/lib/activityhandlerplugin.php
index 8f28da85d67bbb42f8f9c9912eb4f42954e14cfc..0a63bed13bb80a22913630cc0d2056dfc8bf13bf 100644 (file)
--- a/lib/activityhandlerplugin.php
+++ b/lib/activityhandlerplugin.php
@@ -147,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
@@ -193,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
@@ -279,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...
             }
@@ -320,7 +324,7 @@ abstract class ActivityHandlerPlugin extends Plugin
     }
 
     /**
-     * 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
@@ -340,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');
 
@@ -416,6 +421,7 @@ abstract class ActivityHandlerPlugin extends Plugin
 
         $options = array('uri' => $object->id,
                          'url' => $object->link,
+                         'self' => $object->selfLink,
                          'is_local' => Notice::REMOTE,
                          'source' => 'ostatus');
 
@@ -467,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
@@ -552,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));
     }