UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 05:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3447 from pixelfed/staging

Browse source 
Cleanup, fixes #3440
This commit is contained in:
daniel 2022-05-14 00:37:33 -06:00 committed by GitHub
commit 6d8528175d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/InstallController.php
View file

@ -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)

2
app/Services/StoryService.php
View file

@ -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()

1
app/Transformer/Api/StatusStatelessTransformer.php
View file

@ -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,

1
app/Transformer/Api/StatusTransformer.php
View file

@ -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,

26
resources/assets/js/components/NotificationCard.vue
View file

@ -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')