GNUsocial
/
gnu-social-v2-archive-activitypub-plugin
Archived
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'return-handler' into 'dev' 

Add Return handler and plug it in the plugin

See merge request dansup/ActivityPub!3
This commit is contained in:
Diogo Cordeiro 2018-07-08 22:58:16 +00:00
parent 67d52e1d13 c065c76f16
commit 7d773729b9
6 changed files with 107 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ActivityPubPlugin.php
View File

@ -35,7 +35,7 @@ class ActivityPubPlugin extends Plugin
public function onRouterInitialized(URLMapper $m)
{
ActivitypubURLMapperOverwrite::overwrite_variable($m, ':nickname',
ActivityPubURLMapperOverwrite::overwrite_variable($m, ':nickname',
['action' => 'showstream'],
['nickname' => Nickname::DISPLAY_FMT],
'apactorprofile');
@ -70,7 +70,7 @@ class ActivityPubPlugin extends Plugin
* Overwrites variables in URL-mapping
*
*/
class ActivitypubURLMapperOverwrite extends URLMapper
class ActivityPubURLMapperOverwrite extends URLMapper
{
static function overwrite_variable($m, $path, $args, $paramPatterns, $newaction)
{
@ -80,8 +80,8 @@ class ActivitypubURLMapperOverwrite extends URLMapper
'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
];
if (in_array($_SERVER["HTTP_ACCEPT"], $mimes) == false) {
return;
if (in_array ($_SERVER["HTTP_ACCEPT"], $mimes) == false) {
return true;
}
$m->connect($path, array('action' => $newaction), $paramPatterns);
@ -93,3 +93,21 @@ class ActivitypubURLMapperOverwrite extends URLMapper
}
}
}
class ActivityPubReturn
{
static function answer ($res)
{
header('Content-Type: application/activity+json');
echo json_encode($res, JSON_UNESCAPED_SLASHES | (isset($_GET["pretty"]) ? JSON_PRETTY_PRINT : null));
exit;
}
static function error ($m, $code=500)
{
http_response_code ($code);
header('Content-Type: application/activity+json');
$res[] = Activitypub_error::errorMessageToObject($m);
echo json_encode($res, JSON_UNESCAPED_SLASHES);
exit;
}
}

14
actions/apactorfollowers.php
View File

@ -43,13 +43,13 @@ class apActorFollowersAction extends ManagedAction
$profile = $user->getProfile();
$url = $profile->profileurl;
} catch (Exception $e) {
throw new \Exception('Invalid username');
ActivityPubReturn::error ('Invalid username');
}
$page = intval($this->trimmed('page'));
if ($page <= 0)
throw new \Exception('Invalid page number');
ActivityPubReturn::error ('Invalid page number');
/* Fetch Followers */
try {
@ -57,7 +57,7 @@ class apActorFollowersAction extends ManagedAction
$limit = (($page-1) == 0 ? 1 : $page)*PROFILES_PER_MINILIST;
$sub = $profile->getSubscribers($since, $limit);
} catch (NoResultException $e) {
throw new \Exception('This user has no followers');
ActivityPubReturn::error ('This user has no followers');
}
/* Calculate total items */
@ -65,10 +65,10 @@ class apActorFollowersAction extends ManagedAction
$total_pages = ceil($total_subs/PROFILES_PER_MINILIST);
if ($total_pages == 0)
throw new \Exception('This user has no followers');
ActivityPubReturn::error ('This user has no followers');
if ($page > $total_pages)
throw new \Exception("There are only {$total_pages} pages");
ActivityPubReturn::error ("There are only {$total_pages} pages");
/* Get followers' URLs */
$subs = [];
@ -88,9 +88,7 @@ class apActorFollowersAction extends ManagedAction
'orderedItems' => $subs
];
header('Content-Type: application/activity+json');
echo json_encode($res, JSON_UNESCAPED_SLASHES | (isset($_GET["pretty"]) ? JSON_PRETTY_PRINT : null));
ActivityPubReturn::answer ($res);
}
protected function pretty_sub ($sub_object)

14
actions/apactorfollowing.php
View File

@ -43,13 +43,13 @@ class apActorFollowingAction extends ManagedAction
$profile = $user->getProfile();
$url = $profile->profileurl;
} catch (Exception $e) {
throw new \Exception('Invalid username');
ActivityPubReturn::error ('Invalid username');
}
$page = intval($this->trimmed('page'));
if ($page <= 0)
throw new \Exception('Invalid page number');
ActivityPubReturn::error ('Invalid page number');
/* Fetch Following */
try {
@ -57,7 +57,7 @@ class apActorFollowingAction extends ManagedAction
$limit = (($page-1) == 0 ? 1 : $page)*PROFILES_PER_MINILIST;
$sub = $profile->getSubscribed($since, $limit);
} catch (NoResultException $e) {
throw new \Exception('This user is not following anyone');
ActivityPubReturn::error ('This user is not following anyone');
}
/* Calculate total items */
@ -65,10 +65,10 @@ class apActorFollowingAction extends ManagedAction
$total_pages = ceil($total_subs/PROFILES_PER_MINILIST);
if ($total_pages == 0)
throw new \Exception('This user has no followers');
ActivityPubReturn::error ('This user has no followers');
if ($page > $total_pages)
throw new \Exception("There are only {$total_pages} pages");
ActivityPubReturn::error ("There are only {$total_pages} pages");
/* Get followed' URLs */
$subs = [];
@ -88,9 +88,7 @@ class apActorFollowingAction extends ManagedAction
'orderedItems' => $subs
];
header('Content-Type: application/activity+json');
echo json_encode($res, JSON_UNESCAPED_SLASHES | (isset($_GET["pretty"]) ? JSON_PRETTY_PRINT : null));
ActivityPubReturn::answer ($res);
}
protected function pretty_sub ($sub_object)

6
actions/apactorlikedcollection.php
View File

@ -43,7 +43,7 @@ class apActorLikedCollectionAction extends ManagedAction
$profile = $user->getProfile();
$url = $profile->profileurl;
} catch (Exception $e) {
throw new \Exception('Invalid username');
ActivityPubReturn::error ('Invalid username');
}
$limit = intval($this->trimmed('limit'));
@ -75,9 +75,7 @@ class apActorLikedCollectionAction extends ManagedAction
'orderedItems' => $faves
];
header('Content-Type: application/activity+json');
echo json_encode($res, JSON_UNESCAPED_SLASHES | (isset($_GET["pretty"]) ? JSON_PRETTY_PRINT : null));
ActivityPubReturn::answer ($res);
}
protected function pretty_fave ($fave_object)

6
actions/apactorprofile.php
View File

@ -42,13 +42,11 @@ class apActorProfileAction extends ManagedAction
$user = User::getByNickname($nickname);
$profile = $user->getProfile();
} catch (Exception $e) {
throw new \Exception('Invalid username');
ActivityPubReturn::error ('Invalid username', 404);
}
header('Content-Type: application/activity+json');
$res = Activitypub_profile::profileToObject($profile);
echo json_encode($res, JSON_UNESCAPED_SLASHES | (isset($_GET["pretty"]) ? JSON_PRETTY_PRINT : null));
ActivityPubReturn::answer ($res);
}
}

43
classes/Activitypub_error.php Normal file
View File

@ -0,0 +1,43 @@
<?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 Activitypub_error extends Managed_DataObject
{
public static function errorMessageToObject($m)
{
$res = [
'error'=> $m
];
return $res;
}
}