Merge branch 'delete_group_logo' into 'nightly'

[quix0rs-gnu-social.git] / plugins / OStatus / OStatusPlugin.php

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 6f6a22bf4dd9ae17c0c52bbcc637bbaae9bd95d3..292af658ed9a98b5c411ef0eb9f029866c72ff78 100644 (file)
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -285,6 +285,7 @@ class OStatusPlugin extends Plugin
     {
         $matches = array();
 
+        $wmatches = array();
         // Webfinger matches: @user@example.com or even @user--one.george_orwell@1984.biz
         if (preg_match_all('!(?:^|\s+)@((?:\w+[\w\-\_\.]?)*(?:[\w\-\_\.]*\w+)@(?:\w+\-?\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!',
                        $text,
@@ -475,7 +476,6 @@ class OStatusPlugin extends Plugin
     function onCheckSchema() {
         $schema = Schema::get();
         $schema->ensureTable('ostatus_profile', Ostatus_profile::schemaDef());
-        $schema->ensureTable('ostatus_source', Ostatus_source::schemaDef());
         $schema->ensureTable('feedsub', FeedSub::schemaDef());
         $schema->ensureTable('hubsub', HubSub::schemaDef());
         $schema->ensureTable('magicsig', Magicsig::schemaDef());
@@ -668,7 +668,7 @@ class OStatusPlugin extends Plugin
                                $other->getBestName());
 
         $act->actor   = $profile->asActivityObject();
-        $act->object  = $other->asActivityObject();
+        $act->objects[] = $other->asActivityObject();
 
         $oprofile->notifyActivity($act, $profile);
 
@@ -706,7 +706,7 @@ class OStatusPlugin extends Plugin
 
         $act->actor = $profile->asActivityObject();
         $act->verb = ActivityVerb::JOIN;
-        $act->object = $oprofile->asActivityObject();
+        $act->objects[] = $oprofile->asActivityObject();
 
         $act->time = time();
         // TRANS: Title for joining a remote groep.
@@ -760,7 +760,7 @@ class OStatusPlugin extends Plugin
 
         $act->actor = $member->asActivityObject();
         $act->verb = ActivityVerb::LEAVE;
-        $act->object = $oprofile->asActivityObject();
+        $act->objects[] = $oprofile->asActivityObject();
 
         $act->time = time();
         // TRANS: Title for leaving a remote group.
@@ -806,7 +806,7 @@ class OStatusPlugin extends Plugin
 
         $act->actor = $sub->asActivityObject();
         $act->verb = ActivityVerb::FOLLOW;
-        $act->object = $oprofile->asActivityObject();
+        $act->objects[] = $oprofile->asActivityObject();
 
         $act->time = time();
         // TRANS: Title for following a remote list.
@@ -858,7 +858,7 @@ class OStatusPlugin extends Plugin
 
         $act->actor = $member->asActivityObject();
         $act->verb = ActivityVerb::UNFOLLOW;
-        $act->object = $oprofile->asActivityObject();
+        $act->objects[] = $oprofile->asActivityObject();
 
         $act->time = time();
         // TRANS: Title for unfollowing a remote list.
@@ -1050,7 +1050,7 @@ class OStatusPlugin extends Plugin
                                $notice->getUrl());
 
         $act->actor   = $profile->asActivityObject();
-        $act->object  = $notice->asActivityObject();
+        $act->objects[]  = $notice->asActivityObject();
 
         $oprofile->notifyActivity($act, $profile);
 
@@ -1172,7 +1172,7 @@ class OStatusPlugin extends Plugin
                                $profile->getBestName());
 
         $act->actor   = $profile->asActivityObject();
-        $act->object  = $act->actor;
+        $act->objects[]  = $act->actor;
 
         while ($oprofile->fetch()) {
             $oprofile->notifyDeferred($act, $profile);
@@ -1228,7 +1228,7 @@ class OStatusPlugin extends Plugin
         $versions[] = array('name' => 'OStatus',
                             'version' => GNUSOCIAL_VERSION,
                             'author' => 'Evan Prodromou, James Walker, Brion Vibber, Zach Copley',
-                            'homepage' => 'http://status.net/wiki/Plugin:OStatus',
+                            'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OStatus',
                             // TRANS: Plugin description.
                             'rawdescription' => _m('Follow people across social networks that implement '.
                                '<a href="http://ostatus.org/">OStatus</a>.'));