From 8f9d36bd3dca3a44d2128f03d153fabc5eba1b62 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 14 May 2022 00:36:52 -0600 Subject: [PATCH] Cleanup, fixes #3440 --- app/Http/Controllers/InstallController.php | 1 - app/Services/StoryService.php | 2 +- .../Api/StatusStatelessTransformer.php | 1 - app/Transformer/Api/StatusTransformer.php | 1 - .../assets/js/components/NotificationCard.vue | 26 ------------------- 5 files changed, 1 insertion(+), 30 deletions(-) diff --git a/app/Http/Controllers/InstallController.php b/app/Http/Controllers/InstallController.php index 0204f16f0..182928dba 100644 --- a/app/Http/Controllers/InstallController.php +++ b/app/Http/Controllers/InstallController.php @@ -77,7 +77,6 @@ class InstallController extends Controller { abort_if(file_exists(base_path('.env')), 404, 'The .env configuration file already exists.'); return $this->checkPermissions($request); - return response()->json($request->all(), 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES); } protected function checkPermissions($request) diff --git a/app/Services/StoryService.php b/app/Services/StoryService.php index dd53213c1..6c1d95b8e 100644 --- a/app/Services/StoryService.php +++ b/app/Services/StoryService.php @@ -44,7 +44,7 @@ class StoryService return Cache::forget(self::STORY_KEY . 'by-id:id-' . $id); } - public static function getStories($id, $pid) + public static function getStories($id, $pid = null) { return Story::whereProfileId($id) ->latest() diff --git a/app/Transformer/Api/StatusStatelessTransformer.php b/app/Transformer/Api/StatusStatelessTransformer.php index 58ed41f40..927fac9e5 100644 --- a/app/Transformer/Api/StatusStatelessTransformer.php +++ b/app/Transformer/Api/StatusStatelessTransformer.php @@ -51,7 +51,6 @@ class StatusStatelessTransformer extends Fractal\TransformerAbstract ], 'language' => null, 'mentions' => StatusMentionService::get($status->id), - 'tags' => [], 'pf_type' => $status->type ?? $status->setType(), 'reply_count' => (int) $status->reply_count, 'comments_disabled' => $status->comments_disabled ? true : false, diff --git a/app/Transformer/Api/StatusTransformer.php b/app/Transformer/Api/StatusTransformer.php index d9cbeaa65..eeb93d856 100644 --- a/app/Transformer/Api/StatusTransformer.php +++ b/app/Transformer/Api/StatusTransformer.php @@ -55,7 +55,6 @@ class StatusTransformer extends Fractal\TransformerAbstract 'language' => null, 'pinned' => null, 'mentions' => StatusMentionService::get($status->id), - 'tags' => [], 'pf_type' => $status->type ?? $status->setType(), 'reply_count' => (int) $status->reply_count, 'comments_disabled' => $status->comments_disabled ? true : false, diff --git a/resources/assets/js/components/NotificationCard.vue b/resources/assets/js/components/NotificationCard.vue index 2c9a0a5c0..b2230cbca 100644 --- a/resources/assets/js/components/NotificationCard.vue +++ b/resources/assets/js/components/NotificationCard.vue @@ -283,32 +283,6 @@ }, interval); }, - refreshNotifications() { - let self = this; - axios.get('/api/pixelfed/v1/notifications') - .then(res => { - let data = res.data.filter(n => { - if(n.type == 'share' || self.notificationMaxId >= n.id) { - return false; - } - return true; - }); - if(data.length > 0) { - let ids = data.map(n => n.id); - let max = Math.max(ids); - if(max <= self.notificationMaxId) { - return; - } else { - self.notificationMaxId = max; - self.notifications = data; - let beep = new Audio('/static/beep.mp3'); - beep.volume = 0.7; - beep.play(); - } - } - }); - }, - fetchFollowRequests() { if(window._sharedData.curUser.locked == true) { axios.get('/account/follow-requests.json')