UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-29 01:33:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update AccountController

Browse source
This commit is contained in:
Daniel Supernault 2018-11-18 21:47:41 -07:00
parent 143e4e4ef6
commit da2777d52f
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.circleci/config.yml
View file

@ -22,7 +22,7 @@ jobs:
- checkout - checkout
- run: sudo apt update && sudo apt install zlib1g-dev libsqlite3-dev - run: sudo apt update && sudo apt install zlib1g-dev libsqlite3-dev
- run: sudo docker-php-ext-install zip - run: sudo docker-php-ext-install pcntl
# Download and cache dependencies # Download and cache dependencies

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

@ -70,6 +70,7 @@ class AccountController extends Controller
$notifications = Notification::whereIn('actor_id', $following) $notifications = Notification::whereIn('actor_id', $following)
->whereIn('action', $allowed) ->whereIn('action', $allowed)
->where('actor_id', '<>', $profile->id) ->where('actor_id', '<>', $profile->id)
->where('profile_id', '<>', $profile->id)
->whereDate('created_at', '>', $timeago) ->whereDate('created_at', '>', $timeago)
->orderBy('notifications.created_at', 'desc') ->orderBy('notifications.created_at', 'desc')
->simplePaginate(30); ->simplePaginate(30);