mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-25 15:55:22 +00:00
Update FederationController, add proper following/follower counts
This commit is contained in:
parent
6ffc964371
commit
3204fb9669
1 changed files with 218 additions and 213 deletions
|
@ -3,17 +3,17 @@
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
use App\Jobs\InboxPipeline\{
|
use App\Jobs\InboxPipeline\{
|
||||||
DeleteWorker,
|
DeleteWorker,
|
||||||
InboxWorker,
|
InboxWorker,
|
||||||
InboxValidator
|
InboxValidator
|
||||||
};
|
};
|
||||||
use App\Jobs\RemoteFollowPipeline\RemoteFollowPipeline;
|
use App\Jobs\RemoteFollowPipeline\RemoteFollowPipeline;
|
||||||
use App\{
|
use App\{
|
||||||
AccountLog,
|
AccountLog,
|
||||||
Like,
|
Like,
|
||||||
Profile,
|
Profile,
|
||||||
Status,
|
Status,
|
||||||
User
|
User
|
||||||
};
|
};
|
||||||
use App\Util\Lexer\Nickname;
|
use App\Util\Lexer\Nickname;
|
||||||
use App\Util\Webfinger\Webfinger;
|
use App\Util\Webfinger\Webfinger;
|
||||||
|
@ -24,243 +24,248 @@ use Illuminate\Http\Request;
|
||||||
use League\Fractal;
|
use League\Fractal;
|
||||||
use App\Util\Site\Nodeinfo;
|
use App\Util\Site\Nodeinfo;
|
||||||
use App\Util\ActivityPub\{
|
use App\Util\ActivityPub\{
|
||||||
Helpers,
|
Helpers,
|
||||||
HttpSignature,
|
HttpSignature,
|
||||||
Outbox
|
Outbox
|
||||||
};
|
};
|
||||||
use Zttp\Zttp;
|
use Zttp\Zttp;
|
||||||
use App\Services\InstanceService;
|
use App\Services\InstanceService;
|
||||||
|
use App\Services\AccountService;
|
||||||
|
|
||||||
class FederationController extends Controller
|
class FederationController extends Controller
|
||||||
{
|
{
|
||||||
public function nodeinfoWellKnown()
|
public function nodeinfoWellKnown()
|
||||||
{
|
{
|
||||||
abort_if(!config('federation.nodeinfo.enabled'), 404);
|
abort_if(!config('federation.nodeinfo.enabled'), 404);
|
||||||
return response()->json(Nodeinfo::wellKnown(), 200, [], JSON_UNESCAPED_SLASHES)
|
return response()->json(Nodeinfo::wellKnown(), 200, [], JSON_UNESCAPED_SLASHES)
|
||||||
->header('Access-Control-Allow-Origin','*');
|
->header('Access-Control-Allow-Origin','*');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function nodeinfo()
|
public function nodeinfo()
|
||||||
{
|
{
|
||||||
abort_if(!config('federation.nodeinfo.enabled'), 404);
|
abort_if(!config('federation.nodeinfo.enabled'), 404);
|
||||||
return response()->json(Nodeinfo::get(), 200, [], JSON_UNESCAPED_SLASHES)
|
return response()->json(Nodeinfo::get(), 200, [], JSON_UNESCAPED_SLASHES)
|
||||||
->header('Access-Control-Allow-Origin','*');
|
->header('Access-Control-Allow-Origin','*');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function webfinger(Request $request)
|
public function webfinger(Request $request)
|
||||||
{
|
{
|
||||||
if (!config('federation.webfinger.enabled') ||
|
if (!config('federation.webfinger.enabled') ||
|
||||||
!$request->has('resource') ||
|
!$request->has('resource') ||
|
||||||
!$request->filled('resource')
|
!$request->filled('resource')
|
||||||
) {
|
) {
|
||||||
return response('', 400);
|
return response('', 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$resource = $request->input('resource');
|
$resource = $request->input('resource');
|
||||||
$domain = config('pixelfed.domain.app');
|
$domain = config('pixelfed.domain.app');
|
||||||
|
|
||||||
if(config('federation.activitypub.sharedInbox') &&
|
if(config('federation.activitypub.sharedInbox') &&
|
||||||
$resource == 'acct:' . $domain . '@' . $domain) {
|
$resource == 'acct:' . $domain . '@' . $domain) {
|
||||||
$res = [
|
$res = [
|
||||||
'subject' => 'acct:' . $domain . '@' . $domain,
|
'subject' => 'acct:' . $domain . '@' . $domain,
|
||||||
'aliases' => [
|
'aliases' => [
|
||||||
'https://' . $domain . '/i/actor'
|
'https://' . $domain . '/i/actor'
|
||||||
],
|
],
|
||||||
'links' => [
|
'links' => [
|
||||||
[
|
[
|
||||||
'rel' => 'http://webfinger.net/rel/profile-page',
|
'rel' => 'http://webfinger.net/rel/profile-page',
|
||||||
'type' => 'text/html',
|
'type' => 'text/html',
|
||||||
'href' => 'https://' . $domain . '/site/kb/instance-actor'
|
'href' => 'https://' . $domain . '/site/kb/instance-actor'
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'rel' => 'self',
|
'rel' => 'self',
|
||||||
'type' => 'application/activity+json',
|
'type' => 'application/activity+json',
|
||||||
'href' => 'https://' . $domain . '/i/actor'
|
'href' => 'https://' . $domain . '/i/actor'
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
return response()->json($res, 200, [], JSON_UNESCAPED_SLASHES);
|
return response()->json($res, 200, [], JSON_UNESCAPED_SLASHES);
|
||||||
}
|
}
|
||||||
$hash = hash('sha256', $resource);
|
$hash = hash('sha256', $resource);
|
||||||
$key = 'federation:webfinger:sha256:' . $hash;
|
$key = 'federation:webfinger:sha256:' . $hash;
|
||||||
if($cached = Cache::get($key)) {
|
if($cached = Cache::get($key)) {
|
||||||
return response()->json($cached, 200, [], JSON_UNESCAPED_SLASHES);
|
return response()->json($cached, 200, [], JSON_UNESCAPED_SLASHES);
|
||||||
}
|
}
|
||||||
if(strpos($resource, $domain) == false) {
|
if(strpos($resource, $domain) == false) {
|
||||||
return response('', 400);
|
return response('', 400);
|
||||||
}
|
}
|
||||||
$parsed = Nickname::normalizeProfileUrl($resource);
|
$parsed = Nickname::normalizeProfileUrl($resource);
|
||||||
if(empty($parsed) || $parsed['domain'] !== $domain) {
|
if(empty($parsed) || $parsed['domain'] !== $domain) {
|
||||||
return response('', 400);
|
return response('', 400);
|
||||||
}
|
}
|
||||||
$username = $parsed['username'];
|
$username = $parsed['username'];
|
||||||
$profile = Profile::whereNull('domain')->whereUsername($username)->first();
|
$profile = Profile::whereNull('domain')->whereUsername($username)->first();
|
||||||
if(!$profile || $profile->status !== null) {
|
if(!$profile || $profile->status !== null) {
|
||||||
return response('', 400);
|
return response('', 400);
|
||||||
}
|
}
|
||||||
$webfinger = (new Webfinger($profile))->generate();
|
$webfinger = (new Webfinger($profile))->generate();
|
||||||
Cache::put($key, $webfinger, 1209600);
|
Cache::put($key, $webfinger, 1209600);
|
||||||
|
|
||||||
return response()->json($webfinger, 200, [], JSON_UNESCAPED_SLASHES)
|
return response()->json($webfinger, 200, [], JSON_UNESCAPED_SLASHES)
|
||||||
->header('Access-Control-Allow-Origin','*');
|
->header('Access-Control-Allow-Origin','*');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function hostMeta(Request $request)
|
public function hostMeta(Request $request)
|
||||||
{
|
{
|
||||||
abort_if(!config('federation.webfinger.enabled'), 404);
|
abort_if(!config('federation.webfinger.enabled'), 404);
|
||||||
|
|
||||||
$path = route('well-known.webfinger');
|
$path = route('well-known.webfinger');
|
||||||
$xml = '<?xml version="1.0" encoding="UTF-8"?><XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"><Link rel="lrdd" type="application/xrd+xml" template="'.$path.'?resource={uri}"/></XRD>';
|
$xml = '<?xml version="1.0" encoding="UTF-8"?><XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"><Link rel="lrdd" type="application/xrd+xml" template="'.$path.'?resource={uri}"/></XRD>';
|
||||||
|
|
||||||
return response($xml)->header('Content-Type', 'application/xrd+xml');
|
return response($xml)->header('Content-Type', 'application/xrd+xml');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function userOutbox(Request $request, $username)
|
public function userOutbox(Request $request, $username)
|
||||||
{
|
{
|
||||||
abort_if(!config_cache('federation.activitypub.enabled'), 404);
|
abort_if(!config_cache('federation.activitypub.enabled'), 404);
|
||||||
|
|
||||||
if(!$request->wantsJson()) {
|
if(!$request->wantsJson()) {
|
||||||
return redirect('/' . $username);
|
return redirect('/' . $username);
|
||||||
}
|
}
|
||||||
|
|
||||||
$res = [
|
$res = [
|
||||||
'@context' => 'https://www.w3.org/ns/activitystreams',
|
'@context' => 'https://www.w3.org/ns/activitystreams',
|
||||||
'id' => 'https://' . config('pixelfed.domain.app') . '/users/' . $username . '/outbox',
|
'id' => 'https://' . config('pixelfed.domain.app') . '/users/' . $username . '/outbox',
|
||||||
'type' => 'OrderedCollection',
|
'type' => 'OrderedCollection',
|
||||||
'totalItems' => 0,
|
'totalItems' => 0,
|
||||||
'orderedItems' => []
|
'orderedItems' => []
|
||||||
];
|
];
|
||||||
|
|
||||||
return response(json_encode($res, JSON_UNESCAPED_SLASHES))->header('Content-Type', 'application/activity+json');
|
return response(json_encode($res, JSON_UNESCAPED_SLASHES))->header('Content-Type', 'application/activity+json');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function userInbox(Request $request, $username)
|
public function userInbox(Request $request, $username)
|
||||||
{
|
{
|
||||||
abort_if(!config_cache('federation.activitypub.enabled'), 404);
|
abort_if(!config_cache('federation.activitypub.enabled'), 404);
|
||||||
abort_if(!config('federation.activitypub.inbox'), 404);
|
abort_if(!config('federation.activitypub.inbox'), 404);
|
||||||
|
|
||||||
$headers = $request->headers->all();
|
$headers = $request->headers->all();
|
||||||
$payload = $request->getContent();
|
$payload = $request->getContent();
|
||||||
if(!$payload || empty($payload)) {
|
if(!$payload || empty($payload)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$obj = json_decode($payload, true, 8);
|
$obj = json_decode($payload, true, 8);
|
||||||
if(!isset($obj['id'])) {
|
if(!isset($obj['id'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$domain = parse_url($obj['id'], PHP_URL_HOST);
|
$domain = parse_url($obj['id'], PHP_URL_HOST);
|
||||||
if(in_array($domain, InstanceService::getBannedDomains())) {
|
if(in_array($domain, InstanceService::getBannedDomains())) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($obj['type']) && $obj['type'] === 'Delete') {
|
if(isset($obj['type']) && $obj['type'] === 'Delete') {
|
||||||
if(isset($obj['object']) && isset($obj['object']['type']) && isset($obj['object']['id'])) {
|
if(isset($obj['object']) && isset($obj['object']['type']) && isset($obj['object']['id'])) {
|
||||||
if($obj['object']['type'] === 'Person') {
|
if($obj['object']['type'] === 'Person') {
|
||||||
if(Profile::whereRemoteUrl($obj['object']['id'])->exists()) {
|
if(Profile::whereRemoteUrl($obj['object']['id'])->exists()) {
|
||||||
dispatch(new DeleteWorker($headers, $payload))->onQueue('inbox');
|
dispatch(new DeleteWorker($headers, $payload))->onQueue('inbox');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($obj['object']['type'] === 'Tombstone') {
|
if($obj['object']['type'] === 'Tombstone') {
|
||||||
if(Status::whereObjectUrl($obj['object']['id'])->exists()) {
|
if(Status::whereObjectUrl($obj['object']['id'])->exists()) {
|
||||||
dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
|
dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($obj['object']['type'] === 'Story') {
|
if($obj['object']['type'] === 'Story') {
|
||||||
dispatch(new DeleteWorker($headers, $payload))->onQueue('story');
|
dispatch(new DeleteWorker($headers, $payload))->onQueue('story');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
} else if( isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
|
} else if( isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
|
||||||
dispatch(new InboxValidator($username, $headers, $payload))->onQueue('follow');
|
dispatch(new InboxValidator($username, $headers, $payload))->onQueue('follow');
|
||||||
} else {
|
} else {
|
||||||
dispatch(new InboxValidator($username, $headers, $payload))->onQueue('high');
|
dispatch(new InboxValidator($username, $headers, $payload))->onQueue('high');
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function sharedInbox(Request $request)
|
public function sharedInbox(Request $request)
|
||||||
{
|
{
|
||||||
abort_if(!config_cache('federation.activitypub.enabled'), 404);
|
abort_if(!config_cache('federation.activitypub.enabled'), 404);
|
||||||
abort_if(!config('federation.activitypub.sharedInbox'), 404);
|
abort_if(!config('federation.activitypub.sharedInbox'), 404);
|
||||||
|
|
||||||
$headers = $request->headers->all();
|
$headers = $request->headers->all();
|
||||||
$payload = $request->getContent();
|
$payload = $request->getContent();
|
||||||
|
|
||||||
if(!$payload || empty($payload)) {
|
if(!$payload || empty($payload)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$obj = json_decode($payload, true, 8);
|
$obj = json_decode($payload, true, 8);
|
||||||
if(!isset($obj['id'])) {
|
if(!isset($obj['id'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$domain = parse_url($obj['id'], PHP_URL_HOST);
|
$domain = parse_url($obj['id'], PHP_URL_HOST);
|
||||||
if(in_array($domain, InstanceService::getBannedDomains())) {
|
if(in_array($domain, InstanceService::getBannedDomains())) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($obj['type']) && $obj['type'] === 'Delete') {
|
if(isset($obj['type']) && $obj['type'] === 'Delete') {
|
||||||
if(isset($obj['object']) && isset($obj['object']['type']) && isset($obj['object']['id'])) {
|
if(isset($obj['object']) && isset($obj['object']['type']) && isset($obj['object']['id'])) {
|
||||||
if($obj['object']['type'] === 'Person') {
|
if($obj['object']['type'] === 'Person') {
|
||||||
if(Profile::whereRemoteUrl($obj['object']['id'])->exists()) {
|
if(Profile::whereRemoteUrl($obj['object']['id'])->exists()) {
|
||||||
dispatch(new DeleteWorker($headers, $payload))->onQueue('inbox');
|
dispatch(new DeleteWorker($headers, $payload))->onQueue('inbox');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($obj['object']['type'] === 'Tombstone') {
|
if($obj['object']['type'] === 'Tombstone') {
|
||||||
if(Status::whereObjectUrl($obj['object']['id'])->exists()) {
|
if(Status::whereObjectUrl($obj['object']['id'])->exists()) {
|
||||||
dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
|
dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($obj['object']['type'] === 'Story') {
|
if($obj['object']['type'] === 'Story') {
|
||||||
dispatch(new DeleteWorker($headers, $payload))->onQueue('story');
|
dispatch(new DeleteWorker($headers, $payload))->onQueue('story');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
} else if( isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
|
} else if( isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
|
||||||
dispatch(new InboxWorker($headers, $payload))->onQueue('follow');
|
dispatch(new InboxWorker($headers, $payload))->onQueue('follow');
|
||||||
} else {
|
} else {
|
||||||
dispatch(new InboxWorker($headers, $payload))->onQueue('shared');
|
dispatch(new InboxWorker($headers, $payload))->onQueue('shared');
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function userFollowing(Request $request, $username)
|
public function userFollowing(Request $request, $username)
|
||||||
{
|
{
|
||||||
abort_if(!config_cache('federation.activitypub.enabled'), 404);
|
abort_if(!config_cache('federation.activitypub.enabled'), 404);
|
||||||
|
|
||||||
$obj = [
|
$id = AccountService::usernameToId($username);
|
||||||
'@context' => 'https://www.w3.org/ns/activitystreams',
|
abort_if(!$id, 404);
|
||||||
'id' => $request->getUri(),
|
$account = AccountService::get($id);
|
||||||
'type' => 'OrderedCollectionPage',
|
abort_if(!$account || !isset($account['following_count']), 404);
|
||||||
'totalItems' => 0,
|
$obj = [
|
||||||
'orderedItems' => []
|
'@context' => 'https://www.w3.org/ns/activitystreams',
|
||||||
];
|
'id' => $request->getUri(),
|
||||||
return response()->json($obj);
|
'type' => 'OrderedCollection',
|
||||||
}
|
'totalItems' => $account['following_count'] ?? 0,
|
||||||
|
];
|
||||||
|
return response()->json($obj);
|
||||||
|
}
|
||||||
|
|
||||||
public function userFollowers(Request $request, $username)
|
public function userFollowers(Request $request, $username)
|
||||||
{
|
{
|
||||||
abort_if(!config_cache('federation.activitypub.enabled'), 404);
|
abort_if(!config_cache('federation.activitypub.enabled'), 404);
|
||||||
|
$id = AccountService::usernameToId($username);
|
||||||
$obj = [
|
abort_if(!$id, 404);
|
||||||
'@context' => 'https://www.w3.org/ns/activitystreams',
|
$account = AccountService::get($id);
|
||||||
'id' => $request->getUri(),
|
abort_if(!$account || !isset($account['followers_count']), 404);
|
||||||
'type' => 'OrderedCollectionPage',
|
$obj = [
|
||||||
'totalItems' => 0,
|
'@context' => 'https://www.w3.org/ns/activitystreams',
|
||||||
'orderedItems' => []
|
'id' => $request->getUri(),
|
||||||
];
|
'type' => 'OrderedCollection',
|
||||||
|
'totalItems' => $account['followers_count'] ?? 0,
|
||||||
return response()->json($obj);
|
];
|
||||||
}
|
return response()->json($obj);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue