chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Update FederationController, closes #1213

This commit is contained in:
Daniel Supernault 2019-04-29 19:51:17 -06:00
parent 33498a2be6
commit 85bdea4375
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,14 +91,6 @@ class FederationController extends Controller
public function nodeinfo() public function nodeinfo()
{ {
$res = Cache::remember('api:nodeinfo', now()->addMinutes(15), function () { $res = Cache::remember('api:nodeinfo', now()->addMinutes(15), function () {
$git = Cache::remember('api:nodeinfo:git', now()->addHours(1), function() {
$hash = exec('git rev-parse HEAD');
$gitUrl = 'https://github.com/pixelfed/pixelfed/commit/' . $hash;
return [
'commit_hash' => $hash,
'url' => $gitUrl
];
});
$activeHalfYear = Cache::remember('api:nodeinfo:ahy', now()->addHours(12), function() { $activeHalfYear = Cache::remember('api:nodeinfo:ahy', now()->addHours(12), function() {
$count = collect([]); $count = collect([]);
// $likes = Like::select('profile_id')->where('created_at', '>', now()->subMonths(6)->toDateTimeString())->groupBy('profile_id')->pluck('profile_id')->toArray(); // $likes = Like::select('profile_id')->where('created_at', '>', now()->subMonths(6)->toDateTimeString())->groupBy('profile_id')->pluck('profile_id')->toArray();
@ -125,7 +117,6 @@ class FederationController extends Controller
'software' => [ 'software' => [
'homepage' => 'https://pixelfed.org', 'homepage' => 'https://pixelfed.org',
'repo' => 'https://github.com/pixelfed/pixelfed', 'repo' => 'https://github.com/pixelfed/pixelfed',
'git' => $git
], ],
'captcha' => (bool) config('pixelfed.recaptcha'), 'captcha' => (bool) config('pixelfed.recaptcha'),
], ],