Merge remote-tracking branch 'upstream/nightly' into nightly

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

diff --git a/lib/activityhandlerplugin.php b/lib/activityhandlerplugin.php
index b826a705ace80dd80f2cfe39c12c05769398dcc2..c06f723a3686f2ca3546bdbdb50e47429c7b4f72 100644 (file)
--- 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());
     }
 
@@ -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;
     }
 
@@ -289,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...
             }