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

Merge pull request #4973 from pixelfed/staging

Browse source 
Update ApiV1Controller, fix Notifications endpoint
This commit is contained in:
daniel 2024-03-05 02:11:07 -07:00 committed by GitHub
commit eb19c35343
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 1450 additions and 1369 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -26,6 +26,8 @@
- Update AdminCuratedRegisterController, filter confirmation activities from activitylog ([ab9ecb6e](https://github.com/pixelfed/pixelfed/commit/ab9ecb6e)) - Update AdminCuratedRegisterController, filter confirmation activities from activitylog ([ab9ecb6e](https://github.com/pixelfed/pixelfed/commit/ab9ecb6e))
- Update Inbox, fix flag validation condition, allow profile reports ([402a4607](https://github.com/pixelfed/pixelfed/commit/402a4607)) - Update Inbox, fix flag validation condition, allow profile reports ([402a4607](https://github.com/pixelfed/pixelfed/commit/402a4607))
- Update AccountTransformer, fix follower/following count visibility bug ([542d1106](https://github.com/pixelfed/pixelfed/commit/542d1106)) - Update AccountTransformer, fix follower/following count visibility bug ([542d1106](https://github.com/pixelfed/pixelfed/commit/542d1106))
- Update ProfileMigration model, add target relation ([3f053997](https://github.com/pixelfed/pixelfed/commit/3f053997))
- Update ApiV1Controller, update Notifications endpoint to filter notifications with missing activities ([a933615b](https://github.com/pixelfed/pixelfed/commit/a933615b))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.12 (2024-02-16)](https://github.com/pixelfed/pixelfed/compare/v0.11.11...v0.11.12) ## [v0.11.12 (2024-02-16)](https://github.com/pixelfed/pixelfed/compare/v0.11.11...v0.11.12)

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

File diff suppressed because it is too large Load diff

8
app/MediaTag.php
View file

@ -8,8 +8,14 @@ class MediaTag extends Model
{ {
protected $guarded = []; protected $guarded = [];
protected $visible = [
'status_id',
'profile_id',
'tagged_username',
];
public function status() public function status()
{ {
return $this->belongsTo(Status::class); return $this->belongsTo(Status::class);
} }
} }

512
app/Services/NotificationService.php
View file

@ -2,298 +2,324 @@
namespace App\Services; namespace App\Services;
use App\Jobs\InternalPipeline\NotificationEpochUpdatePipeline;
use App\Notification;
use App\Transformer\Api\NotificationTransformer;
use Cache; use Cache;
use Illuminate\Support\Facades\Redis; use Illuminate\Support\Facades\Redis;
use App\{
Notification,
Profile
};
use App\Transformer\Api\NotificationTransformer;
use League\Fractal; use League\Fractal;
use League\Fractal\Serializer\ArraySerializer; use League\Fractal\Serializer\ArraySerializer;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use App\Jobs\InternalPipeline\NotificationEpochUpdatePipeline;
class NotificationService { class NotificationService
{
const CACHE_KEY = 'pf:services:notifications:ids:';
const CACHE_KEY = 'pf:services:notifications:ids:'; const EPOCH_CACHE_KEY = 'pf:services:notifications:epoch-id:by-months:';
const EPOCH_CACHE_KEY = 'pf:services:notifications:epoch-id:by-months:';
const ITEM_CACHE_TTL = 86400;
const MASTODON_TYPES = [
'follow',
'follow_request',
'mention',
'reblog',
'favourite',
'poll',
'status'
];
public static function get($id, $start = 0, $stop = 400) const ITEM_CACHE_TTL = 86400;
{
$res = collect([]);
$key = self::CACHE_KEY . $id;
$stop = $stop > 400 ? 400 : $stop;
$ids = Redis::zrangebyscore($key, $start, $stop);
if(empty($ids)) {
$ids = self::coldGet($id, $start, $stop);
}
foreach($ids as $id) {
$n = self::getNotification($id);
if($n != null) {
$res->push($n);
}
}
return $res;
}
public static function getEpochId($months = 6) const MASTODON_TYPES = [
{ 'follow',
$epoch = Cache::get(self::EPOCH_CACHE_KEY . $months); 'follow_request',
if(!$epoch) { 'mention',
NotificationEpochUpdatePipeline::dispatch(); 'reblog',
return 1; 'favourite',
} 'poll',
return $epoch; 'status',
} ];
public static function coldGet($id, $start = 0, $stop = 400) public static function get($id, $start = 0, $stop = 400)
{ {
$stop = $stop > 400 ? 400 : $stop; $res = collect([]);
$ids = Notification::where('id', '>', self::getEpochId()) $key = self::CACHE_KEY.$id;
->where('profile_id', $id) $stop = $stop > 400 ? 400 : $stop;
->orderByDesc('id') $ids = Redis::zrangebyscore($key, $start, $stop);
->skip($start) if (empty($ids)) {
->take($stop) $ids = self::coldGet($id, $start, $stop);
->pluck('id'); }
foreach($ids as $key) { foreach ($ids as $id) {
self::set($id, $key); $n = self::getNotification($id);
} if ($n != null) {
return $ids; $res->push($n);
} }
}
public static function getMax($id = false, $start = 0, $limit = 10) return $res;
{ }
$ids = self::getRankedMaxId($id, $start, $limit);
if(empty($ids)) { public static function getEpochId($months = 6)
return []; {
} $epoch = Cache::get(self::EPOCH_CACHE_KEY.$months);
if (! $epoch) {
NotificationEpochUpdatePipeline::dispatch();
$res = collect([]); return 1;
foreach($ids as $id) { }
$n = self::getNotification($id);
if($n != null) {
$res->push($n);
}
}
return $res->toArray();
}
public static function getMin($id = false, $start = 0, $limit = 10) return $epoch;
{ }
$ids = self::getRankedMinId($id, $start, $limit);
if(empty($ids)) { public static function coldGet($id, $start = 0, $stop = 400)
return []; {
} $stop = $stop > 400 ? 400 : $stop;
$ids = Notification::where('id', '>', self::getEpochId())
->where('profile_id', $id)
->orderByDesc('id')
->skip($start)
->take($stop)
->pluck('id');
foreach ($ids as $key) {
self::set($id, $key);
}
$res = collect([]); return $ids;
foreach($ids as $id) { }
$n = self::getNotification($id);
if($n != null) {
$res->push($n);
}
}
return $res->toArray();
}
public static function getMax($id = false, $start = 0, $limit = 10)
{
$ids = self::getRankedMaxId($id, $start, $limit);
public static function getMaxMastodon($id = false, $start = 0, $limit = 10) if (empty($ids)) {
{ return [];
$ids = self::getRankedMaxId($id, $start, $limit); }
if(empty($ids)) { $res = collect([]);
return []; foreach ($ids as $id) {
} $n = self::getNotification($id);
if ($n != null) {
$res->push($n);
}
}
$res = collect([]); return $res->toArray();
foreach($ids as $id) { }
$n = self::rewriteMastodonTypes(self::getNotification($id));
if($n != null && in_array($n['type'], self::MASTODON_TYPES)) {
if(isset($n['account'])) {
$n['account'] = AccountService::getMastodon($n['account']['id']);
}
if(isset($n['relationship'])) { public static function getMin($id = false, $start = 0, $limit = 10)
unset($n['relationship']); {
} $ids = self::getRankedMinId($id, $start, $limit);
if(isset($n['status'])) { if (empty($ids)) {
$n['status'] = StatusService::getMastodon($n['status']['id'], false); return [];
} }
$res->push($n); $res = collect([]);
} foreach ($ids as $id) {
} $n = self::getNotification($id);
return $res->toArray(); if ($n != null) {
} $res->push($n);
}
}
public static function getMinMastodon($id = false, $start = 0, $limit = 10) return $res->toArray();
{ }
$ids = self::getRankedMinId($id, $start, $limit);
if(empty($ids)) { public static function getMaxMastodon($id = false, $start = 0, $limit = 10)
return []; {
} $ids = self::getRankedMaxId($id, $start, $limit);
$res = collect([]); if (empty($ids)) {
foreach($ids as $id) { return [];
$n = self::rewriteMastodonTypes(self::getNotification($id)); }
if($n != null && in_array($n['type'], self::MASTODON_TYPES)) {
if(isset($n['account'])) {
$n['account'] = AccountService::getMastodon($n['account']['id']);
}
if(isset($n['relationship'])) { $res = collect([]);
unset($n['relationship']); foreach ($ids as $id) {
} $n = self::rewriteMastodonTypes(self::getNotification($id));
if ($n != null && in_array($n['type'], self::MASTODON_TYPES)) {
if (isset($n['account'])) {
$n['account'] = AccountService::getMastodon($n['account']['id']);
}
if(isset($n['status'])) { if (isset($n['relationship'])) {
$n['status'] = StatusService::getMastodon($n['status']['id'], false); unset($n['relationship']);
} }
$res->push($n); if ($n['type'] === 'mention' && isset($n['tagged'], $n['tagged']['status_id'])) {
} $n['status'] = StatusService::getMastodon($n['tagged']['status_id'], false);
} unset($n['tagged']);
return $res->toArray(); }
}
public static function getRankedMaxId($id = false, $start = null, $limit = 10) if (isset($n['status'])) {
{ $n['status'] = StatusService::getMastodon($n['status']['id'], false);
if(!$start || !$id) { }
return [];
}
return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY.$id, $start, '-inf', [ $res->push($n);
'withscores' => true, }
'limit' => [1, $limit] }
]));
}
public static function getRankedMinId($id = false, $end = null, $limit = 10) return $res->toArray();
{ }
if(!$end || !$id) {
return [];
}
return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY.$id, '+inf', $end, [ public static function getMinMastodon($id = false, $start = 0, $limit = 10)
'withscores' => true, {
'limit' => [0, $limit] $ids = self::getRankedMinId($id, $start, $limit);
]));
}
public static function rewriteMastodonTypes($notification) if (empty($ids)) {
{ return [];
if(!$notification || !isset($notification['type'])) { }
return $notification;
}
if($notification['type'] === 'comment') { $res = collect([]);
$notification['type'] = 'mention'; foreach ($ids as $id) {
} $n = self::rewriteMastodonTypes(self::getNotification($id));
if ($n != null && in_array($n['type'], self::MASTODON_TYPES)) {
if (isset($n['account'])) {
$n['account'] = AccountService::getMastodon($n['account']['id']);
}
if($notification['type'] === 'share') { if (isset($n['relationship'])) {
$notification['type'] = 'reblog'; unset($n['relationship']);
} }
return $notification; if ($n['type'] === 'mention' && isset($n['tagged'], $n['tagged']['status_id'])) {
} $n['status'] = StatusService::getMastodon($n['tagged']['status_id'], false);
unset($n['tagged']);
}
public static function set($id, $val) if (isset($n['status'])) {
{ $n['status'] = StatusService::getMastodon($n['status']['id'], false);
if(self::count($id) > 400) { }
Redis::zpopmin(self::CACHE_KEY . $id);
}
return Redis::zadd(self::CACHE_KEY . $id, $val, $val);
}
public static function del($id, $val) $res->push($n);
{ }
Cache::forget('service:notification:' . $val); }
return Redis::zrem(self::CACHE_KEY . $id, $val);
}
public static function add($id, $val) return $res->toArray();
{ }
return self::set($id, $val);
}
public static function rem($id, $val) public static function getRankedMaxId($id = false, $start = null, $limit = 10)
{ {
return self::del($id, $val); if (! $start || ! $id) {
} return [];
}
public static function count($id) return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY.$id, $start, '-inf', [
{ 'withscores' => true,
return Redis::zcount(self::CACHE_KEY . $id, '-inf', '+inf'); 'limit' => [1, $limit],
} ]));
}
public static function getNotification($id) public static function getRankedMinId($id = false, $end = null, $limit = 10)
{ {
$notification = Cache::remember('service:notification:'.$id, self::ITEM_CACHE_TTL, function() use($id) { if (! $end || ! $id) {
$n = Notification::with('item')->find($id); return [];
}
if(!$n) { return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY.$id, '+inf', $end, [
return null; 'withscores' => true,
} 'limit' => [0, $limit],
]));
}
$account = AccountService::get($n->actor_id, true); public static function rewriteMastodonTypes($notification)
{
if (! $notification || ! isset($notification['type'])) {
return $notification;
}
if(!$account) { if ($notification['type'] === 'comment') {
return null; $notification['type'] = 'mention';
} }
$fractal = new Fractal\Manager(); if ($notification['type'] === 'share') {
$fractal->setSerializer(new ArraySerializer()); $notification['type'] = 'reblog';
$resource = new Fractal\Resource\Item($n, new NotificationTransformer()); }
return $fractal->createData($resource)->toArray();
});
if(!$notification) { if ($notification['type'] === 'tagged') {
return; $notification['type'] = 'mention';
} }
if(isset($notification['account'])) { return $notification;
$notification['account'] = AccountService::get($notification['account']['id'], true); }
}
return $notification; public static function set($id, $val)
} {
if (self::count($id) > 400) {
Redis::zpopmin(self::CACHE_KEY.$id);
}
public static function setNotification(Notification $notification) return Redis::zadd(self::CACHE_KEY.$id, $val, $val);
{ }
return Cache::remember('service:notification:'.$notification->id, self::ITEM_CACHE_TTL, function() use($notification) {
$fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($notification, new NotificationTransformer());
return $fractal->createData($resource)->toArray();
});
}
public static function warmCache($id, $stop = 400, $force = false) public static function del($id, $val)
{ {
if(self::count($id) == 0 || $force == true) { Cache::forget('service:notification:'.$val);
$ids = Notification::where('profile_id', $id)
->where('id', '>', self::getEpochId()) return Redis::zrem(self::CACHE_KEY.$id, $val);
->orderByDesc('id') }
->limit($stop)
->pluck('id'); public static function add($id, $val)
foreach($ids as $key) { {
self::set($id, $key); return self::set($id, $val);
} }
return 1;
} public static function rem($id, $val)
return 0; {
} return self::del($id, $val);
}
public static function count($id)
{
return Redis::zcount(self::CACHE_KEY.$id, '-inf', '+inf');
}
public static function getNotification($id)
{
$notification = Cache::remember('service:notification:'.$id, self::ITEM_CACHE_TTL, function () use ($id) {
$n = Notification::with('item')->find($id);
if (! $n) {
return null;
}
$account = AccountService::get($n->actor_id, true);
if (! $account) {
return null;
}
$fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($n, new NotificationTransformer());
return $fractal->createData($resource)->toArray();
});
if (! $notification) {
return;
}
if (isset($notification['account'])) {
$notification['account'] = AccountService::get($notification['account']['id'], true);
}
return $notification;
}
public static function setNotification(Notification $notification)
{
return Cache::remember('service:notification:'.$notification->id, self::ITEM_CACHE_TTL, function () use ($notification) {
$fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($notification, new NotificationTransformer());
return $fractal->createData($resource)->toArray();
});
}
public static function warmCache($id, $stop = 400, $force = false)
{
if (self::count($id) == 0 || $force == true) {
$ids = Notification::where('profile_id', $id)
->where('id', '>', self::getEpochId())
->orderByDesc('id')
->limit($stop)
->pluck('id');
foreach ($ids as $key) {
self::set($id, $key);
}
return 1;
}
return 0;
}
} }

121
app/Transformer/Api/NotificationTransformer.php
View file

@ -4,78 +4,81 @@ namespace App\Transformer\Api;
use App\Notification; use App\Notification;
use App\Services\AccountService; use App\Services\AccountService;
use App\Services\HashidService;
use App\Services\RelationshipService; use App\Services\RelationshipService;
use App\Services\StatusService; use App\Services\StatusService;
use League\Fractal; use League\Fractal;
class NotificationTransformer extends Fractal\TransformerAbstract class NotificationTransformer extends Fractal\TransformerAbstract
{ {
public function transform(Notification $notification) public function transform(Notification $notification)
{ {
$res = [ $res = [
'id' => (string) $notification->id, 'id' => (string) $notification->id,
'type' => $this->replaceTypeVerb($notification->action), 'type' => $this->replaceTypeVerb($notification->action),
'created_at' => (string) str_replace('+00:00', 'Z', $notification->created_at->format(DATE_RFC3339_EXTENDED)), 'created_at' => (string) str_replace('+00:00', 'Z', $notification->created_at->format(DATE_RFC3339_EXTENDED)),
]; ];
$n = $notification; $n = $notification;
if($n->actor_id) { if ($n->actor_id) {
$res['account'] = AccountService::get($n->actor_id); $res['account'] = AccountService::get($n->actor_id);
if($n->profile_id != $n->actor_id) { if ($n->profile_id != $n->actor_id) {
$res['relationship'] = RelationshipService::get($n->actor_id, $n->profile_id); $res['relationship'] = RelationshipService::get($n->actor_id, $n->profile_id);
} }
} }
if($n->item_id && $n->item_type == 'App\Status') { if ($n->item_id && $n->item_type == 'App\Status') {
$res['status'] = StatusService::get($n->item_id, false); $res['status'] = StatusService::get($n->item_id, false);
} }
if($n->item_id && $n->item_type == 'App\ModLog') { if ($n->item_id && $n->item_type == 'App\ModLog') {
$ml = $n->item; $ml = $n->item;
if($ml && $ml->object_uid) { if ($ml && $ml->object_uid) {
$res['modlog'] = [ $res['modlog'] = [
'id' => $ml->object_uid, 'id' => $ml->object_uid,
'url' => url('/i/admin/users/modlogs/' . $ml->object_uid) 'url' => url('/i/admin/users/modlogs/'.$ml->object_uid),
]; ];
} }
} }
if($n->item_id && $n->item_type == 'App\MediaTag') { if ($n->item_id && $n->item_type == 'App\MediaTag') {
$ml = $n->item; $ml = $n->item;
if($ml && $ml->tagged_username) { if ($ml && $ml->tagged_username) {
$res['tagged'] = [ $np = StatusService::get($ml->status_id, false);
'username' => $ml->tagged_username, if ($np && isset($np['id'])) {
'post_url' => '/p/'.HashidService::encode($ml->status_id) $res['tagged'] = [
]; 'username' => $ml->tagged_username,
} 'post_url' => $np['url'],
} 'status_id' => $ml->status_id,
'profile_id' => $ml->profile_id,
];
}
}
}
return $res; return $res;
} }
public function replaceTypeVerb($verb) public function replaceTypeVerb($verb)
{ {
$verbs = [ $verbs = [
'dm' => 'direct', 'dm' => 'direct',
'follow' => 'follow', 'follow' => 'follow',
'mention' => 'mention', 'mention' => 'mention',
'reblog' => 'share', 'reblog' => 'share',
'share' => 'share', 'share' => 'share',
'like' => 'favourite', 'like' => 'favourite',
'group:like' => 'favourite', 'comment' => 'comment',
'comment' => 'comment', 'admin.user.modlog.comment' => 'modlog',
'admin.user.modlog.comment' => 'modlog', 'tagged' => 'tagged',
'tagged' => 'tagged', 'story:react' => 'story:react',
'story:react' => 'story:react', 'story:comment' => 'story:comment',
'story:comment' => 'story:comment', ];
];
if(!isset($verbs[$verb])) { if (! isset($verbs[$verb])) {
return $verb; return $verb;
} }
return $verbs[$verb]; return $verbs[$verb];
} }
} }