UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-02-02 09:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Passing photos_reblogs_only onto the API and formatting database incoming data accordingly

Browse source
This commit is contained in:
Mehdi Benadel 2024-11-16 05:18:12 +01:00
parent 3749267260
commit cfff0089c3
2 changed files with 86 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -2469,6 +2469,7 @@ class ApiV1Controller extends Controller
'max_id' => 'sometimes|integer|min:0|max:'.PHP_INT_MAX,
'limit' => 'sometimes|integer|min:1',
'include_reblogs' => 'sometimes',
'photos_reblogs_only' => 'sometimes',
]);
$napi = $request->has(self::PF_API_ENTITY_KEY);
@ -2481,12 +2482,10 @@ class ApiV1Controller extends Controller
}
$pid = $request->user()->profile_id;
$includeReblogs = $request->filled('include_reblogs') ? $request->boolean('include_reblogs') : false;
$nullFields = $includeReblogs ?
['in_reply_to_id'] :
['in_reply_to_id', 'reblog_of_id'];
$inTypes = $includeReblogs ?
['photo', 'photo:album', 'video', 'video:album', 'photo:video:album', 'share'] :
['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'];
$PhotosReblogsOnly = $request->filled('photos_reblogs_only') ? $request->boolean('photos_reblogs_only') : true;
$nullFields = $includeReblogs ? ['statuses.in_reply_to_id'] : ['statuses.in_reply_to_id', 'statuses.reblog_of_id'];
$inTypesStrict = ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'];
$inTypes = $includeReblogs ? [...$inTypesStrict, 'share'] : $inTypesStrict;
AccountService::setLastActive($request->user()->id);
if (config('exp.cached_home_timeline')) {
@ -2578,23 +2577,36 @@ class ApiV1Controller extends Controller
$following = array_diff($following, $muted);
}
$query = Status::select(
'statuses.id as id',
'statuses.profile_id as profile_id',
'statuses.type as type',
'statuses.visibility as visibility',
'statuses.in_reply_to_id as in_reply_to_id',
'statuses.reblog_of_id as reblog_of_id',
'reblog.type as reblog_type'
);
if ($min || $max) {
$dir = $min ? '>' : '<';
$id = $min ?? $max;
$res = Status::select(
'id',
'profile_id',
'type',
'visibility',
'in_reply_to_id',
'reblog_of_id'
)
->where('id', $dir, $id)
->whereNull($nullFields)
->whereIntegerInRaw('profile_id', $following)
->whereIn('type', $inTypes)
->whereIn('visibility', ['public', 'unlisted', 'private'])
->orderByDesc('id')
$query = $query->where('statuses.id', $dir, $id);
}
$query = $query->whereNull($nullFields)
->whereIntegerInRaw('statuses.profile_id', $following)
->whereIn('statuses.type', $inTypes)
->whereIn('statuses.visibility', ['public', 'unlisted', 'private'])
->leftJoin('statuses as reblog','reblog.id', '=', 'statuses.reblog_of_id');
if ($PhotosReblogsOnly) {
$query = $query->where(function ($query) use ($inTypesStrict) {
$query->whereNull('statuses.reblog_of_id')
->orWhereIn('reblog.type', $inTypesStrict);
});
}
$res = $query->orderByDesc('id')
->take(($limit * 2))
->get()
->map(function ($s) use ($pid, $napi) {
@ -2635,61 +2647,6 @@ class ApiV1Controller extends Controller
})
->take($limit)
->values();
} else {
$res = Status::select(
'id',
'profile_id',
'type',
'visibility',
'in_reply_to_id',
'reblog_of_id',
)
->whereNull($nullFields)
->whereIntegerInRaw('profile_id', $following)
->whereIn('type', $inTypes)
->whereIn('visibility', ['public', 'unlisted', 'private'])
->orderByDesc('id')
->take(($limit * 2))
->get()
->map(function ($s) use ($pid, $napi) {
try {
$account = $napi ? AccountService::get($s['profile_id'], true) : AccountService::getMastodon($s['profile_id'], true);
if (! $account) {
return false;
}
$status = $napi ? StatusService::get($s['id'], false) : StatusService::getMastodon($s['id'], false);
if (! $status || ! isset($status['account']) || ! isset($status['account']['id'])) {
return false;
}
} catch (\Exception $e) {
return false;
}
$status['account'] = $account;
if ($pid) {
$status['favourited'] = (bool) LikeService::liked($pid, $s['id']);
$status['reblogged'] = (bool) ReblogService::get($pid, $status['id']);
$status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']);
}
return $status;
})
->filter(function ($status) {
return $status && isset($status['account']);
})
->map(function ($status) use ($pid) {
if (! empty($status['reblog'])) {
$status['reblog']['favourited'] = (bool) LikeService::liked($pid, $status['reblog']['id']);
$status['reblog']['reblogged'] = (bool) ReblogService::get($pid, $status['reblog']['id']);
$status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']);
}
return $status;
})
->take($limit)
->values();
}
$baseUrl = config('app.url').'/api/v1/timelines/home?limit='.$limit.'&';
$minId = $res->map(function ($s) {

33
resources/assets/components/sections/Timeline.vue
View file

@ -325,29 +325,24 @@
this.isFetchingMore = true;
let url, params;
if(this.getScope() === 'home' && this.settings && this.settings.hasOwnProperty('enable_reblogs') && this.settings.enable_reblogs) {
url = this.baseApi + `home`;
let url = this.baseApi + this.getScope();
let params = {
max_id: this.max_id,
limit: 6,
'_pe': 1,
};
params = {
'_pe': 1,
max_id: this.max_id,
limit: 6,
include_reblogs: true,
}
} else {
url = this.baseApi + this.getScope();
params = {
max_id: this.max_id,
limit: 6,
'_pe': 1,
}
}
if(this.getScope() === 'network') {
switch(this.getScope()) {
case 'home':
params.include_reblogs = this?.settings?.enable_reblogs ?? false;
params.photos_reblogs_only = this?.settings?.photo_reblogs_only ?? true;
break;
case 'network':
params.remote = true;
url = this.baseApi + `public`;
break;
}
axios.get(url, {
params: params
}).then(res => {