Merge branch 'feature-like' into 'dev'

Add Liked Collection

See merge request dansup/ActivityPub!1

ActivityPubPlugin.php

@@ -35,9 +35,18 @@ class ActivityPubPlugin extends Plugin
 
     public function onRouterInitialized(URLMapper $m)
     {
+        ActivitypubURLMapperOverwrite::overwrite_variable($m, ':nickname',
+                                    ['action' => 'showstream'],
+                                    ['nickname' => Nickname::DISPLAY_FMT],
+                                    'apactorprofile');
+        
         $m->connect(':nickname/profile.json',
                     ['action'    => 'apActorProfile'],
                     ['nickname'  => Nickname::DISPLAY_FMT]);
+        
+        $m->connect(':nickname/liked.json',
+                    ['action'    => 'apActorLikedCollection'],
+                    ['nickname'  => Nickname::DISPLAY_FMT]);
     }
 
     public function onPluginVersion(array &$versions)
@@ -52,3 +61,31 @@ class ActivityPubPlugin extends Plugin
         return true;
     }
 }
+
+/**
+ * Overwrites variables in URL-mapping
+ *
+ */
+class ActivitypubURLMapperOverwrite extends URLMapper
+{
+    static function overwrite_variable($m, $path, $args, $paramPatterns, $newaction)
+    {
+        $mimes = [
+            'application/activity+json', 
+            'application/ld+json',
+            'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
+        ];
+
+        if (in_array($_SERVER["HTTP_ACCEPT"], $mimes) == false) {
+            return;
+        }
+        
+        $m->connect($path, array('action' => $newaction), $paramPatterns);
+        $regex = self::makeRegex($path, $paramPatterns);
+        foreach ($m->variables as $n => $v) {
+            if ($v[1] == $regex) {
+                $m->variables[$n][0]['action'] = $newaction;
+            }
+        }
+    }
+}

actions/apactorlikedcollection.php

@@ -0,0 +1,114 @@
+<?php
+/**
+ * GNU social - a federating social network
+ *
+ * Todo: Description
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   GNUsocial
+ * @author    Diogo Cordeiro <diogo@fc.up.pt>
+ * @author    Daniel Supernault <danielsupernault@gmail.com>
+ * @copyright 2015 Free Software Foundaction, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      https://gnu.io/social
+ */
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
+class apActorLikedCollectionAction extends ManagedAction
+{
+    protected $needLogin = false;
+    protected $canPost   = true;
+
+    protected function handle()
+    {
+        $nickname = $this->trimmed('nickname');
+        try {
+          $user    = User::getByNickname($nickname);
+          $profile = $user->getProfile();
+          $url     = $profile->profileurl;
+        } catch (Exception $e) {
+          throw new \Exception('Invalid username');
+        }
+        
+        $limit    = intval($this->trimmed('limit'));
+        $since_id = intval($this->trimmed('since_id'));
+        $max_id   = intval($this->trimmed('max_id'));
+
+        $limit    = empty ($limit) ? 40 : $limit; // Default is 40
+        $since_id = empty ($since_id) ? null : $since_id;
+        $max_id   = empty ($max_id) ? null : $max_id;
+        
+        if ($limit > 80) $limit = 80; // Max is 80
+        
+        $fave = $this->fetch_faves ($user->getID(), $limit, $since_id, $max_id);
+
+        $total_faves = 0;
+        $faves = [];
+        while ($fave->fetch()) {
+          $faves[] = $this->pretty_fave (clone($fave));
+          ++$total_faves;
+        }
+        
+        $res = [
+          '@context'          => [
+            "https://www.w3.org/ns/activitystreams",
+            [
+              "@language" => "en"
+            ]
+          ],
+          'id'                => "{$url}/liked.json",
+          'type'              => 'OrderedCollection',
+          'totalItems'        => $total_faves,
+          'orderedItems'      => $faves
+        ];
+
+        header('Content-Type: application/json');
+
+        echo json_encode($res, JSON_UNESCAPED_SLASHES | (isset($_GET["pretty"]) ? JSON_PRETTY_PRINT : null));
+    }
+    
+    protected function pretty_fave ($fave_object)
+    {
+        $res = array ("uri"       => $fave_object->uri,
+                      "created"   => $fave_object->created,
+                      "object"    => Activitypub_notice::noticeToObject(Notice::getByID($fave_object->notice_id)));
+        
+        return $res;
+    }
+    
+    private static function fetch_faves ($user_id, $limit = 40, $since_id = null, $max_id = null)
+    {
+        $fav = new Fave();
+
+        $fav->user_id = $user_id;
+        
+        $fav->orderBy('modified DESC');
+
+        if ($since_id != null)
+            $fav->whereAdd("notice_id  > {$since_id}");
+        if ($max_id != null)
+            $fav->whereAdd("notice_id  < {$max_id}");
+        
+        $fav->limit($limit);
+
+        $fav->find();
+
+        return $fav;
+    }
+}

classes/Activitypub_attachment.php

@@ -45,7 +45,7 @@ class Activitypub_attachment extends Managed_DataObject
         'id'        => $attachment->getID (),
         'mimetype'  => $attachment->mimetype,
         'url'       => $attachment->getUrl (),
-        'size'      => $attachment->getSize (),
+        'size'      => intval($attachment->size), // $attachment->getSize ()
         'title'     => $attachment->getTitle (),
         'meta'      => null
       ];

classes/Activitypub_notice.php

@@ -66,7 +66,7 @@ class Activitypub_notice extends Managed_DataObject
       'url'          => $notice->getUrl(),
       'reply_to'     => empty($notice->reply_to) ? null : Notice::getById($notice->reply_to)->getUrl(),
       'is_local'     => $notice->isLocal(),
-      'conversation' => $notice->conversation,
+      'conversation' => intval($notice->conversation),
       'attachment'   => $attachments,
       'tag'          => $tags
     ];