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

Merge pull request #668 from pixelfed/frontend-ui-refactor

Browse source 
Update Api
This commit is contained in:
daniel 2018-12-24 23:53:18 -07:00 committed by GitHub
commit e362f46d01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/PublicApiController.php
View file

@ -72,6 +72,9 @@ class PublicApiController extends Controller
return [];
} else {
$profile = Auth::user()->profile;
if($profile->status) {
return [];
}
$shares = $status->sharedBy()->orderBy('created_at','desc')->paginate(10);
$collection = new Fractal\Resource\Collection($shares, new AccountTransformer());
return $this->fractal->createData($collection)->toArray();
@ -112,6 +115,7 @@ class PublicApiController extends Controller
if($request->filled('min_id') || $request->filled('max_id')) {
if($request->filled('min_id')) {
$replies = $status->comments()
->whereNull('reblog_of_id')
->select('id', 'caption', 'rendered', 'profile_id', 'in_reply_to_id', 'created_at')
->where('id', '>=', $request->min_id)
->orderBy('id', 'desc')
@ -119,6 +123,7 @@ class PublicApiController extends Controller
}
if($request->filled('max_id')) {
$replies = $status->comments()
->whereNull('reblog_of_id')
->select('id', 'caption', 'rendered', 'profile_id', 'in_reply_to_id', 'created_at')
->where('id', '<=', $request->max_id)
->orderBy('id', 'desc')

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

@ -328,7 +328,7 @@ class Inbox
$parent = Helpers::statusFirstOrFetch($obj['object']);
$status = Status::whereProfileId($profile->id)
->whereReblogOfId($parent->id)
->first();
->firstOrFail();
Notification::whereProfileId($parent->profile->id)
->whereActorId($profile->id)
->whereAction('share')