@@ -77,10 +77,10 @@ public static function getActiveStatuses(): ?Collection {
77
77
'checkin.trip.polyline ' ,
78
78
'tags ' ,
79
79
])
80
- ->whereHas ( ' checkin ' , function ( $ query ) {
81
- $ query ->where ('departure ' , '< ' , now ())
82
- ->where ('arrival ' , '> ' , now ());
83
- } )
80
+ ->join ( ' train_checkins ' , ' statuses.id ' , ' = ' , ' train_checkins.status_id ' )
81
+ ->where ('train_checkins. departure ' , '< ' , now ())
82
+ ->where ('train_checkins. arrival ' , '> ' , now ())
83
+ -> select ( ' statuses.* ' )
84
84
->get ()
85
85
->filter (function (Status $ status ) {
86
86
return Gate::allows ('view ' , $ status ) && $ status ->visibility !== StatusVisibility::UNLISTED ;
@@ -167,9 +167,9 @@ public static function createLike(User $user, Status $status): Like {
167
167
}
168
168
169
169
$ like = Like::updateOrCreate ([
170
- 'user_id ' => $ user ->id ,
171
- 'status_id ' => $ status ->id ,
172
- ]);
170
+ 'user_id ' => $ user ->id ,
171
+ 'status_id ' => $ status ->id ,
172
+ ]);
173
173
174
174
if (!$ status ->user ->mutedUsers ->contains ('id ' , $ user ->id )) {
175
175
$ status ->user ->notify (new StatusLiked ($ like ));
0 commit comments