Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / GNUsocialVideo / GNUsocialVideoPlugin.php

diff --git a/plugins/GNUsocialVideo/GNUsocialVideoPlugin.php b/plugins/GNUsocialVideo/GNUsocialVideoPlugin.php
index 296b45122310c01b51133831e68df648ddf0e278..abf0f304301df01b419b226af352e04e561377d9 100644 (file)
--- a/plugins/GNUsocialVideo/GNUsocialVideoPlugin.php
+++ b/plugins/GNUsocialVideo/GNUsocialVideoPlugin.php
@@ -33,6 +33,8 @@ if (!defined('STATUSNET')) {
 class GNUsocialVideoPlugin extends MicroAppPlugin
 {
 
+    var $oldSaveNew = true;
+
     function onCheckSchema()
     {
         $schema = Schema::get();
@@ -42,30 +44,7 @@ class GNUsocialVideoPlugin extends MicroAppPlugin
         return true;
     }
 
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-        switch($cls)
-        {
-        case 'PostvideoAction':
-            include_once $dir . '/actions/postvideo.php';
-            break;
-        case 'Video':
-            include_once $dir . '/Video.php';
-            break;
-        case 'VideoForm':
-            include_once $dir . '/videoform.php';
-            break;
-        case 'ShowvideoAction':
-            include_once $dir . '/showvideo.php';
-            break;
-        default:
-            break;
-        }
-        return true;
-    }
-
-    function onRouterInitialized($m)
+    function onRouterInitialized(URLMapper $m)
     {
         $m->connect('main/postvideo', array('action' => 'postvideo'));
         $m->connect('showvideo/:id', array('action' => 'showvideo'));
@@ -92,7 +71,7 @@ class GNUsocialVideoPlugin extends MicroAppPlugin
         return array(Video::OBJECT_TYPE);
     }
 
-    function saveNoticeFromActivity($activity, $actor, $options=array())
+    function saveNoticeFromActivity(Activity $activity, Profile $actor, array $options=array())
     {
         if(count($activity->objects) != 1) {
             throw new Exception('Too many activity objects.');
@@ -114,14 +93,14 @@ class GNUsocialVideoPlugin extends MicroAppPlugin
    
     }
 
-    function activityObjectFromNotice($notice)
+    function activityObjectFromNotice(Notice $notice)
     {
         $object = new ActivityObject();
         $object->id = $notice->uri;
         $object->type = Video::OBJECT_TYPE;
         $object->title = $notice->content;
         $object->summary = $notice->content;
-        $object->link = $notice->bestUrl();
+        $object->link = $notice->getUrl();
 
         $vid = Video::getByNotice($notice);
 
@@ -133,7 +112,7 @@ class GNUsocialVideoPlugin extends MicroAppPlugin
         
     }
 
-    function showNotice($notice, $out)
+    function showNotice(Notice $notice, HTMLOutputter $out)
     {
         $vid = Video::getByNotice($notice);
         if ($vid) {
@@ -143,7 +122,7 @@ class GNUsocialVideoPlugin extends MicroAppPlugin
         }
     }
 
-    function deleteRelated($notice)
+    function deleteRelated(Notice $notice)
     {
         $vid = Video::getByNotice($notice);
         if ($vid) {