chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Update UserFilterService, add domainBlocks method

This commit is contained in:
Daniel Supernault 2023-12-21 00:42:26 -07:00
parent b3148b788e
commit 6d55cb27ee
No known key found for this signature in database
GPG Key ID: 23740873EE6F76A1
1 changed files with 143 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

271
app/Services/UserFilterService.php
View File

@ -4,145 +4,160 @@ namespace App\Services;
use Cache; use Cache;
use App\UserFilter; use App\UserFilter;
use App\Models\UserDomainBlock;
use Illuminate\Support\Facades\Redis; use Illuminate\Support\Facades\Redis;
class UserFilterService class UserFilterService
{ {
const USER_MUTES_KEY = 'pf:services:mutes:ids:'; const USER_MUTES_KEY = 'pf:services:mutes:ids:';
const USER_BLOCKS_KEY = 'pf:services:blocks:ids:'; const USER_BLOCKS_KEY = 'pf:services:blocks:ids:';
const USER_DOMAIN_KEY = 'pf:services:domain-blocks:ids:';
public static function mutes(int $profile_id) public static function mutes(int $profile_id)
{ {
$key = self::USER_MUTES_KEY . $profile_id; $key = self::USER_MUTES_KEY . $profile_id;
$warm = Cache::has($key . ':cached-v0'); $warm = Cache::has($key . ':cached-v0');
if($warm) { if($warm) {
return Redis::zrevrange($key, 0, -1) ?? []; return Redis::zrevrange($key, 0, -1) ?? [];
} else { } else {
if(Redis::zrevrange($key, 0, -1)) { if(Redis::zrevrange($key, 0, -1)) {
return Redis::zrevrange($key, 0, -1); return Redis::zrevrange($key, 0, -1);
} }
$ids = UserFilter::whereFilterType('mute') $ids = UserFilter::whereFilterType('mute')
->whereUserId($profile_id) ->whereUserId($profile_id)
->pluck('filterable_id') ->pluck('filterable_id')
->map(function($id) { ->map(function($id) {
$acct = AccountService::get($id, true); $acct = AccountService::get($id, true);
if(!$acct) { if(!$acct) {
return false; return false;
} }
return $acct['id']; return $acct['id'];
}) })
->filter(function($res) { ->filter(function($res) {
return $res; return $res;
}) })
->values() ->values()
->toArray(); ->toArray();
foreach ($ids as $muted_id) { foreach ($ids as $muted_id) {
Redis::zadd($key, (int) $muted_id, (int) $muted_id); Redis::zadd($key, (int) $muted_id, (int) $muted_id);
} }
Cache::set($key . ':cached-v0', 1, 7776000); Cache::set($key . ':cached-v0', 1, 7776000);
return $ids; return $ids;
} }
} }
public static function blocks(int $profile_id) public static function blocks(int $profile_id)
{ {
$key = self::USER_BLOCKS_KEY . $profile_id; $key = self::USER_BLOCKS_KEY . $profile_id;
$warm = Cache::has($key . ':cached-v0'); $warm = Cache::has($key . ':cached-v0');
if($warm) { if($warm) {
return Redis::zrevrange($key, 0, -1) ?? []; return Redis::zrevrange($key, 0, -1) ?? [];
} else { } else {
if(Redis::zrevrange($key, 0, -1)) { if(Redis::zrevrange($key, 0, -1)) {
return Redis::zrevrange($key, 0, -1); return Redis::zrevrange($key, 0, -1);
} }
$ids = UserFilter::whereFilterType('block') $ids = UserFilter::whereFilterType('block')
->whereUserId($profile_id) ->whereUserId($profile_id)
->pluck('filterable_id') ->pluck('filterable_id')
->map(function($id) { ->map(function($id) {
$acct = AccountService::get($id, true); $acct = AccountService::get($id, true);
if(!$acct) { if(!$acct) {
return false; return false;
} }
return $acct['id']; return $acct['id'];
}) })
->filter(function($res) { ->filter(function($res) {
return $res; return $res;
}) })
->values() ->values()
->toArray(); ->toArray();
foreach ($ids as $blocked_id) { foreach ($ids as $blocked_id) {
Redis::zadd($key, (int) $blocked_id, (int) $blocked_id); Redis::zadd($key, (int) $blocked_id, (int) $blocked_id);
} }
Cache::set($key . ':cached-v0', 1, 7776000); Cache::set($key . ':cached-v0', 1, 7776000);
return $ids; return $ids;
} }
} }
public static function filters(int $profile_id) public static function filters(int $profile_id)
{ {
return array_unique(array_merge(self::mutes($profile_id), self::blocks($profile_id))); return array_unique(array_merge(self::mutes($profile_id), self::blocks($profile_id)));
} }
public static function mute(int $profile_id, int $muted_id) public static function mute(int $profile_id, int $muted_id)
{ {
if($profile_id == $muted_id) { if($profile_id == $muted_id) {
return false; return false;
} }
$key = self::USER_MUTES_KEY . $profile_id; $key = self::USER_MUTES_KEY . $profile_id;
$mutes = self::mutes($profile_id); $mutes = self::mutes($profile_id);
$exists = in_array($muted_id, $mutes); $exists = in_array($muted_id, $mutes);
if(!$exists) { if(!$exists) {
Redis::zadd($key, $muted_id, $muted_id); Redis::zadd($key, $muted_id, $muted_id);
} }
return true; return true;
} }
public static function unmute(int $profile_id, string $muted_id) public static function unmute(int $profile_id, string $muted_id)
{ {
if($profile_id == $muted_id) { if($profile_id == $muted_id) {
return false; return false;
} }
$key = self::USER_MUTES_KEY . $profile_id; $key = self::USER_MUTES_KEY . $profile_id;
$mutes = self::mutes($profile_id); $mutes = self::mutes($profile_id);
$exists = in_array($muted_id, $mutes); $exists = in_array($muted_id, $mutes);
if($exists) { if($exists) {
Redis::zrem($key, $muted_id); Redis::zrem($key, $muted_id);
} }
return true; return true;
} }
public static function block(int $profile_id, int $blocked_id) public static function block(int $profile_id, int $blocked_id)
{ {
if($profile_id == $blocked_id) { if($profile_id == $blocked_id) {
return false; return false;
} }
$key = self::USER_BLOCKS_KEY . $profile_id; $key = self::USER_BLOCKS_KEY . $profile_id;
$exists = in_array($blocked_id, self::blocks($profile_id)); $exists = in_array($blocked_id, self::blocks($profile_id));
if(!$exists) { if(!$exists) {
Redis::zadd($key, $blocked_id, $blocked_id); Redis::zadd($key, $blocked_id, $blocked_id);
} }
return true; return true;
} }
public static function unblock(int $profile_id, string $blocked_id) public static function unblock(int $profile_id, string $blocked_id)
{ {
if($profile_id == $blocked_id) { if($profile_id == $blocked_id) {
return false; return false;
} }
$key = self::USER_BLOCKS_KEY . $profile_id; $key = self::USER_BLOCKS_KEY . $profile_id;
$exists = in_array($blocked_id, self::blocks($profile_id)); $exists = in_array($blocked_id, self::blocks($profile_id));
if($exists) { if($exists) {
Redis::zrem($key, $blocked_id); Redis::zrem($key, $blocked_id);
} }
return $exists; return $exists;
} }
public static function blockCount(int $profile_id) public static function blockCount(int $profile_id)
{ {
return Redis::zcard(self::USER_BLOCKS_KEY . $profile_id); return Redis::zcard(self::USER_BLOCKS_KEY . $profile_id);
} }
public static function muteCount(int $profile_id) public static function muteCount(int $profile_id)
{ {
return Redis::zcard(self::USER_MUTES_KEY . $profile_id); return Redis::zcard(self::USER_MUTES_KEY . $profile_id);
} }
public static function domainBlocks($pid, $purge = false)
{
if($purge) {
Cache::forget(self::USER_DOMAIN_KEY . $pid);
}
return Cache::remember(
self::USER_DOMAIN_KEY . $pid,
21600,
function() use($pid) {
return UserDomainBlock::whereProfileId($pid)->pluck('domain')->toArray();
});
}
} }