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

Merge pull request #2817 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-06-24 20:35:52 -06:00 committed by GitHub
commit d2ff41db05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Services/LikeService.php
View file

@ -62,8 +62,16 @@ class LikeService {
if(!$status->likes_count) {
return $empty;
}
$user = request()->user();
$like = Like::whereStatusId($status->id)->first();
if($user) {
$like = Like::whereStatusId($status->id)
->where('profile_id', '!=', $user->profile_id)
->first();
} else {
$like = Like::whereStatusId($status->id)
->first();
}
if(!$like) {
return $empty;

5
app/Util/ActivityPub/Inbox.php
View file

@ -435,9 +435,14 @@ class Inbox
if(!$actor || !$target) {
return;
}
$actor = Helpers::profileFetch($actor);
$target = Helpers::profileFetch($target);
if(!$actor || !$target) {
return;
}
$request = FollowRequest::whereFollowerId($actor->id)
->whereFollowingId($target->id)
->whereIsRejected(false)