From b4221833e3fde6dc17365bf761b06fc60553f050 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 13 Jan 2019 00:10:07 -0700
Subject: [PATCH] Update FederationController, add captcha to nodeinfo. Fixes
 https://todon.nl/users/v0idifier/statuses/101407970516293946

---
 app/Http/Controllers/FederationController.php | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php
index 59cd86ebb..cc21e962c 100644
--- a/app/Http/Controllers/FederationController.php
+++ b/app/Http/Controllers/FederationController.php
@@ -82,37 +82,38 @@ class FederationController extends Controller
     {
         $res = Cache::remember('api:nodeinfo', 60, function () {
             return [
-          'metadata' => [
-            'nodeName' => config('app.name'),
-            'software' => [
-              'homepage' => 'https://pixelfed.org',
-              'github'   => 'https://github.com/pixelfed',
-              'follow'   => 'https://mastodon.social/@pixelfed',
-            ],
-          ],
-          'openRegistrations' => config('pixelfed.open_registration'),
-          'protocols'         => [
-            'activitypub',
-          ],
-          'services' => [
-            'inbound'  => [],
-            'outbound' => [],
-          ],
-          'software' => [
-            'name'    => 'pixelfed',
-            'version' => config('pixelfed.version'),
-          ],
-          'usage' => [
-            'localPosts'    => \App\Status::whereLocal(true)->whereHas('media')->count(),
-            'localComments' => \App\Status::whereLocal(true)->whereNotNull('in_reply_to_id')->count(),
-            'users'         => [
-              'total'          => \App\User::count(),
-              'activeHalfyear' => \App\AccountLog::select('user_id')->whereAction('auth.login')->where('updated_at', '>',Carbon::now()->subMonths(6)->toDateTimeString())->groupBy('user_id')->get()->count(),
-              'activeMonth'    => \App\AccountLog::select('user_id')->whereAction('auth.login')->where('updated_at', '>',Carbon::now()->subMonths(1)->toDateTimeString())->groupBy('user_id')->get()->count(),
-            ],
-          ],
-          'version' => '2.0',
-        ];
+                'metadata' => [
+                    'nodeName' => config('app.name'),
+                    'software' => [
+                        'homepage' => 'https://pixelfed.org',
+                        'github'   => 'https://github.com/pixelfed',
+                        'follow'   => 'https://mastodon.social/@pixelfed',
+                    ],
+                    'captcha' => (bool) config('pixelfed.recaptcha'),
+                ],
+                'openRegistrations' => config('pixelfed.open_registration'),
+                'protocols'         => [
+                    'activitypub',
+                ],
+                'services' => [
+                    'inbound'  => [],
+                    'outbound' => [],
+                ],
+                'software' => [
+                    'name'    => 'pixelfed',
+                    'version' => config('pixelfed.version'),
+                ],
+                'usage' => [
+                    'localPosts'    => \App\Status::whereLocal(true)->whereHas('media')->count(),
+                    'localComments' => \App\Status::whereLocal(true)->whereNotNull('in_reply_to_id')->count(),
+                    'users'         => [
+                        'total'          => \App\User::count(),
+                        'activeHalfyear' => \App\AccountLog::select('user_id')->whereAction('auth.login')->where('updated_at', '>',Carbon::now()->subMonths(6)->toDateTimeString())->groupBy('user_id')->get()->count(),
+                        'activeMonth'    => \App\AccountLog::select('user_id')->whereAction('auth.login')->where('updated_at', '>',Carbon::now()->subMonths(1)->toDateTimeString())->groupBy('user_id')->get()->count(),
+                    ],
+                ],
+                'version' => '2.0',
+            ];
         });
 
         return response()->json($res, 200, [