mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #336 from dansup/frontend-ui-refactor 

Frontend ui refactor
This commit is contained in:
daniel 2018-07-23 21:23:50 -06:00 committed by GitHub
parent 9df9f39e01 dbce506655
commit bfaff9330b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 87 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
app/Http/Controllers/FederationController.php
View File

@ -2,8 +2,9 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Auth; use Auth, Cache;
use App\Profile; use App\Profile;
use Carbon\Carbon;
use League\Fractal; use League\Fractal;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Util\Lexer\Nickname; use App\Util\Lexer\Nickname;
@ -13,15 +14,26 @@ use App\Transformer\ActivityPub\{
ProfileTransformer ProfileTransformer
}; };
use App\Jobs\RemoteFollowPipeline\RemoteFollowPipeline; use App\Jobs\RemoteFollowPipeline\RemoteFollowPipeline;
use App\Jobs\InboxPipeline\InboxWorker;
class FederationController extends Controller class FederationController extends Controller
{ {
public function authCheck() public function authCheck()
{ {
if(!Auth::check()) { if(!Auth::check()) {
abort(403); return abort(403);
} }
return; }
public function authorizeFollow(Request $request)
{
$this->authCheck();
$this->validate($request, [
'acct' => 'required|string|min:3|max:255'
]);
$acct = $request->input('acct');
$nickname = Nickname::normalizeProfileUrl($acct);
return view('federation.authorizefollow', compact('acct', 'nickname'));
} }
public function remoteFollow() public function remoteFollow()
@ -64,61 +76,58 @@ class FederationController extends Controller
public function nodeinfo() public function nodeinfo()
{ {
$res = [ $res = Cache::remember('api:nodeinfo', 60, function() {
'metadata' => [ return [
'nodeName' => config('app.name'), 'metadata' => [
'software' => [ 'nodeName' => config('app.name'),
'homepage' => 'https://pixelfed.org', 'software' => [
'github' => 'https://github.com/pixelfed', 'homepage' => 'https://pixelfed.org',
'follow' => 'https://mastodon.social/@pixelfed' 'github' => 'https://github.com/pixelfed',
], 'follow' => 'https://mastodon.social/@pixelfed'
/*
TODO: Custom Features for Trending
'customFeatures' => [
'trending' => [
'description' => 'Trending API for federated discovery',
'api' => [
'url' => null,
'docs' => null
],
], ],
], ],
*/ 'openRegistrations' => config('pixelfed.open_registration'),
], 'protocols' => [
'openRegistrations' => config('pixelfed.open_registration'), 'activitypub'
'protocols' => [ ],
'activitypub' 'services' => [
], 'inbound' => [],
'services' => [ 'outbound' => []
'inbound' => [], ],
'outbound' => [] 'software' => [
], 'name' => 'pixelfed',
'software' => [ 'version' => config('pixelfed.version')
'name' => 'pixelfed', ],
'version' => config('pixelfed.version') 'usage' => [
], 'localPosts' => \App\Status::whereLocal(true)->whereHas('media')->count(),
'usage' => [ 'localComments' => \App\Status::whereLocal(true)->whereNotNull('in_reply_to_id')->count(),
'localPosts' => \App\Status::whereLocal(true)->count(), 'users' => [
'users' => [ 'total' => \App\User::count(),
'total' => \App\User::count() 'activeHalfyear' => \App\User::where('updated_at', '>', Carbon::now()->subMonths(6)->toDateTimeString())->count(),
] 'activeMonth' => \App\User::where('updated_at', '>', Carbon::now()->subMonths(1)->toDateTimeString())->count(),
], ]
'version' => '2.0' ],
]; 'version' => '2.0'
];
return response()->json($res); });
return response()->json($res, 200, [], JSON_PRETTY_PRINT);
} }
public function webfinger(Request $request) public function webfinger(Request $request)
{ {
$this->validate($request, ['resource'=>'required']); $this->validate($request, ['resource'=>'required|string|min:3|max:255']);
$resource = $request->input('resource');
$parsed = Nickname::normalizeProfileUrl($resource); $hash = hash('sha512', $request->input('resource'));
$username = $parsed['username'];
$user = Profile::whereUsername($username)->firstOrFail(); $webfinger = Cache::remember('api:webfinger:'.$hash, 1440, function() use($request) {
$webfinger = (new Webfinger($user))->generate(); $resource = $request->input('resource');
return response()->json($webfinger); $parsed = Nickname::normalizeProfileUrl($resource);
$username = $parsed['username'];
$user = Profile::whereUsername($username)->firstOrFail();
return (new Webfinger($user))->generate();
});
return response()->json($webfinger, 200, [], JSON_PRETTY_PRINT);
} }
public function userOutbox(Request $request, $username) public function userOutbox(Request $request, $username)
@ -135,4 +144,20 @@ class FederationController extends Controller
return response()->json($res['data']); return response()->json($res['data']);
} }
public function userInbox(Request $request, $username)
{
if(config('pixelfed.activitypub_enabled') == false) {
abort(403);
}
$mimes = [
'application/activity+json',
'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
];
if(!in_array($request->header('Content-Type'), $mimes)) {
abort(500, 'Invalid request');
}
$profile = Profile::whereUsername($username)->firstOrFail();
InboxWorker::dispatch($request, $profile, $request->all());
}
} }

24
resources/views/layouts/partial/footer.blade.php
View File

@ -1,18 +1,16 @@
<footer> <footer>
<div class="container py-5"> <div class="container py-5">
<p class="mb-0 text-uppercase font-weight-bold small"> <p class="mb-0 text-uppercase font-weight-bold small text-justify">
<a href="{{route('site.about')}}" class="text-primary pr-2">About Us</a> <a href="{{route('site.about')}}" class="text-primary pr-3">About Us</a>
<a href="{{route('site.help')}}" class="text-primary pr-2">Support</a> <a href="{{route('site.help')}}" class="text-primary pr-3">Support</a>
<a href="{{route('site.opensource')}}" class="text-primary pr-2">Open Source</a> <a href="{{route('site.opensource')}}" class="text-primary pr-3">Open Source</a>
<a href="{{route('site.language')}}" class="text-primary pr-2">Language</a> <a href="{{route('site.terms')}}" class="text-primary pr-3">Terms</a>
<span class="px-2"></span> <a href="{{route('site.privacy')}}" class="text-primary pr-3">Privacy</a>
<a href="{{route('site.terms')}}" class="text-primary pr-2 pl-2">Terms</a> <a href="{{route('site.platform')}}" class="text-primary pr-3">API</a>
<a href="{{route('site.privacy')}}" class="text-primary pr-2">Privacy</a> <a href="#" class="text-primary pr-3">Directory</a>
<a href="{{route('site.platform')}}" class="text-primary pr-2">API</a> <a href="#" class="text-primary pr-3">Profiles</a>
<span class="px-2"></span> <a href="#" class="text-primary pr-3">Hashtags</a>
<a href="#" class="text-primary pr-2 pl-2">Directory</a> <a href="{{route('site.language')}}" class="text-primary pr-3">Language</a>
<a href="#" class="text-primary pr-2">Profiles</a>
<a href="#" class="text-primary">Hashtags</a>
<a href="http://pixelfed.org" class="text-muted float-right" rel="noopener">Powered by PixelFed</a> <a href="http://pixelfed.org" class="text-muted float-right" rel="noopener">Powered by PixelFed</a>
</p> </p>
</div> </div>