Merged

[quix0rs-gnu-social.git] / plugins / GNUsocialPhotos / GNUsocialPhotosPlugin.php

diff --git a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
index c82efd0c5914b38c978f4d0ba13cfa6209028967..5e0f3f780efb27a3f02dfabee5beb1d9c440ace6 100644 (file)
--- a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
+++ b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
@@ -44,7 +44,7 @@ class GNUsocialPhotosPlugin extends Plugin
         $schema->ensureTable('GNUsocialPhotoAlbum', GNUsocialPhotoAlbum::schemaDef());
     }
 
-    function onRouterInitialized($m)
+    function onRouterInitialized(URLMapper $m)
     {
         $m->connect(':nickname/photos', array('action' => 'photos'));
         $m->connect(':nickname/photos/:albumid', array('action' => 'photos'));
@@ -54,7 +54,7 @@ class GNUsocialPhotosPlugin extends Plugin
         return true;
     }
 
-    function onStartNoticeDistribute($notice)
+    function onStartNoticeDistribute(Notice $notice)
     {
         common_log(LOG_INFO, "event: StartNoticeDistribute");
         if (GNUsocialPhotoTemp::$tmp) {
@@ -68,23 +68,23 @@ class GNUsocialPhotosPlugin extends Plugin
         return true;
     }
 
-    function onEndNoticeAsActivity($notice, &$activity)
+    function onEndNoticeAsActivity(Notice $stored, Activity $act, Profile $scoped=null)
     {
         common_log(LOG_INFO, 'photo plugin: EndNoticeAsActivity');
-        $photo = GNUsocialPhoto::getKV('notice_id', $notice->id);
+        $photo = GNUsocialPhoto::getKV('notice_id', $stored->id);
         if(!$photo) {
             common_log(LOG_INFO, 'not a photo.');
             return true;
         }
 
-        $activity->objects[0]->type = ActivityObject::PHOTO;
-        $activity->objects[0]->thumbnail = $photo->thumb_uri;
-        $activity->objects[0]->largerImage = $photo->uri;
+        $act->objects[0]->type = ActivityObject::PHOTO;
+        $act->objects[0]->thumbnail = $photo->thumb_uri;
+        $act->objects[0]->largerImage = $photo->uri;
         return false;
     }
 
 
-    function onStartHandleFeedEntry($activity)
+    function onStartHandleFeedEntry(Activity $activity)
     {
         common_log(LOG_INFO, 'photo plugin: onEndAtomPubNewActivity');
         $oprofile = Ostatus_profile::ensureActorProfile($activity);
@@ -121,7 +121,7 @@ class GNUsocialPhotosPlugin extends Plugin
         return true;
     }
 
-    function onStartShowNoticeItem($action)
+    function onStartShowNoticeItem(Action $action)
     {
         $photo = GNUsocialPhoto::getKV('notice_id', $action->notice->id);
         if($photo) { 
@@ -157,12 +157,12 @@ class GNUsocialPhotosPlugin extends Plugin
                            _('Photo gallery'), $nav->action->trimmed('action') == 'photos', 'nav_photos');
     }
 
-    function onEndShowStyles($action)
+    function onEndShowStyles(Action $action)
     {
         $action->cssLink('/plugins/GNUsocialPhotos/res/style.css');
     }
 
-    function onEndShowScripts($action)
+    function onEndShowScripts(Action $action)
     {
         $action->script('plugins/GNUsocialPhotos/res/gnusocialphotos.js');
     }