🧑‍💻 move mastodon env to services

Traewelling · Jan 18, 2025 · 61d7486 · 61d7486
1 parent 3b6d547
commit 61d7486
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/app/Console/Commands/DatabaseCleaner/MastodonServers.php b/app/Console/Commands/DatabaseCleaner/MastodonServers.php
@@ -68,7 +68,7 @@ private function checkInvalidServers(): void {
                         'client_id'     => $server->client_id,
                         'client_secret' => $server->client_secret,
                         'grant_type'    => 'client_credentials',
-                        'redirect_uri'  => config('trwl.mastodon_redirect'),
+                        'redirect_uri'  => config('services.mastodon.redirect'),
                     ],
                     'http_errors' => false,
                 ]);

diff --git a/app/Http/Controllers/Backend/Social/MastodonController.php b/app/Http/Controllers/Backend/Social/MastodonController.php
@@ -77,8 +77,8 @@ public static function getMastodonServer(string $domain): ?MastodonServer {
     private static function createMastodonServer(string $domain): MastodonServer {
         try {
             $info = Mastodon::domain($domain)->createApp(
-                client_name:   config('trwl.mastodon_appname'),
-                redirect_uris: config('trwl.mastodon_redirect'),
+                client_name:   config('services.mastodon.client_name'), //TODO: why is client name required here?
+                redirect_uris: config('services.mastodon.redirect'),
                 scopes:        'write read',
                 website:       config('app.url')
             );
@@ -220,6 +220,6 @@ public static function getLastSavedPostIdFromUserStatuses(User $user) {
     }
 
     public static function getRequestOptions(): array {
-        return [RequestOptions::TIMEOUT => config("trwl.mastodon_timeout_seconds")];
+        return [RequestOptions::TIMEOUT => config('services.mastodon.timeout')];
     }
 }
diff --git a/config/services.php b/config/services.php
@@ -16,9 +16,11 @@
 
     'mastodon' => [
         'domain'        => env('MASTODON_DOMAIN'),
+        'client_name'   => env('MASTODON_APPNAME'), // TODO: check if this is a required value...? I don't think, we need this. ~@kris
         'client_id'     => env('MASTODON_ID'),
         'client_secret' => env('MASTODON_SECRET'),
-        'redirect'      => env('MASTODON_REDIRECT'),
+        'redirect'      => env('MASTODON_REDIRECT', 'http://localhost:8000/callback/mastodon'),
+        'timeout'       => env('MASTODON_TIMEOUT_SECONDS', 2),
     ],
 
     'telegram' => [

diff --git a/config/trwl.php b/config/trwl.php
@@ -3,14 +3,6 @@
 return [
     'post_social'               => env('POST_SOCIAL', false),
 
-    # Mastodon
-    'mastodon_domain'           => env('MASTODON_DOMAIN'),
-    'mastodon_id'               => env('MASTODON_ID'),
-    'mastodon_secret'           => env('MASTODON_SECRET'),
-    'mastodon_redirect'         => env('MASTODON_REDIRECT'),
-    'mastodon_appname'          => env('MASTODON_APPNAME'),
-    'mastodon_timeout_seconds'  => env("MASTODON_TIMEOUT_SECONDS", 5),
-
     # Brouter
     'brouter'                   => env('BROUTER', true),
     'brouter_url'               => env('BROUTER_URL', 'https://brouter.de/'),