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

Merge pull request #4828 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2023-12-13 06:50:58 -07:00 committed by GitHub
commit c2a535bfa1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 239 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -78,6 +78,8 @@
- Update Timeline.vue, improve CHT pagination ([9c43e7e2](https://github.com/pixelfed/pixelfed/commit/9c43e7e2)) - Update Timeline.vue, improve CHT pagination ([9c43e7e2](https://github.com/pixelfed/pixelfed/commit/9c43e7e2))
- Update HomeFeedPipeline, fix StatusService validation ([041c0135](https://github.com/pixelfed/pixelfed/commit/041c0135)) - Update HomeFeedPipeline, fix StatusService validation ([041c0135](https://github.com/pixelfed/pixelfed/commit/041c0135))
- Update Inbox, improve tombstone query efficiency ([759a4393](https://github.com/pixelfed/pixelfed/commit/759a4393)) - Update Inbox, improve tombstone query efficiency ([759a4393](https://github.com/pixelfed/pixelfed/commit/759a4393))
- Update AccountService, add setLastActive method ([ebbd98e7](https://github.com/pixelfed/pixelfed/commit/ebbd98e7))
- Update ApiV1Controller, set last_active_at ([b6419545](https://github.com/pixelfed/pixelfed/commit/b6419545))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9) ## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9)

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

@ -189,6 +189,7 @@ class ApiV1Controller extends Controller
abort_if(!$user, 403); abort_if(!$user, 403);
abort_if($user->status != null, 403); abort_if($user->status != null, 403);
AccountService::setLastActive($user->id);
$res = $request->has(self::PF_API_ENTITY_KEY) ? AccountService::get($user->profile_id) : AccountService::getMastodon($user->profile_id); $res = $request->has(self::PF_API_ENTITY_KEY) ? AccountService::get($user->profile_id) : AccountService::getMastodon($user->profile_id);
@ -247,6 +248,7 @@ class ApiV1Controller extends Controller
]); ]);
$user = $request->user(); $user = $request->user();
AccountService::setLastActive($user->id);
$profile = $user->profile; $profile = $user->profile;
$settings = $user->settings; $settings = $user->settings;
@ -754,6 +756,7 @@ class ApiV1Controller extends Controller
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
$user = $request->user(); $user = $request->user();
AccountService::setLastActive($user->id);
$target = Profile::where('id', '!=', $user->profile_id) $target = Profile::where('id', '!=', $user->profile_id)
->whereNull('status') ->whereNull('status')
@ -838,6 +841,7 @@ class ApiV1Controller extends Controller
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
$user = $request->user(); $user = $request->user();
AccountService::setLastActive($user->id);
$target = Profile::where('id', '!=', $user->profile_id) $target = Profile::where('id', '!=', $user->profile_id)
->whereNull('status') ->whereNull('status')
@ -941,6 +945,7 @@ class ApiV1Controller extends Controller
]); ]);
$user = $request->user(); $user = $request->user();
AccountService::setLastActive($user->id);
$query = $request->input('q'); $query = $request->input('q');
$limit = $request->input('limit') ?? 20; $limit = $request->input('limit') ?? 20;
$resolve = (bool) $request->input('resolve', false); $resolve = (bool) $request->input('resolve', false);
@ -1013,6 +1018,7 @@ class ApiV1Controller extends Controller
$user = $request->user(); $user = $request->user();
$pid = $user->profile_id ?? $user->profile->id; $pid = $user->profile_id ?? $user->profile->id;
AccountService::setLastActive($user->id);
if(intval($id) === intval($pid)) { if(intval($id) === intval($pid)) {
abort(400, 'You cannot block yourself'); abort(400, 'You cannot block yourself');
@ -1105,6 +1111,7 @@ class ApiV1Controller extends Controller
$user = $request->user(); $user = $request->user();
$pid = $user->profile_id ?? $user->profile->id; $pid = $user->profile_id ?? $user->profile->id;
AccountService::setLastActive($user->id);
if(intval($id) === intval($pid)) { if(intval($id) === intval($pid)) {
abort(400, 'You cannot unblock yourself'); abort(400, 'You cannot unblock yourself');
@ -1237,6 +1244,8 @@ class ApiV1Controller extends Controller
$user = $request->user(); $user = $request->user();
AccountService::setLastActive($user->id);
$status = StatusService::getMastodon($id, false); $status = StatusService::getMastodon($id, false);
abort_unless($status, 400); abort_unless($status, 400);
@ -1296,6 +1305,8 @@ class ApiV1Controller extends Controller
$user = $request->user(); $user = $request->user();
AccountService::setLastActive($user->id);
$status = Status::findOrFail($id); $status = Status::findOrFail($id);
if(intval($status->profile_id) !== intval($user->profile_id)) { if(intval($status->profile_id) !== intval($user->profile_id)) {
@ -1611,6 +1622,7 @@ class ApiV1Controller extends Controller
]); ]);
$user = $request->user(); $user = $request->user();
AccountService::setLastActive($user->id);
if($user->last_active_at == null) { if($user->last_active_at == null) {
return []; return [];
@ -1732,6 +1744,7 @@ class ApiV1Controller extends Controller
]); ]);
$user = $request->user(); $user = $request->user();
AccountService::setLastActive($user->id);
$media = Media::whereUserId($user->id) $media = Media::whereUserId($user->id)
->whereProfileId($user->profile_id) ->whereProfileId($user->profile_id)
@ -1778,6 +1791,7 @@ class ApiV1Controller extends Controller
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
$user = $request->user(); $user = $request->user();
AccountService::setLastActive($user->id);
$media = Media::whereUserId($user->id) $media = Media::whereUserId($user->id)
->whereNull('status_id') ->whereNull('status_id')
@ -1821,6 +1835,8 @@ class ApiV1Controller extends Controller
return []; return [];
} }
AccountService::setLastActive($user->id);
if(empty($request->file('file'))) { if(empty($request->file('file'))) {
return response('', 422); return response('', 422);
} }
@ -2065,6 +2081,8 @@ class ApiV1Controller extends Controller
'min_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX, 'min_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX,
'max_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX, 'max_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX,
'since_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX, 'since_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX,
'types[]' => 'sometimes|array',
'type' => 'sometimes|string|in:mention,reblog,follow,favourite'
]); ]);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
@ -2078,28 +2096,28 @@ class ApiV1Controller extends Controller
$min = 1; $min = 1;
} }
$types = $request->input('types');
$maxId = null; $maxId = null;
$minId = null; $minId = null;
AccountService::setLastActive($request->user()->id);
if($max) { $res = $max ?
$res = NotificationService::getMaxMastodon($pid, $max, $limit); NotificationService::getMaxMastodon($pid, $max, $limit) :
$ids = NotificationService::getRankedMaxId($pid, $max, $limit); NotificationService::getMinMastodon($pid, $min ?? $since, $limit);
if(!empty($ids)) { $ids = $max ?
$maxId = max($ids); NotificationService::getRankedMaxId($pid, $max, $limit) :
$minId = min($ids); NotificationService::getRankedMinId($pid, $min ?? $since, $limit);
} if(!empty($ids)) {
} else { $maxId = max($ids);
$res = NotificationService::getMinMastodon($pid, $min ?? $since, $limit); $minId = min($ids);
$ids = NotificationService::getRankedMinId($pid, $min ?? $since, $limit);
if(!empty($ids)) {
$maxId = max($ids);
$minId = min($ids);
}
} }
if(empty($res) && !Cache::has('pf:services:notifications:hasSynced:'.$pid)) { if(empty($res)) {
Cache::put('pf:services:notifications:hasSynced:'.$pid, 1, 1209600); if(!Cache::has('pf:services:notifications:hasSynced:'.$pid)) {
NotificationService::warmCache($pid, 400, true); Cache::put('pf:services:notifications:hasSynced:'.$pid, 1, 1209600);
NotificationService::warmCache($pid, 400, true);
}
} }
$baseUrl = config('app.url') . '/api/v1/notifications?limit=' . $limit . '&'; $baseUrl = config('app.url') . '/api/v1/notifications?limit=' . $limit . '&';
@ -2153,6 +2171,7 @@ class ApiV1Controller extends Controller
$inTypes = $includeReblogs ? $inTypes = $includeReblogs ?
['photo', 'photo:album', 'video', 'video:album', 'photo:video:album', 'share'] : ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album', 'share'] :
['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']; ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'];
AccountService::setLastActive($request->user()->id);
if(config('exp.cached_home_timeline')) { if(config('exp.cached_home_timeline')) {
$paddedLimit = $includeReblogs ? $limit + 10 : $limit + 50; $paddedLimit = $includeReblogs ? $limit + 10 : $limit + 50;
@ -2402,6 +2421,7 @@ class ApiV1Controller extends Controller
$remote = $request->has('remote'); $remote = $request->has('remote');
$local = $request->has('local'); $local = $request->has('local');
$filtered = $user ? UserFilterService::filters($user->profile_id) : []; $filtered = $user ? UserFilterService::filters($user->profile_id) : [];
AccountService::setLastActive($user->id);
if($remote && config('instance.timeline.network.cached')) { if($remote && config('instance.timeline.network.cached')) {
Cache::remember('api:v1:timelines:network:cache_check', 10368000, function() { Cache::remember('api:v1:timelines:network:cache_check', 10368000, function() {
@ -2593,7 +2613,7 @@ class ApiV1Controller extends Controller
public function statusById(Request $request, $id) public function statusById(Request $request, $id)
{ {
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
AccountService::setLastActive($request->user()->id);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
$res = $request->has(self::PF_API_ENTITY_KEY) ? StatusService::get($id, false) : StatusService::getMastodon($id, false); $res = $request->has(self::PF_API_ENTITY_KEY) ? StatusService::get($id, false) : StatusService::getMastodon($id, false);
@ -2637,6 +2657,7 @@ class ApiV1Controller extends Controller
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
$user = $request->user(); $user = $request->user();
AccountService::setLastActive($user->id);
$pid = $user->profile_id; $pid = $user->profile_id;
$status = StatusService::getMastodon($id, false); $status = StatusService::getMastodon($id, false);
@ -3107,7 +3128,7 @@ class ApiV1Controller extends Controller
public function statusDelete(Request $request, $id) public function statusDelete(Request $request, $id)
{ {
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
AccountService::setLastActive($request->user()->id);
$status = Status::whereProfileId($request->user()->profile->id) $status = Status::whereProfileId($request->user()->profile->id)
->findOrFail($id); ->findOrFail($id);
@ -3135,6 +3156,7 @@ class ApiV1Controller extends Controller
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
$user = $request->user(); $user = $request->user();
AccountService::setLastActive($user->id);
$status = Status::whereScope('public')->findOrFail($id); $status = Status::whereScope('public')->findOrFail($id);
if(intval($status->profile_id) !== intval($user->profile_id)) { if(intval($status->profile_id) !== intval($user->profile_id)) {
@ -3181,6 +3203,7 @@ class ApiV1Controller extends Controller
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
$user = $request->user(); $user = $request->user();
AccountService::setLastActive($user->id);
$status = Status::whereScope('public')->findOrFail($id); $status = Status::whereScope('public')->findOrFail($id);
if(intval($status->profile_id) !== intval($user->profile_id)) { if(intval($status->profile_id) !== intval($user->profile_id)) {

376
app/Services/AccountService.php
View file

@ -15,209 +15,223 @@ use Illuminate\Support\Str;
class AccountService class AccountService
{ {
const CACHE_KEY = 'pf:services:account:'; const CACHE_KEY = 'pf:services:account:';
public static function get($id, $softFail = false) public static function get($id, $softFail = false)
{ {
$res = Cache::remember(self::CACHE_KEY . $id, 43200, function() use($id) { $res = Cache::remember(self::CACHE_KEY . $id, 43200, function() use($id) {
$fractal = new Fractal\Manager(); $fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer()); $fractal->setSerializer(new ArraySerializer());
$profile = Profile::find($id); $profile = Profile::find($id);
if(!$profile || $profile->status === 'delete') { if(!$profile || $profile->status === 'delete') {
return null; return null;
} }
$resource = new Fractal\Resource\Item($profile, new AccountTransformer()); $resource = new Fractal\Resource\Item($profile, new AccountTransformer());
return $fractal->createData($resource)->toArray(); return $fractal->createData($resource)->toArray();
}); });
if(!$res) { if(!$res) {
return $softFail ? null : abort(404); return $softFail ? null : abort(404);
} }
return $res; return $res;
} }
public static function getMastodon($id, $softFail = false) public static function getMastodon($id, $softFail = false)
{ {
$account = self::get($id, $softFail); $account = self::get($id, $softFail);
if(!$account) { if(!$account) {
return null; return null;
} }
if(config('exp.emc') == false) { if(config('exp.emc') == false) {
return $account; return $account;
} }
unset( unset(
$account['header_bg'], $account['header_bg'],
$account['is_admin'], $account['is_admin'],
$account['last_fetched_at'], $account['last_fetched_at'],
$account['local'], $account['local'],
$account['location'], $account['location'],
$account['note_text'], $account['note_text'],
$account['pronouns'], $account['pronouns'],
$account['website'] $account['website']
); );
$account['avatar_static'] = $account['avatar']; $account['avatar_static'] = $account['avatar'];
$account['bot'] = false; $account['bot'] = false;
$account['emojis'] = []; $account['emojis'] = [];
$account['fields'] = []; $account['fields'] = [];
$account['header'] = url('/storage/headers/missing.png'); $account['header'] = url('/storage/headers/missing.png');
$account['header_static'] = url('/storage/headers/missing.png'); $account['header_static'] = url('/storage/headers/missing.png');
$account['last_status_at'] = null; $account['last_status_at'] = null;
return $account; return $account;
} }
public static function del($id) public static function del($id)
{ {
Cache::forget('pf:activitypub:user-object:by-id:' . $id); Cache::forget('pf:activitypub:user-object:by-id:' . $id);
return Cache::forget(self::CACHE_KEY . $id); return Cache::forget(self::CACHE_KEY . $id);
} }
public static function settings($id) public static function settings($id)
{ {
return Cache::remember('profile:compose:settings:' . $id, 604800, function() use($id) { return Cache::remember('profile:compose:settings:' . $id, 604800, function() use($id) {
$settings = UserSetting::whereUserId($id)->first(); $settings = UserSetting::whereUserId($id)->first();
if(!$settings) { if(!$settings) {
return self::defaultSettings(); return self::defaultSettings();
} }
return collect($settings) return collect($settings)
->filter(function($item, $key) { ->filter(function($item, $key) {
return in_array($key, array_keys(self::defaultSettings())) == true; return in_array($key, array_keys(self::defaultSettings())) == true;
}) })
->map(function($item, $key) { ->map(function($item, $key) {
if($key == 'compose_settings') { if($key == 'compose_settings') {
$cs = self::defaultSettings()['compose_settings']; $cs = self::defaultSettings()['compose_settings'];
$ms = is_array($item) ? $item : []; $ms = is_array($item) ? $item : [];
return array_merge($cs, $ms); return array_merge($cs, $ms);
} }
if($key == 'other') { if($key == 'other') {
$other = self::defaultSettings()['other']; $other = self::defaultSettings()['other'];
$mo = is_array($item) ? $item : []; $mo = is_array($item) ? $item : [];
return array_merge($other, $mo); return array_merge($other, $mo);
} }
return $item; return $item;
}); });
}); });
} }
public static function canEmbed($id) public static function canEmbed($id)
{ {
return self::settings($id)['other']['disable_embeds'] == false; return self::settings($id)['other']['disable_embeds'] == false;
} }
public static function defaultSettings() public static function defaultSettings()
{ {
return [ return [
'crawlable' => true, 'crawlable' => true,
'public_dm' => false, 'public_dm' => false,
'reduce_motion' => false, 'reduce_motion' => false,
'high_contrast_mode' => false, 'high_contrast_mode' => false,
'video_autoplay' => false, 'video_autoplay' => false,
'show_profile_follower_count' => true, 'show_profile_follower_count' => true,
'show_profile_following_count' => true, 'show_profile_following_count' => true,
'compose_settings' => [ 'compose_settings' => [
'default_scope' => 'public', 'default_scope' => 'public',
'default_license' => 1, 'default_license' => 1,
'media_descriptions' => false 'media_descriptions' => false
], ],
'other' => [ 'other' => [
'advanced_atom' => false, 'advanced_atom' => false,
'disable_embeds' => false, 'disable_embeds' => false,
'mutual_mention_notifications' => false, 'mutual_mention_notifications' => false,
'hide_collections' => false, 'hide_collections' => false,
'hide_like_counts' => false, 'hide_like_counts' => false,
'hide_groups' => false, 'hide_groups' => false,
'hide_stories' => false, 'hide_stories' => false,
'disable_cw' => false, 'disable_cw' => false,
] ]
]; ];
} }
public static function syncPostCount($id) public static function syncPostCount($id)
{ {
$profile = Profile::find($id); $profile = Profile::find($id);
if(!$profile) { if(!$profile) {
return false; return false;
} }
$key = self::CACHE_KEY . 'pcs:' . $id; $key = self::CACHE_KEY . 'pcs:' . $id;
if(Cache::has($key)) { if(Cache::has($key)) {
return; return;
} }
$count = Status::whereProfileId($id) $count = Status::whereProfileId($id)
->whereNull('in_reply_to_id') ->whereNull('in_reply_to_id')
->whereNull('reblog_of_id') ->whereNull('reblog_of_id')
->whereIn('scope', ['public', 'unlisted', 'private']) ->whereIn('scope', ['public', 'unlisted', 'private'])
->count(); ->count();
$profile->status_count = $count; $profile->status_count = $count;
$profile->save(); $profile->save();
Cache::put($key, 1, 900); Cache::put($key, 1, 900);
return true; return true;
} }
public static function usernameToId($username) public static function usernameToId($username)
{ {
$key = self::CACHE_KEY . 'u2id:' . hash('sha256', $username); $key = self::CACHE_KEY . 'u2id:' . hash('sha256', $username);
return Cache::remember($key, 900, function() use($username) { return Cache::remember($key, 14400, function() use($username) {
$s = Str::of($username); $s = Str::of($username);
if($s->contains('@') && !$s->startsWith('@')) { if($s->contains('@') && !$s->startsWith('@')) {
$username = "@{$username}"; $username = "@{$username}";
} }
$profile = DB::table('profiles') $profile = DB::table('profiles')
->whereUsername($username) ->whereUsername($username)
->first(); ->first();
if(!$profile) { if(!$profile) {
return null; return null;
} }
return (string) $profile->id; return (string) $profile->id;
}); });
} }
public static function hiddenFollowers($id) public static function hiddenFollowers($id)
{ {
$account = self::get($id, true); $account = self::get($id, true);
if(!$account || !isset($account['local']) || $account['local'] == false) { if(!$account || !isset($account['local']) || $account['local'] == false) {
return false; return false;
} }
return Cache::remember('pf:acct:settings:hidden-followers:' . $id, 43200, function() use($id) { return Cache::remember('pf:acct:settings:hidden-followers:' . $id, 43200, function() use($id) {
$user = User::whereProfileId($id)->first(); $user = User::whereProfileId($id)->first();
if(!$user) { if(!$user) {
return false; return false;
} }
$settings = UserSetting::whereUserId($user->id)->first(); $settings = UserSetting::whereUserId($user->id)->first();
if($settings) { if($settings) {
return $settings->show_profile_follower_count == false; return $settings->show_profile_follower_count == false;
} }
return false; return false;
}); });
} }
public static function hiddenFollowing($id) public static function hiddenFollowing($id)
{ {
$account = self::get($id, true); $account = self::get($id, true);
if(!$account || !isset($account['local']) || $account['local'] == false) { if(!$account || !isset($account['local']) || $account['local'] == false) {
return false; return false;
} }
return Cache::remember('pf:acct:settings:hidden-following:' . $id, 43200, function() use($id) { return Cache::remember('pf:acct:settings:hidden-following:' . $id, 43200, function() use($id) {
$user = User::whereProfileId($id)->first(); $user = User::whereProfileId($id)->first();
if(!$user) { if(!$user) {
return false; return false;
} }
$settings = UserSetting::whereUserId($user->id)->first(); $settings = UserSetting::whereUserId($user->id)->first();
if($settings) { if($settings) {
return $settings->show_profile_following_count == false; return $settings->show_profile_following_count == false;
} }
return false; return false;
}); });
} }
public static function setLastActive($id = false)
{
if(!$id) { return; }
$key = 'user:last_active_at:id:' . $id;
if(!Cache::has($key)) {
$user = User::find($id);
if(!$user) { return; }
$user->last_active_at = now();
$user->save();
Cache::put($key, 1, 14400);
}
return;
}
} }