Update activitpub setting, use config_cache()

2024-03-12 02:20:37 -06:00 · 2024-03-12 02:20:37 -06:00 · 5071aaf408
commit 5071aaf408
--- a/app/Http/Controllers/FederationController.php
+++ b/app/Http/Controllers/FederationController.php
@ -2,41 +2,25 @@

 namespace App\Http\Controllers;

-use App\Jobs\InboxPipeline\{
-    DeleteWorker,
-    InboxWorker,
-    InboxValidator
-};
-use App\Jobs\RemoteFollowPipeline\RemoteFollowPipeline;
-use App\{
-    AccountLog,
-    Like,
-    Profile,
-    Status,
-    User
-};
-use App\Util\Lexer\Nickname;
-use App\Util\Webfinger\Webfinger;
-use Auth;
-use Cache;
-use Carbon\Carbon;
-use Illuminate\Http\Request;
-use League\Fractal;
-use App\Util\Site\Nodeinfo;
-use App\Util\ActivityPub\{
-    Helpers,
-    HttpSignature,
-    Outbox
-};
-use Zttp\Zttp;
-use App\Services\InstanceService;
+use App\Jobs\InboxPipeline\DeleteWorker;
+use App\Jobs\InboxPipeline\InboxValidator;
+use App\Jobs\InboxPipeline\InboxWorker;
+use App\Profile;
 use App\Services\AccountService;
+use App\Services\InstanceService;
+use App\Status;
+use App\Util\Lexer\Nickname;
+use App\Util\Site\Nodeinfo;
+use App\Util\Webfinger\Webfinger;
+use Cache;
+use Illuminate\Http\Request;

 class FederationController extends Controller
 {
    public function nodeinfoWellKnown()
    {
        abort_if(! config('federation.nodeinfo.enabled'), 404);
+
        return response()->json(Nodeinfo::wellKnown(), 200, [], JSON_UNESCAPED_SLASHES)
            ->header('Access-Control-Allow-Origin', '*');
    }
@ -44,6 +28,7 @@ class FederationController extends Controller
    public function nodeinfo()
    {
        abort_if(! config('federation.nodeinfo.enabled'), 404);
+
        return response()->json(Nodeinfo::get(), 200, [], JSON_UNESCAPED_SLASHES)
            ->header('Access-Control-Allow-Origin', '*');
    }
@ -65,21 +50,22 @@ class FederationController extends Controller
            $res = [
                'subject' => 'acct:'.$domain.'@'.$domain,
                'aliases' => [
-                    'https://' . $domain . '/i/actor'
+                    'https://'.$domain.'/i/actor',
                ],
                'links' => [
                    [
                        'rel' => 'http://webfinger.net/rel/profile-page',
                        'type' => 'text/html',
-                        'href' => 'https://' . $domain . '/site/kb/instance-actor'
+                        'href' => 'https://'.$domain.'/site/kb/instance-actor',
                    ],
                    [
                        'rel' => 'self',
                        'type' => 'application/activity+json',
-                        'href' => 'https://' . $domain . '/i/actor'
-                    ]
-                ]
+                        'href' => 'https://'.$domain.'/i/actor',
+                    ],
+                ],
            ];
+
            return response()->json($res, 200, [], JSON_UNESCAPED_SLASHES);
        }
        $hash = hash('sha256', $resource);
@ -118,7 +104,7 @@ class FederationController extends Controller

    public function userOutbox(Request $request, $username)
    {
-        abort_if(!config_cache('federation.activitypub.enabled'), 404);
+        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);

        if (! $request->wantsJson()) {
            return redirect('/'.$username);
@ -140,7 +126,7 @@ class FederationController extends Controller

    public function userInbox(Request $request, $username)
    {
-        abort_if(!config_cache('federation.activitypub.enabled'), 404);
+        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
        abort_if(! config('federation.activitypub.inbox'), 404);

        $headers = $request->headers->all();
@ -162,6 +148,7 @@ class FederationController extends Controller
                if ($obj['object']['type'] === 'Person') {
                    if (Profile::whereRemoteUrl($obj['object']['id'])->exists()) {
                        dispatch(new DeleteWorker($headers, $payload))->onQueue('inbox');
+
                        return;
                    }
                }
@ -169,27 +156,30 @@ class FederationController extends Controller
                if ($obj['object']['type'] === 'Tombstone') {
                    if (Status::whereObjectUrl($obj['object']['id'])->exists()) {
                        dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
+
                        return;
                    }
                }

                if ($obj['object']['type'] === 'Story') {
                    dispatch(new DeleteWorker($headers, $payload))->onQueue('story');
+
                    return;
                }
            }
+
            return;
        } elseif (isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
            dispatch(new InboxValidator($username, $headers, $payload))->onQueue('follow');
        } else {
            dispatch(new InboxValidator($username, $headers, $payload))->onQueue('high');
        }
-        return;
+
    }

    public function sharedInbox(Request $request)
    {
-        abort_if(!config_cache('federation.activitypub.enabled'), 404);
+        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
        abort_if(! config('federation.activitypub.sharedInbox'), 404);

        $headers = $request->headers->all();
@ -214,6 +204,7 @@ class FederationController extends Controller
                if ($obj['object']['type'] === 'Person') {
                    if (Profile::whereRemoteUrl($obj['object']['id'])->exists()) {
                        dispatch(new DeleteWorker($headers, $payload))->onQueue('inbox');
+
                        return;
                    }
                }
@ -221,27 +212,30 @@ class FederationController extends Controller
                if ($obj['object']['type'] === 'Tombstone') {
                    if (Status::whereObjectUrl($obj['object']['id'])->exists()) {
                        dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
+
                        return;
                    }
                }

                if ($obj['object']['type'] === 'Story') {
                    dispatch(new DeleteWorker($headers, $payload))->onQueue('story');
+
                    return;
                }
            }
+
            return;
        } elseif (isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
            dispatch(new InboxWorker($headers, $payload))->onQueue('follow');
        } else {
            dispatch(new InboxWorker($headers, $payload))->onQueue('shared');
        }
-        return;
+
    }

    public function userFollowing(Request $request, $username)
    {
-        abort_if(!config_cache('federation.activitypub.enabled'), 404);
+        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);

        $id = AccountService::usernameToId($username);
        abort_if(! $id, 404);
@ -253,12 +247,13 @@ class FederationController extends Controller
            'type' => 'OrderedCollection',
            'totalItems' => $account['following_count'] ?? 0,
        ];
+
        return response()->json($obj)->header('Content-Type', 'application/activity+json');
    }

    public function userFollowers(Request $request, $username)
    {
-        abort_if(!config_cache('federation.activitypub.enabled'), 404);
+        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
        $id = AccountService::usernameToId($username);
        abort_if(! $id, 404);
        $account = AccountService::get($id);
@ -269,6 +264,7 @@ class FederationController extends Controller
            'type' => 'OrderedCollection',
            'totalItems' => $account['followers_count'] ?? 0,
        ];
+
        return response()->json($obj)->header('Content-Type', 'application/activity+json');
    }
 }
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@ -2,27 +2,25 @@

 namespace App\Http\Controllers;

-use Auth;
 use App\Hashtag;
 use App\Place;
 use App\Profile;
+use App\Services\WebfingerService;
 use App\Status;
-use Illuminate\Http\Request;
 use App\Util\ActivityPub\Helpers;
+use Auth;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
-use App\Transformer\Api\{
-	AccountTransformer,
-	HashtagTransformer,
-	StatusTransformer,
-};
-use App\Services\WebfingerService;

 class SearchController extends Controller
 {
    public $tokens = [];
+
    public $term = '';
+
    public $hash = '';
+
    public $cacheKey = 'api:search:tag:';

    public function __construct()
@ -36,7 +34,7 @@ class SearchController extends Controller
            'q' => 'required|string|min:3|max:120',
            'src' => 'required|string|in:metro',
            'v' => 'required|integer|in:2',
-			'scope' => 'required|in:all,hashtag,profile,remote,webfinger'
+            'scope' => 'required|in:all,hashtag,profile,remote,webfinger',
        ]);

        $scope = $request->input('scope') ?? 'all';
@ -84,12 +82,13 @@ class SearchController extends Controller
        $hash = hash('sha256', $tag);
        if (Helpers::validateUrl($tag) != false &&
            Helpers::validateLocalUrl($tag) != true &&
-			config_cache('federation.activitypub.enabled') == true &&
+            (bool) config_cache('federation.activitypub.enabled') == true &&
            config('federation.activitypub.remoteFollow') == true
        ) {
            $remote = Helpers::fetchFromUrl($tag);
            if (isset($remote['type']) &&
-				$remote['type'] == 'Note') {
+                in_array($remote['type'], ['Note', 'Question'])
+            ) {
                $item = Helpers::statusFetch($tag);
                $this->tokens['posts'] = [[
                    'count' => 0,
@ -122,7 +121,7 @@ class SearchController extends Controller
                        'tokens' => [$item->caption],
                        'name' => $item->caption,
                        'thumb' => $item->thumb(),
-						'filter' => $item->firstMedia()->filter_class
+                        'filter' => $item->firstMedia()->filter_class,
                    ];
                });
                $this->tokens['posts'] = $posts;
@ -153,6 +152,7 @@ class SearchController extends Controller
                        'name' => null,
                    ];
                });
+
                return $tags;
            }
        });
@ -180,7 +180,7 @@ class SearchController extends Controller
                    'tokens' => '',
                    'name' => null,
                    'city' => $item->name,
-						'country'   => $item->country
+                    'country' => $item->country,
                ];
            });
            // return $tags;
@ -190,7 +190,7 @@ class SearchController extends Controller
        $this->tokens['placesPagination'] = [
            'total' => $hashtags->total(),
            'current_page' => $hashtags->currentPage(),
-			'last_page' => $hashtags->lastPage()
+            'last_page' => $hashtags->lastPage(),
        ];
    }

@ -203,7 +203,7 @@ class SearchController extends Controller
        $ttl = now()->addHours(2);
        if (Helpers::validateUrl($tag) != false &&
            Helpers::validateLocalUrl($tag) != true &&
-			config_cache('federation.activitypub.enabled') == true &&
+            (bool) config_cache('federation.activitypub.enabled') == true &&
            config('federation.activitypub.remoteFollow') == true
        ) {
            $remote = Helpers::fetchFromUrl($tag);
@ -225,15 +225,14 @@ class SearchController extends Controller
                            'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id),
                            'thumb' => $item->avatarUrl(),
                            'local' => (bool) ! $item->domain,
-							'post_count' => $item->statuses()->count()
-						]
+                            'post_count' => $item->statuses()->count(),
+                        ],
                    ]];
+
                    return $tokens;
                });
            }
-		}
-
-		else {
+        } else {
            $this->tokens['profiles'] = Cache::remember($key, $ttl, function () use ($tag) {
                if (Str::startsWith($tag, '@')) {
                    $tag = substr($tag, 1);
@ -262,8 +261,8 @@ class SearchController extends Controller
                                'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id),
                                'thumb' => $item->avatarUrl(),
                                'local' => (bool) ! $item->domain,
-								'post_count' => $item->statuses()->count()
-							]
+                                'post_count' => $item->statuses()->count(),
+                            ],
                        ];
                    });
                }
@ -301,11 +300,11 @@ class SearchController extends Controller
                    'following' => null,
                    'follow_request' => null,
                    'thumb' => $wfs['avatar'],
-					'local' => (bool) $wfs['local']
-				]
-			]
+                    'local' => (bool) $wfs['local'],
+                ],
+            ],
        ];
-		return;
+
    }

    protected function remotePostLookup()
@ -333,7 +332,7 @@ class SearchController extends Controller
                'username' => $item->profile->username,
                'caption' => $item->rendered ?? $item->caption,
                'thumb' => $url,
-				'timestamp' => $item->created_at->diffForHumans()
+                'timestamp' => $item->created_at->diffForHumans(),
            ]];
        }

@ -353,7 +352,7 @@ class SearchController extends Controller
                'username' => $item->profile->username,
                'caption' => $item->rendered ?? $item->caption,
                'thumb' => $url,
-				'timestamp' => $item->created_at->diffForHumans()
+                'timestamp' => $item->created_at->diffForHumans(),
            ]];
        }
    }
--- a/app/Http/Controllers/StatusController.php
+++ b/app/Http/Controllers/StatusController.php
@ -78,7 +78,7 @@ class StatusController extends Controller
            ]);
        }

-        if ($request->wantsJson() && config_cache('federation.activitypub.enabled')) {
+        if ($request->wantsJson() && (bool) config_cache('federation.activitypub.enabled')) {
            return $this->showActivityPub($request, $status);
        }

--- a/app/Jobs/SharePipeline/SharePipeline.php
+++ b/app/Jobs/SharePipeline/SharePipeline.php
@ -2,9 +2,15 @@

 namespace App\Jobs\SharePipeline;

-use Cache, Log;
-use Illuminate\Support\Facades\Redis;
-use App\{Status, Notification};
+use App\Jobs\HomeFeedPipeline\FeedInsertPipeline;
+use App\Notification;
+use App\Services\ReblogService;
+use App\Services\StatusService;
+use App\Status;
+use App\Transformer\ActivityPub\Verb\Announce;
+use App\Util\ActivityPub\HttpSignature;
+use GuzzleHttp\Client;
+use GuzzleHttp\Pool;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@ -12,12 +18,6 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use App\Transformer\ActivityPub\Verb\Announce;
-use GuzzleHttp\{Pool, Client, Promise};
-use App\Util\ActivityPub\HttpSignature;
-use App\Services\ReblogService;
-use App\Services\StatusService;
-use App\Jobs\HomeFeedPipeline\FeedInsertPipeline;

 class SharePipeline implements ShouldQueue
 {
@ -64,6 +64,7 @@ class SharePipeline implements ShouldQueue

        if ($target->id === $status->profile_id) {
            $this->remoteAnnounceDeliver();
+
            return true;
        }

@ -90,7 +91,7 @@ class SharePipeline implements ShouldQueue

    public function remoteAnnounceDeliver()
    {
-		if(config('app.env') !== 'production' || config_cache('federation.activitypub.enabled') == false) {
+        if (config('app.env') !== 'production' || (bool) config_cache('federation.activitypub.enabled') == false) {
            return true;
        }
        $status = $this->status;
@ -111,7 +112,7 @@ class SharePipeline implements ShouldQueue
        $payload = json_encode($activity);

        $client = new Client([
-			'timeout'  => config('federation.activitypub.delivery.timeout')
+            'timeout' => config('federation.activitypub.delivery.timeout'),
        ]);

        $version = config('pixelfed.version');
@ -129,8 +130,8 @@ class SharePipeline implements ShouldQueue
                        'curl' => [
                            CURLOPT_HTTPHEADER => $headers,
                            CURLOPT_POSTFIELDS => $payload,
-							CURLOPT_HEADER => true
-						]
+                            CURLOPT_HEADER => true,
+                        ],
                    ]);
                };
            }
@ -141,7 +142,7 @@ class SharePipeline implements ShouldQueue
            'fulfilled' => function ($response, $index) {
            },
            'rejected' => function ($reason, $index) {
-			}
+            },
        ]);

        $promise = $pool->promise();
--- a/app/Jobs/SharePipeline/UndoSharePipeline.php
+++ b/app/Jobs/SharePipeline/UndoSharePipeline.php
@ -2,9 +2,15 @@

 namespace App\Jobs\SharePipeline;

-use Cache, Log;
-use Illuminate\Support\Facades\Redis;
-use App\{Status, Notification};
+use App\Jobs\HomeFeedPipeline\FeedRemovePipeline;
+use App\Notification;
+use App\Services\ReblogService;
+use App\Services\StatusService;
+use App\Status;
+use App\Transformer\ActivityPub\Verb\UndoAnnounce;
+use App\Util\ActivityPub\HttpSignature;
+use GuzzleHttp\Client;
+use GuzzleHttp\Pool;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@ -12,17 +18,13 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use App\Transformer\ActivityPub\Verb\UndoAnnounce;
-use GuzzleHttp\{Pool, Client, Promise};
-use App\Util\ActivityPub\HttpSignature;
-use App\Services\ReblogService;
-use App\Services\StatusService;
-use App\Jobs\HomeFeedPipeline\FeedRemovePipeline;

 class UndoSharePipeline implements ShouldQueue
 {
    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
    protected $status;
+
    public $deleteWhenMissingModels = true;

    public function __construct(Status $status)
@ -64,7 +66,7 @@ class UndoSharePipeline implements ShouldQueue
            return;
        }

-		if(config('app.env') !== 'production' || config_cache('federation.activitypub.enabled') == false) {
+        if (config('app.env') !== 'production' || (bool) config_cache('federation.activitypub.enabled') == false) {
            return $status->delete();
        } else {
            return $this->remoteAnnounceDeliver();
@ -73,8 +75,9 @@ class UndoSharePipeline implements ShouldQueue

    public function remoteAnnounceDeliver()
    {
-		if(config('app.env') !== 'production' || config_cache('federation.activitypub.enabled') == false) {
+        if (config('app.env') !== 'production' || (bool) config_cache('federation.activitypub.enabled') == false) {
            $status->delete();
+
            return 1;
        }

@ -95,7 +98,7 @@ class UndoSharePipeline implements ShouldQueue
        $payload = json_encode($activity);

        $client = new Client([
-			'timeout'  => config('federation.activitypub.delivery.timeout')
+            'timeout' => config('federation.activitypub.delivery.timeout'),
        ]);

        $version = config('pixelfed.version');
@ -113,8 +116,8 @@ class UndoSharePipeline implements ShouldQueue
                        'curl' => [
                            CURLOPT_HTTPHEADER => $headers,
                            CURLOPT_POSTFIELDS => $payload,
-							CURLOPT_HEADER => true
-						]
+                            CURLOPT_HEADER => true,
+                        ],
                    ]);
                };
            }
@ -125,7 +128,7 @@ class UndoSharePipeline implements ShouldQueue
            'fulfilled' => function ($response, $index) {
            },
            'rejected' => function ($reason, $index) {
-			}
+            },
        ]);

        $promise = $pool->promise();
--- a/app/Jobs/StatusPipeline/StatusDelete.php
+++ b/app/Jobs/StatusPipeline/StatusDelete.php
@ -2,41 +2,36 @@

 namespace App\Jobs\StatusPipeline;

-use DB, Cache, Storage;
-use App\{
-	AccountInterstitial,
-    Bookmark,
-	CollectionItem,
-    DirectMessage,
-    Like,
-    Media,
-	MediaTag,
-    Mention,
-	Notification,
-	Report,
-	Status,
-    StatusArchived,
-	StatusHashtag,
-    StatusView
-};
+use App\AccountInterstitial;
+use App\Bookmark;
+use App\CollectionItem;
+use App\DirectMessage;
+use App\Jobs\MediaPipeline\MediaDeletePipeline;
+use App\Like;
+use App\Media;
+use App\MediaTag;
+use App\Mention;
+use App\Notification;
+use App\Report;
+use App\Services\CollectionService;
+use App\Services\NotificationService;
+use App\Services\StatusService;
+use App\Status;
+use App\StatusArchived;
+use App\StatusHashtag;
+use App\StatusView;
+use App\Transformer\ActivityPub\Verb\DeleteNote;
+use App\Util\ActivityPub\HttpSignature;
+use Cache;
+use GuzzleHttp\Client;
+use GuzzleHttp\Pool;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use League\Fractal;
-use Illuminate\Support\Str;
 use League\Fractal\Serializer\ArraySerializer;
-use App\Transformer\ActivityPub\Verb\DeleteNote;
-use App\Util\ActivityPub\Helpers;
-use GuzzleHttp\Pool;
-use GuzzleHttp\Client;
-use GuzzleHttp\Promise;
-use App\Util\ActivityPub\HttpSignature;
-use App\Services\CollectionService;
-use App\Services\StatusService;
-use App\Services\NotificationService;
-use App\Jobs\MediaPipeline\MediaDeletePipeline;

 class StatusDelete implements ShouldQueue
 {
@ -52,6 +47,7 @@ class StatusDelete implements ShouldQueue
    public $deleteWhenMissingModels = true;

    public $timeout = 900;
+
    public $tries = 2;

    /**
@ -84,7 +80,7 @@ class StatusDelete implements ShouldQueue

        Cache::forget('pf:atom:user-feed:by-id:'.$status->profile_id);

-		if(config_cache('federation.activitypub.enabled') == true) {
+        if ((bool) config_cache('federation.activitypub.enabled') == true) {
            return $this->fanoutDelete($status);
        } else {
            return $this->unlinkRemoveMedia($status);
@ -101,7 +97,7 @@ class StatusDelete implements ShouldQueue

        if ($status->in_reply_to_id) {
            $parent = Status::findOrFail($status->in_reply_to_id);
-			--$parent->reply_count;
+            $parent->reply_count--;
            $parent->save();
            StatusService::del($parent->id);
        }
@ -184,7 +180,7 @@ class StatusDelete implements ShouldQueue
        $payload = json_encode($activity);

        $client = new Client([
-			'timeout'  => config('federation.activitypub.delivery.timeout')
+            'timeout' => config('federation.activitypub.delivery.timeout'),
        ]);

        $version = config('pixelfed.version');
@ -202,8 +198,8 @@ class StatusDelete implements ShouldQueue
                        'curl' => [
                            CURLOPT_HTTPHEADER => $headers,
                            CURLOPT_POSTFIELDS => $payload,
-							CURLOPT_HEADER => true
-						]
+                            CURLOPT_HEADER => true,
+                        ],
                    ]);
                };
            }
@ -214,7 +210,7 @@ class StatusDelete implements ShouldQueue
            'fulfilled' => function ($response, $index) {
            },
            'rejected' => function ($reason, $index) {
-			}
+            },
        ]);

        $promise = $pool->promise();
--- a/app/Jobs/StatusPipeline/StatusEntityLexer.php
+++ b/app/Jobs/StatusPipeline/StatusEntityLexer.php
@ -3,12 +3,16 @@
 namespace App\Jobs\StatusPipeline;

 use App\Hashtag;
+use App\Jobs\HomeFeedPipeline\FeedInsertPipeline;
 use App\Jobs\MentionPipeline\MentionPipeline;
 use App\Mention;
 use App\Profile;
+use App\Services\AdminShadowFilterService;
+use App\Services\PublicTimelineService;
+use App\Services\StatusService;
+use App\Services\UserFilterService;
 use App\Status;
 use App\StatusHashtag;
-use App\Services\PublicTimelineService;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\Extractor;
 use App\Util\Sentiment\Bouncer;
@ -19,18 +23,15 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use App\Services\StatusService;
-use App\Services\UserFilterService;
-use App\Services\AdminShadowFilterService;
-use App\Jobs\HomeFeedPipeline\FeedInsertPipeline;
-use App\Jobs\HomeFeedPipeline\HashtagInsertFanoutPipeline;

 class StatusEntityLexer implements ShouldQueue
 {
    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

    protected $status;
+
    protected $entities;
+
    protected $autolink;

    /**
@ -110,9 +111,9 @@ class StatusEntityLexer implements ShouldQueue
                $slug = str_slug($tag, '-', false);

                $hashtag = Hashtag::firstOrCreate([
-                    'slug' => $slug
+                    'slug' => $slug,
                ], [
-                    'name' => $tag
+                    'name' => $tag,
                ]);

                StatusHashtag::firstOrCreate(
@ -179,7 +180,7 @@ class StatusEntityLexer implements ShouldQueue
            'photo:album',
            'video',
            'video:album',
-            'photo:video:album'
+            'photo:video:album',
        ];

        if (config_cache('pixelfed.bouncer.enabled')) {
@ -200,7 +201,7 @@ class StatusEntityLexer implements ShouldQueue
            }
        }

-        if(config_cache('federation.activitypub.enabled') == true && config('app.env') == 'production') {
+        if ((bool) config_cache('federation.activitypub.enabled') == true && config('app.env') == 'production') {
            StatusActivityPubDeliver::dispatch($status);
        }
    }
--- a/app/Services/LandingService.php
+++ b/app/Services/LandingService.php
@ -85,7 +85,7 @@ class LandingService
                'media_types' => config_cache('pixelfed.media_types'),
            ],
            'features' => [
-                'federation' => config_cache('federation.activitypub.enabled'),
+                'federation' => (bool) config_cache('federation.activitypub.enabled'),
                'timelines' => [
                    'local' => true,
                    'network' => (bool) config_cache('federation.network_timeline'),
--- a/app/Util/ActivityPub/Outbox.php
+++ b/app/Util/ActivityPub/Outbox.php
@ -2,18 +2,16 @@

 namespace App\Util\ActivityPub;

-use App\Profile;
-use App\Status;
-use League\Fractal;
 use App\Http\Controllers\ProfileController;
-use App\Transformer\ActivityPub\ProfileOutbox;
+use App\Status;
 use App\Transformer\ActivityPub\Verb\CreateNote;
+use League\Fractal;

-class Outbox {
-
+class Outbox
+{
    public static function get($profile)
    {
-        abort_if(!config_cache('federation.activitypub.enabled'), 404);
+        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
        abort_if(! config('federation.activitypub.outbox'), 404);

        if ($profile->status != null) {
@ -43,9 +41,9 @@ class Outbox {
            'id' => $profile->permalink('/outbox'),
            'type' => 'OrderedCollection',
            'totalItems' => $count,
-            'orderedItems' => $res['data']
+            'orderedItems' => $res['data'],
        ];
+
        return $outbox;
    }
-
 }
--- a/resources/views/admin/diagnostics/home.blade.php
+++ b/resources/views/admin/diagnostics/home.blade.php
@ -298,7 +298,7 @@
 	<tr>
 		<td><span class="badge badge-primary">FEDERATION</span></td>
 		<td><strong>ACTIVITY_PUB</strong></td>
-		<td><span>{{config_cache('federation.activitypub.enabled') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{(bool) config_cache('federation.activitypub.enabled') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">FEDERATION</span></td>