diff --git a/.env.example b/.env.example
index 725299e28..335af878e 100644
--- a/.env.example
+++ b/.env.example
@@ -42,7 +42,6 @@ API_BASE="/api/1/"
API_SEARCH="/api/search"
OPEN_REGISTRATION=true
-RECAPTCHA_ENABLED=false
ENFORCE_EMAIL_VERIFICATION=true
MAX_PHOTO_SIZE=15000
diff --git a/.env.testing b/.env.testing
index ef7f69cf1..e28316175 100644
--- a/.env.testing
+++ b/.env.testing
@@ -41,7 +41,6 @@ API_BASE="/api/1/"
API_SEARCH="/api/search"
OPEN_REGISTRATION=false
-RECAPTCHA_ENABLED=false
ENFORCE_EMAIL_VERIFICATION=true
MAX_PHOTO_SIZE=15000
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 6cea5e8a3..c47bf9ab7 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -53,10 +53,6 @@ class LoginController extends Controller
'password' => 'required|string|min:6',
];
- if (config('pixelfed.recaptcha')) {
- $rules['g-recaptcha-response'] = 'required|recaptcha';
- }
-
$this->validate($request, $rules);
}
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 4ce5538e9..d40c855dd 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -76,10 +76,6 @@ class RegisterController extends Controller
'password' => 'required|string|min:6|confirmed',
];
- if (config('pixelfed.recaptcha')) {
- $rules['g-recaptcha-response'] = 'required|recaptcha';
- }
-
return Validator::make($data, $rules);
}
diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php
index ccba79d20..b6918fc42 100644
--- a/app/Http/Controllers/FederationController.php
+++ b/app/Http/Controllers/FederationController.php
@@ -118,7 +118,6 @@ class FederationController extends Controller
'homepage' => 'https://pixelfed.org',
'repo' => 'https://github.com/pixelfed/pixelfed',
],
- 'captcha' => (bool) config('pixelfed.recaptcha'),
],
'protocols' => [
'activitypub',
diff --git a/composer.json b/composer.json
index 9d942579a..0e7e1e844 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,6 @@
"beyondcode/laravel-self-diagnosis": "^1.0.2",
"doctrine/dbal": "^2.7",
"fideloper/proxy": "^4.0",
- "greggilbert/recaptcha": "dev-master",
"intervention/image": "^2.4",
"jenssegers/agent": "^2.6",
"laravel/framework": "5.8.*",
diff --git a/config/app.php b/config/app.php
index 5bcac1d35..5aa786fbe 100644
--- a/config/app.php
+++ b/config/app.php
@@ -150,7 +150,6 @@ return [
/*
* Package Service Providers...
*/
- Greggilbert\Recaptcha\RecaptchaServiceProvider::class,
Jackiedo\DotenvEditor\DotenvEditorServiceProvider::class,
/*
@@ -211,7 +210,6 @@ return [
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
- 'Recaptcha' => Greggilbert\Recaptcha\Facades\Recaptcha::class,
'DotenvEditor' => Jackiedo\DotenvEditor\Facades\DotenvEditor::class,
'PrettyNumber' => App\Util\Lexer\PrettyNumber::class,
'Purify' => Stevebauman\Purify\Facades\Purify::class,
diff --git a/config/pixelfed.php b/config/pixelfed.php
index 10df33777..b9156cd56 100644
--- a/config/pixelfed.php
+++ b/config/pixelfed.php
@@ -74,15 +74,15 @@ return [
/*
|--------------------------------------------------------------------------
- | Enable Google Recaptcha v2
+ | ActivityPub
|--------------------------------------------------------------------------
|
- | Enable/disable recaptcha on login/registration forms. API Keys required.
- |
*/
- 'recaptcha' => env('RECAPTCHA_ENABLED', false),
-
-
+ 'ap_inbox' => env('ACTIVITYPUB_INBOX', false),
+ 'ap_shared' => env('ACTIVITYPUB_SHAREDINBOX', false),
+ 'ap_delivery_timeout' => env('ACTIVITYPUB_DELIVERY_TIMEOUT', 2.0),
+ 'ap_delivery_concurrency' => env('ACTIVITYPUB_DELIVERY_CONCURRENCY', 10),
+
'remote_follow_enabled' => env('REMOTE_FOLLOW', false),
'activitypub_enabled' => env('ACTIVITY_PUB', false),
@@ -262,11 +262,6 @@ return [
'enforce_account_limit' => env('LIMIT_ACCOUNT_SIZE', true),
- 'ap_inbox' => env('ACTIVITYPUB_INBOX', false),
- 'ap_shared' => env('ACTIVITYPUB_SHAREDINBOX', false),
- 'ap_delivery_timeout' => env('ACTIVITYPUB_DELIVERY_TIMEOUT', 2.0),
- 'ap_delivery_concurrency' => env('ACTIVITYPUB_DELIVERY_CONCURRENCY', 10),
-
'import' => [
'instagram' => [
'enabled' => false,
diff --git a/config/recaptcha.php b/config/recaptcha.php
deleted file mode 100644
index 049af6d52..000000000
--- a/config/recaptcha.php
+++ /dev/null
@@ -1,66 +0,0 @@
- env('RECAPTCHA_PUBLIC_KEY', ''),
- 'private_key' => env('RECAPTCHA_PRIVATE_KEY', ''),
-
- /*
- |--------------------------------------------------------------------------
- | Template
- |--------------------------------------------------------------------------
- |
- | Set a template to use if you don't want to use the standard one.
- |
- */
- 'template' => '',
-
- /*
- |--------------------------------------------------------------------------
- | Driver
- |--------------------------------------------------------------------------
- |
- | Determine how to call out to get response; values are 'curl' or 'native'.
- | Only applies to v2.
- |
- */
- 'driver' => 'curl',
-
- /*
- |--------------------------------------------------------------------------
- | Options
- |--------------------------------------------------------------------------
- |
- | Various options for the driver
- |
- */
- 'options' => [
-
- 'curl_timeout' => 1,
- 'curl_verify' => true,
-
- ],
-
- /*
- |--------------------------------------------------------------------------
- | Version
- |--------------------------------------------------------------------------
- |
- | Set which version of ReCaptcha to use.
- |
- */
-
- 'version' => 2,
-
-];
diff --git a/resources/views/admin/settings/config/general.blade.php b/resources/views/admin/settings/config/general.blade.php
index 51597a015..480ec2dad 100644
--- a/resources/views/admin/settings/config/general.blade.php
+++ b/resources/views/admin/settings/config/general.blade.php
@@ -24,18 +24,6 @@
-
-
\ No newline at end of file
+
diff --git a/resources/views/auth/checkpoint.blade.php b/resources/views/auth/checkpoint.blade.php
index ae415a5b4..d7f1ed306 100644
--- a/resources/views/auth/checkpoint.blade.php
+++ b/resources/views/auth/checkpoint.blade.php
@@ -26,12 +26,6 @@
- @if(config('pixelfed.recaptcha'))
-
- {!! Recaptcha::render() !!}
-
- @endif
-
- @if(config('pixelfed.recaptcha'))
-
- {!! Recaptcha::render() !!}
-
- @endif
-
-
- @if(config('pixelfed.recaptcha'))
-
- {!! Recaptcha::render() !!}
-
- @endif
- @if(config('pixelfed.recaptcha'))
-
- {!! Recaptcha::render() !!}
-
- @endif
-
- @if(config('pixelfed.recaptcha'))
-
- {!! Recaptcha::render() !!}
-
- @endif
-