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

Merge branch 'staging' of github.com:pixelfed/pixelfed into jippi-fork

Browse source
This commit is contained in:
Christian Winther 2024-03-07 19:43:30 +00:00
commit 091de696c2
11 changed files with 518 additions and 491 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -5,6 +5,11 @@
### Updates ### Updates
- Update SoftwareUpdateService, add command to refresh latest versions ([632f2cb6](https://github.com/pixelfed/pixelfed/commit/632f2cb6)) - Update SoftwareUpdateService, add command to refresh latest versions ([632f2cb6](https://github.com/pixelfed/pixelfed/commit/632f2cb6))
- Update Post.vue, fix cache bug ([3a27e637](https://github.com/pixelfed/pixelfed/commit/3a27e637))
- Update StatusHashtagService, use more efficient cached count ([592c8412](https://github.com/pixelfed/pixelfed/commit/592c8412))
- Update DiscoverController, handle discover hashtag redirects ([18382e8a](https://github.com/pixelfed/pixelfed/commit/18382e8a))
- Update ApiV1Controller, use admin filter service ([94503a1c](https://github.com/pixelfed/pixelfed/commit/94503a1c))
- Update SearchApiV2Service, use more efficient query ([cee618e8](https://github.com/pixelfed/pixelfed/commit/cee618e8))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.13 (2024-03-05)](https://github.com/pixelfed/pixelfed/compare/v0.11.12...v0.11.13) ## [v0.11.13 (2024-03-05)](https://github.com/pixelfed/pixelfed/compare/v0.11.12...v0.11.13)

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

@ -37,6 +37,7 @@ use App\Models\Conversation;
use App\Notification; use App\Notification;
use App\Profile; use App\Profile;
use App\Services\AccountService; use App\Services\AccountService;
use App\Services\AdminShadowFilterService;
use App\Services\BookmarkService; use App\Services\BookmarkService;
use App\Services\BouncerService; use App\Services\BouncerService;
use App\Services\CollectionService; use App\Services\CollectionService;
@ -2648,7 +2649,7 @@ class ApiV1Controller extends Controller
$domainBlocks = UserFilterService::domainBlocks($user->profile_id); $domainBlocks = UserFilterService::domainBlocks($user->profile_id);
$hideNsfw = config('instance.hide_nsfw_on_public_feeds'); $hideNsfw = config('instance.hide_nsfw_on_public_feeds');
$amin = SnowflakeService::byDate(now()->subDays(config('federation.network_timeline_days_falloff'))); $amin = SnowflakeService::byDate(now()->subDays(config('federation.network_timeline_days_falloff')));
$asf = AdminShadowFilterService::getHideFromPublicFeedsList();
if ($local && $remote) { if ($local && $remote) {
$feed = Status::select( $feed = Status::select(
'id', 'id',
@ -2824,6 +2825,21 @@ class ApiV1Controller extends Controller
return ! in_array($domain, $domainBlocks); return ! in_array($domain, $domainBlocks);
}) })
->filter(function ($s) use ($asf, $user) {
if (! $asf || count($asf) === 0) {
return true;
}
if (in_array($s['account']['id'], $asf)) {
if ($user->profile_id == $s['account']['id']) {
return true;
}
return false;
}
return true;
})
->take($limit) ->take($limit)
->values(); ->values();

157
app/Http/Controllers/DiscoverController.php
View file

@ -2,122 +2,127 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\{ use App\Hashtag;
DiscoverCategory, use App\Instance;
Follower, use App\Like;
Hashtag,
HashtagFollow,
Instance,
Like,
Profile,
Status,
StatusHashtag,
UserFilter
};
use Auth, DB, Cache;
use Illuminate\Http\Request;
use App\Services\BookmarkService; use App\Services\BookmarkService;
use App\Services\ConfigCacheService; use App\Services\ConfigCacheService;
use App\Services\HashtagService; use App\Services\HashtagService;
use App\Services\LikeService; use App\Services\LikeService;
use App\Services\ReblogService; use App\Services\ReblogService;
use App\Services\StatusHashtagService;
use App\Services\SnowflakeService; use App\Services\SnowflakeService;
use App\Services\StatusHashtagService;
use App\Services\StatusService; use App\Services\StatusService;
use App\Services\TrendingHashtagService; use App\Services\TrendingHashtagService;
use App\Services\UserFilterService; use App\Services\UserFilterService;
use App\Status;
use Auth;
use Cache;
use DB;
use Illuminate\Http\Request;
class DiscoverController extends Controller class DiscoverController extends Controller
{ {
public function home(Request $request) public function home(Request $request)
{ {
abort_if(!Auth::check() && config('instance.discover.public') == false, 403); abort_if(! Auth::check() && config('instance.discover.public') == false, 403);
return view('discover.home'); return view('discover.home');
} }
public function showTags(Request $request, $hashtag) public function showTags(Request $request, $hashtag)
{ {
abort_if(!config('instance.discover.tags.is_public') && !Auth::check(), 403); if ($request->user()) {
return redirect('/i/web/hashtag/'.$hashtag.'?src=pd');
}
abort_if(! config('instance.discover.tags.is_public') && ! Auth::check(), 403);
$tag = Hashtag::whereName($hashtag) $tag = Hashtag::whereName($hashtag)
->orWhere('slug', $hashtag) ->orWhere('slug', $hashtag)
->where('is_banned', '!=', true) ->where('is_banned', '!=', true)
->firstOrFail(); ->firstOrFail();
$tagCount = StatusHashtagService::count($tag->id); $tagCount = $tag->cached_count ?? 0;
return view('discover.tags.show', compact('tag', 'tagCount')); return view('discover.tags.show', compact('tag', 'tagCount'));
} }
public function getHashtags(Request $request) public function getHashtags(Request $request)
{ {
$user = $request->user(); $user = $request->user();
abort_if(!config('instance.discover.tags.is_public') && !$user, 403); abort_if(! config('instance.discover.tags.is_public') && ! $user, 403);
$this->validate($request, [ $this->validate($request, [
'hashtag' => 'required|string|min:1|max:124', 'hashtag' => 'required|string|min:1|max:124',
'page' => 'nullable|integer|min:1|max:' . ($user ? 29 : 3) 'page' => 'nullable|integer|min:1|max:'.($user ? 29 : 3),
]); ]);
$page = $request->input('page') ?? '1'; $page = $request->input('page') ?? '1';
$end = $page > 1 ? $page * 9 : 0; $end = $page > 1 ? $page * 9 : 0;
$tag = $request->input('hashtag'); $tag = $request->input('hashtag');
if(config('database.default') === 'pgsql') { if (config('database.default') === 'pgsql') {
$hashtag = Hashtag::where('name', 'ilike', $tag)->firstOrFail(); $hashtag = Hashtag::where('name', 'ilike', $tag)->firstOrFail();
} else { } else {
$hashtag = Hashtag::whereName($tag)->firstOrFail(); $hashtag = Hashtag::whereName($tag)->firstOrFail();
} }
if($hashtag->is_banned == true) { if ($hashtag->is_banned == true) {
return []; return [];
} }
if($user) { if ($user) {
$res['follows'] = HashtagService::isFollowing($user->profile_id, $hashtag->id); $res['follows'] = HashtagService::isFollowing($user->profile_id, $hashtag->id);
} }
$res['hashtag'] = [ $res['hashtag'] = [
'name' => $hashtag->name, 'name' => $hashtag->name,
'url' => $hashtag->url() 'url' => $hashtag->url(),
]; ];
if($user) { if ($user) {
$tags = StatusHashtagService::get($hashtag->id, $page, $end); $tags = StatusHashtagService::get($hashtag->id, $page, $end);
$res['tags'] = collect($tags) $res['tags'] = collect($tags)
->map(function($tag) use($user) { ->map(function ($tag) use ($user) {
$tag['status']['favourited'] = (bool) LikeService::liked($user->profile_id, $tag['status']['id']); $tag['status']['favourited'] = (bool) LikeService::liked($user->profile_id, $tag['status']['id']);
$tag['status']['reblogged'] = (bool) ReblogService::get($user->profile_id, $tag['status']['id']); $tag['status']['reblogged'] = (bool) ReblogService::get($user->profile_id, $tag['status']['id']);
$tag['status']['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $tag['status']['id']); $tag['status']['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $tag['status']['id']);
return $tag; return $tag;
}) })
->filter(function($tag) { ->filter(function ($tag) {
if(!StatusService::get($tag['status']['id'])) { if (! StatusService::get($tag['status']['id'])) {
return false; return false;
} }
return true; return true;
}) })
->values(); ->values();
} else { } else {
if($page != 1) { if ($page != 1) {
$res['tags'] = []; $res['tags'] = [];
return $res; return $res;
} }
$key = 'discover:tags:public_feed:' . $hashtag->id . ':page:' . $page; $key = 'discover:tags:public_feed:'.$hashtag->id.':page:'.$page;
$tags = Cache::remember($key, 43200, function() use($hashtag, $page, $end) { $tags = Cache::remember($key, 43200, function () use ($hashtag, $page, $end) {
return collect(StatusHashtagService::get($hashtag->id, $page, $end)) return collect(StatusHashtagService::get($hashtag->id, $page, $end))
->filter(function($tag) { ->filter(function ($tag) {
if(!$tag['status']['local']) { if (! $tag['status']['local']) {
return false; return false;
} }
return true; return true;
}) })
->values(); ->values();
}); });
$res['tags'] = collect($tags) $res['tags'] = collect($tags)
->filter(function($tag) { ->filter(function ($tag) {
if(!StatusService::get($tag['status']['id'])) { if (! StatusService::get($tag['status']['id'])) {
return false; return false;
} }
return true; return true;
}) })
->values(); ->values();
} }
return $res; return $res;
} }
@ -133,7 +138,7 @@ class DiscoverController extends Controller
public function trendingApi(Request $request) public function trendingApi(Request $request)
{ {
abort_if(config('instance.discover.public') == false && !$request->user(), 403); abort_if(config('instance.discover.public') == false && ! $request->user(), 403);
$this->validate($request, [ $this->validate($request, [
'range' => 'nullable|string|in:daily,monthly,yearly', 'range' => 'nullable|string|in:daily,monthly,yearly',
@ -144,12 +149,13 @@ class DiscoverController extends Controller
$ttls = [ $ttls = [
1 => 1500, 1 => 1500,
31 => 14400, 31 => 14400,
365 => 86400 365 => 86400,
]; ];
$key = ':api:discover:trending:v2.12:range:' . $days; $key = ':api:discover:trending:v2.12:range:'.$days;
$ids = Cache::remember($key, $ttls[$days], function() use($days) { $ids = Cache::remember($key, $ttls[$days], function () use ($days) {
$min_id = SnowflakeService::byDate(now()->subDays($days)); $min_id = SnowflakeService::byDate(now()->subDays($days));
return DB::table('statuses') return DB::table('statuses')
->select( ->select(
'id', 'id',
@ -165,22 +171,22 @@ class DiscoverController extends Controller
->whereIn('type', [ ->whereIn('type', [
'photo', 'photo',
'photo:album', 'photo:album',
'video' 'video',
]) ])
->whereIsNsfw(false) ->whereIsNsfw(false)
->orderBy('likes_count','desc') ->orderBy('likes_count', 'desc')
->take(30) ->take(30)
->pluck('id'); ->pluck('id');
}); });
$filtered = Auth::check() ? UserFilterService::filters(Auth::user()->profile_id) : []; $filtered = Auth::check() ? UserFilterService::filters(Auth::user()->profile_id) : [];
$res = $ids->map(function($s) { $res = $ids->map(function ($s) {
return StatusService::get($s); return StatusService::get($s);
})->filter(function($s) use($filtered) { })->filter(function ($s) use ($filtered) {
return return
$s && $s &&
!in_array($s['account']['id'], $filtered) && ! in_array($s['account']['id'], $filtered) &&
isset($s['account']); isset($s['account']);
})->values(); })->values();
@ -189,9 +195,10 @@ class DiscoverController extends Controller
public function trendingHashtags(Request $request) public function trendingHashtags(Request $request)
{ {
abort_if(!$request->user(), 403); abort_if(! $request->user(), 403);
$res = TrendingHashtagService::getTrending(); $res = TrendingHashtagService::getTrending();
return $res; return $res;
} }
@ -202,12 +209,12 @@ class DiscoverController extends Controller
public function myMemories(Request $request) public function myMemories(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(! $request->user(), 404);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
abort_if(!$this->config()['memories']['enabled'], 404); abort_if(! $this->config()['memories']['enabled'], 404);
$type = $request->input('type') ?? 'posts'; $type = $request->input('type') ?? 'posts';
switch($type) { switch ($type) {
case 'posts': case 'posts':
$res = Status::whereProfileId($pid) $res = Status::whereProfileId($pid)
->whereDay('created_at', date('d')) ->whereDay('created_at', date('d'))
@ -216,10 +223,10 @@ class DiscoverController extends Controller
->whereNull(['reblog_of_id', 'in_reply_to_id']) ->whereNull(['reblog_of_id', 'in_reply_to_id'])
->limit(20) ->limit(20)
->pluck('id') ->pluck('id')
->map(function($id) { ->map(function ($id) {
return StatusService::get($id, false); return StatusService::get($id, false);
}) })
->filter(function($post) { ->filter(function ($post) {
return $post && isset($post['account']); return $post && isset($post['account']);
}) })
->values(); ->values();
@ -233,12 +240,13 @@ class DiscoverController extends Controller
->orderByDesc('status_id') ->orderByDesc('status_id')
->limit(20) ->limit(20)
->pluck('status_id') ->pluck('status_id')
->map(function($id) { ->map(function ($id) {
$status = StatusService::get($id, false); $status = StatusService::get($id, false);
$status['favourited'] = true; $status['favourited'] = true;
return $status; return $status;
}) })
->filter(function($post) { ->filter(function ($post) {
return $post && isset($post['account']); return $post && isset($post['account']);
}) })
->values(); ->values();
@ -250,19 +258,19 @@ class DiscoverController extends Controller
public function accountInsightsPopularPosts(Request $request) public function accountInsightsPopularPosts(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(! $request->user(), 404);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
abort_if(!$this->config()['insights']['enabled'], 404); abort_if(! $this->config()['insights']['enabled'], 404);
$posts = Cache::remember('pf:discover:metro2:accinsights:popular:' . $pid, 43200, function() use ($pid) { $posts = Cache::remember('pf:discover:metro2:accinsights:popular:'.$pid, 43200, function () use ($pid) {
return Status::whereProfileId($pid) return Status::whereProfileId($pid)
->whereNotNull('likes_count') ->whereNotNull('likes_count')
->orderByDesc('likes_count') ->orderByDesc('likes_count')
->limit(12) ->limit(12)
->pluck('id') ->pluck('id')
->map(function($id) { ->map(function ($id) {
return StatusService::get($id, false); return StatusService::get($id, false);
}) })
->filter(function($post) { ->filter(function ($post) {
return $post && isset($post['account']); return $post && isset($post['account']);
}) })
->values(); ->values();
@ -274,9 +282,10 @@ class DiscoverController extends Controller
public function config() public function config()
{ {
$cc = ConfigCacheService::get('config.discover.features'); $cc = ConfigCacheService::get('config.discover.features');
if($cc) { if ($cc) {
return is_string($cc) ? json_decode($cc, true) : $cc; return is_string($cc) ? json_decode($cc, true) : $cc;
} }
return [ return [
'hashtags' => [ 'hashtags' => [
'enabled' => false, 'enabled' => false,
@ -293,15 +302,15 @@ class DiscoverController extends Controller
'server' => [ 'server' => [
'enabled' => false, 'enabled' => false,
'mode' => 'allowlist', 'mode' => 'allowlist',
'domains' => [] 'domains' => [],
] ],
]; ];
} }
public function serverTimeline(Request $request) public function serverTimeline(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(! $request->user(), 404);
abort_if(!$this->config()['server']['enabled'], 404); abort_if(! $this->config()['server']['enabled'], 404);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
$domain = $request->input('domain'); $domain = $request->input('domain');
$config = $this->config(); $config = $this->config();
@ -309,31 +318,33 @@ class DiscoverController extends Controller
abort_unless(in_array($domain, $domains), 400); abort_unless(in_array($domain, $domains), 400);
$res = Status::whereNotNull('uri') $res = Status::whereNotNull('uri')
->where('uri', 'like', 'https://' . $domain . '%') ->where('uri', 'like', 'https://'.$domain.'%')
->whereNull(['in_reply_to_id', 'reblog_of_id']) ->whereNull(['in_reply_to_id', 'reblog_of_id'])
->orderByDesc('id') ->orderByDesc('id')
->limit(12) ->limit(12)
->pluck('id') ->pluck('id')
->map(function($id) { ->map(function ($id) {
return StatusService::get($id); return StatusService::get($id);
}) })
->filter(function($post) { ->filter(function ($post) {
return $post && isset($post['account']); return $post && isset($post['account']);
}) })
->values(); ->values();
return $res; return $res;
} }
public function enabledFeatures(Request $request) public function enabledFeatures(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(! $request->user(), 404);
return $this->config(); return $this->config();
} }
public function updateFeatures(Request $request) public function updateFeatures(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(! $request->user(), 404);
abort_if(!$request->user()->is_admin, 404); abort_if(! $request->user()->is_admin, 404);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
$this->validate($request, [ $this->validate($request, [
'features.friends.enabled' => 'boolean', 'features.friends.enabled' => 'boolean',
@ -343,18 +354,19 @@ class DiscoverController extends Controller
'features.server.enabled' => 'boolean', 'features.server.enabled' => 'boolean',
]); ]);
$res = $request->input('features'); $res = $request->input('features');
if($res['server'] && isset($res['server']['domains']) && !empty($res['server']['domains'])) { if ($res['server'] && isset($res['server']['domains']) && ! empty($res['server']['domains'])) {
$parts = explode(',', $res['server']['domains']); $parts = explode(',', $res['server']['domains']);
$parts = array_filter($parts, function($v) { $parts = array_filter($parts, function ($v) {
$len = strlen($v); $len = strlen($v);
$pos = strpos($v, '.'); $pos = strpos($v, '.');
$domain = trim($v); $domain = trim($v);
if($pos == false || $pos == ($len + 1)) { if ($pos == false || $pos == ($len + 1)) {
return false; return false;
} }
if(!Instance::whereDomain($domain)->exists()) { if (! Instance::whereDomain($domain)->exists()) {
return false; return false;
} }
return true; return true;
}); });
$parts = array_slice($parts, 0, 10); $parts = array_slice($parts, 0, 10);
@ -362,6 +374,7 @@ class DiscoverController extends Controller
$res['server']['domains'] = $d; $res['server']['domains'] = $d;
} }
ConfigCacheService::put('config.discover.features', json_encode($res)); ConfigCacheService::put('config.discover.features', json_encode($res));
return $res; return $res;
} }
} }

153
app/Services/SearchApiV2Service.php
View file

@ -2,28 +2,26 @@
namespace App\Services; namespace App\Services;
use Cache; use App\Hashtag;
use Illuminate\Support\Facades\Redis; use App\Profile;
use App\{Hashtag, Profile, Status}; use App\Status;
use App\Transformer\Api\AccountTransformer; use App\Transformer\Api\AccountTransformer;
use App\Transformer\Api\StatusTransformer;
use League\Fractal;
use League\Fractal\Serializer\ArraySerializer;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use App\Util\ActivityPub\Helpers; use App\Util\ActivityPub\Helpers;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use App\Services\AccountService; use League\Fractal;
use App\Services\HashtagService; use League\Fractal\Serializer\ArraySerializer;
use App\Services\StatusService;
class SearchApiV2Service class SearchApiV2Service
{ {
private $query; private $query;
static $mastodonMode = false;
public static $mastodonMode = false;
public static function query($query, $mastodonMode = false) public static function query($query, $mastodonMode = false)
{ {
self::$mastodonMode = $mastodonMode; self::$mastodonMode = $mastodonMode;
return (new self)->run($query); return (new self)->run($query);
} }
@ -32,51 +30,51 @@ class SearchApiV2Service
$this->query = $query; $this->query = $query;
$q = urldecode($query->input('q')); $q = urldecode($query->input('q'));
if($query->has('resolve') && if ($query->has('resolve') &&
( Str::startsWith($q, 'https://') || (Str::startsWith($q, 'https://') ||
Str::substrCount($q, '@') >= 1) Str::substrCount($q, '@') >= 1)
) { ) {
return $this->resolveQuery(); return $this->resolveQuery();
} }
if($query->has('type')) { if ($query->has('type')) {
switch ($query->input('type')) { switch ($query->input('type')) {
case 'accounts': case 'accounts':
return [ return [
'accounts' => $this->accounts(), 'accounts' => $this->accounts(),
'hashtags' => [], 'hashtags' => [],
'statuses' => [] 'statuses' => [],
]; ];
break; break;
case 'hashtags': case 'hashtags':
return [ return [
'accounts' => [], 'accounts' => [],
'hashtags' => $this->hashtags(), 'hashtags' => $this->hashtags(),
'statuses' => [] 'statuses' => [],
]; ];
break; break;
case 'statuses': case 'statuses':
return [ return [
'accounts' => [], 'accounts' => [],
'hashtags' => [], 'hashtags' => [],
'statuses' => $this->statuses() 'statuses' => $this->statuses(),
]; ];
break; break;
} }
} }
if($query->has('account_id')) { if ($query->has('account_id')) {
return [ return [
'accounts' => [], 'accounts' => [],
'hashtags' => [], 'hashtags' => [],
'statuses' => $this->statusesById() 'statuses' => $this->statusesById(),
]; ];
} }
return [ return [
'accounts' => $this->accounts(), 'accounts' => $this->accounts(),
'hashtags' => $this->hashtags(), 'hashtags' => $this->hashtags(),
'statuses' => $this->statuses() 'statuses' => $this->statuses(),
]; ];
} }
@ -87,17 +85,17 @@ class SearchApiV2Service
$limit = $this->query->input('limit') ?? 20; $limit = $this->query->input('limit') ?? 20;
$offset = $this->query->input('offset') ?? 0; $offset = $this->query->input('offset') ?? 0;
$rawQuery = $initalQuery ? $initalQuery : $this->query->input('q'); $rawQuery = $initalQuery ? $initalQuery : $this->query->input('q');
$query = $rawQuery . '%'; $query = $rawQuery.'%';
$webfingerQuery = $query; $webfingerQuery = $query;
if(Str::substrCount($rawQuery, '@') == 1 && substr($rawQuery, 0, 1) !== '@') { if (Str::substrCount($rawQuery, '@') == 1 && substr($rawQuery, 0, 1) !== '@') {
$query = '@' . $query; $query = '@'.$query;
} }
if(substr($webfingerQuery, 0, 1) !== '@') { if (substr($webfingerQuery, 0, 1) !== '@') {
$webfingerQuery = '@' . $webfingerQuery; $webfingerQuery = '@'.$webfingerQuery;
} }
$banned = InstanceService::getBannedDomains() ?? []; $banned = InstanceService::getBannedDomains() ?? [];
$domainBlocks = UserFilterService::domainBlocks($user->profile_id); $domainBlocks = UserFilterService::domainBlocks($user->profile_id);
if($domainBlocks && count($domainBlocks)) { if ($domainBlocks && count($domainBlocks)) {
$banned = array_unique( $banned = array_unique(
array_values( array_values(
array_merge($banned, $domainBlocks) array_merge($banned, $domainBlocks)
@ -112,15 +110,15 @@ class SearchApiV2Service
->offset($offset) ->offset($offset)
->limit($limit) ->limit($limit)
->get() ->get()
->filter(function($profile) use ($banned) { ->filter(function ($profile) use ($banned) {
return in_array($profile->domain, $banned) == false; return in_array($profile->domain, $banned) == false;
}) })
->map(function($res) use($mastodonMode) { ->map(function ($res) use ($mastodonMode) {
return $mastodonMode ? return $mastodonMode ?
AccountService::getMastodon($res['id']) : AccountService::getMastodon($res['id']) :
AccountService::get($res['id']); AccountService::get($res['id']);
}) })
->filter(function($account) { ->filter(function ($account) {
return $account && isset($account['id']); return $account && isset($account['id']);
}) })
->values(); ->values();
@ -134,31 +132,31 @@ class SearchApiV2Service
$q = $this->query->input('q'); $q = $this->query->input('q');
$limit = $this->query->input('limit') ?? 20; $limit = $this->query->input('limit') ?? 20;
$offset = $this->query->input('offset') ?? 0; $offset = $this->query->input('offset') ?? 0;
$query = Str::startsWith($q, '#') ? '%' . substr($q, 1) . '%' : '%' . $q . '%'; $query = Str::startsWith($q, '#') ? substr($q, 1).'%' : $q;
$operator = config('database.default') === 'pgsql' ? 'ilike' : 'like'; $operator = config('database.default') === 'pgsql' ? 'ilike' : 'like';
return Hashtag::where('name', $operator, $query) return Hashtag::where('name', $operator, $query)
->orWhere('slug', $operator, $query)
->where(function($q) {
return $q->where('can_search', true)
->orWhereNull('can_search');
})
->orderByDesc('cached_count') ->orderByDesc('cached_count')
->offset($offset) ->offset($offset)
->limit($limit) ->limit($limit)
->get() ->get()
->map(function($tag) use($mastodonMode) { ->filter(function ($tag) {
return $tag->can_search != false;
})
->map(function ($tag) use ($mastodonMode) {
$res = [ $res = [
'name' => $tag->name, 'name' => $tag->name,
'url' => $tag->url() 'url' => $tag->url(),
]; ];
if(!$mastodonMode) { if (! $mastodonMode) {
$res['history'] = []; $res['history'] = [];
$res['count'] = HashtagService::count($tag->id); $res['count'] = $tag->cached_count ?? 0;
} }
return $res; return $res;
}); })
->values();
} }
protected function statuses() protected function statuses()
@ -185,73 +183,77 @@ class SearchApiV2Service
$query = urldecode($this->query->input('q')); $query = urldecode($this->query->input('q'));
$banned = InstanceService::getBannedDomains(); $banned = InstanceService::getBannedDomains();
$domainBlocks = UserFilterService::domainBlocks($user->profile_id); $domainBlocks = UserFilterService::domainBlocks($user->profile_id);
if($domainBlocks && count($domainBlocks)) { if ($domainBlocks && count($domainBlocks)) {
$banned = array_unique( $banned = array_unique(
array_values( array_values(
array_merge($banned, $domainBlocks) array_merge($banned, $domainBlocks)
) )
); );
} }
if(substr($query, 0, 1) === '@' && !Str::contains($query, '.')) { if (substr($query, 0, 1) === '@' && ! Str::contains($query, '.')) {
$default['accounts'] = $this->accounts(substr($query, 1)); $default['accounts'] = $this->accounts(substr($query, 1));
return $default; return $default;
} }
if(Helpers::validateLocalUrl($query)) { if (Helpers::validateLocalUrl($query)) {
if(Str::contains($query, '/p/') || Str::contains($query, 'i/web/post/')) { if (Str::contains($query, '/p/') || Str::contains($query, 'i/web/post/')) {
return $this->resolveLocalStatus(); return $this->resolveLocalStatus();
} else if(Str::contains($query, 'i/web/profile/')) { } elseif (Str::contains($query, 'i/web/profile/')) {
return $this->resolveLocalProfileId(); return $this->resolveLocalProfileId();
} else { } else {
return $this->resolveLocalProfile(); return $this->resolveLocalProfile();
} }
} else { } else {
if(!Helpers::validateUrl($query) && strpos($query, '@') == -1) { if (! Helpers::validateUrl($query) && strpos($query, '@') == -1) {
return $default; return $default;
} }
if(!Str::startsWith($query, 'http') && Str::substrCount($query, '@') == 1 && strpos($query, '@') !== 0) { if (! Str::startsWith($query, 'http') && Str::substrCount($query, '@') == 1 && strpos($query, '@') !== 0) {
try { try {
$res = WebfingerService::lookup('@' . $query, $mastodonMode); $res = WebfingerService::lookup('@'.$query, $mastodonMode);
} catch (\Exception $e) { } catch (\Exception $e) {
return $default; return $default;
} }
if($res && isset($res['id'], $res['url'])) { if ($res && isset($res['id'], $res['url'])) {
$domain = strtolower(parse_url($res['url'], PHP_URL_HOST)); $domain = strtolower(parse_url($res['url'], PHP_URL_HOST));
if(in_array($domain, $banned)) { if (in_array($domain, $banned)) {
return $default; return $default;
} }
$default['accounts'][] = $res; $default['accounts'][] = $res;
return $default; return $default;
} else { } else {
return $default; return $default;
} }
} }
if(Str::substrCount($query, '@') == 2) { if (Str::substrCount($query, '@') == 2) {
try { try {
$res = WebfingerService::lookup($query, $mastodonMode); $res = WebfingerService::lookup($query, $mastodonMode);
} catch (\Exception $e) { } catch (\Exception $e) {
return $default; return $default;
} }
if($res && isset($res['id'])) { if ($res && isset($res['id'])) {
$domain = strtolower(parse_url($res['url'], PHP_URL_HOST)); $domain = strtolower(parse_url($res['url'], PHP_URL_HOST));
if(in_array($domain, $banned)) { if (in_array($domain, $banned)) {
return $default; return $default;
} }
$default['accounts'][] = $res; $default['accounts'][] = $res;
return $default; return $default;
} else { } else {
return $default; return $default;
} }
} }
if($sid = Status::whereUri($query)->first()) { if ($sid = Status::whereUri($query)->first()) {
$s = StatusService::get($sid->id, false); $s = StatusService::get($sid->id, false);
if(!$s) { if (! $s) {
return $default; return $default;
} }
if(in_array($s['visibility'], ['public', 'unlisted'])) { if (in_array($s['visibility'], ['public', 'unlisted'])) {
$default['statuses'][] = $s; $default['statuses'][] = $s;
return $default; return $default;
} }
} }
@ -259,10 +261,10 @@ class SearchApiV2Service
try { try {
$res = ActivityPubFetchService::get($query); $res = ActivityPubFetchService::get($query);
if($res) { if ($res) {
$json = json_decode($res, true); $json = json_decode($res, true);
if(!$json || !isset($json['@context']) || !isset($json['type']) || !in_array($json['type'], ['Note', 'Person'])) { if (! $json || ! isset($json['@context']) || ! isset($json['type']) || ! in_array($json['type'], ['Note', 'Person'])) {
return [ return [
'accounts' => [], 'accounts' => [],
'hashtags' => [], 'hashtags' => [],
@ -270,36 +272,38 @@ class SearchApiV2Service
]; ];
} }
switch($json['type']) { switch ($json['type']) {
case 'Note': case 'Note':
$obj = Helpers::statusFetch($query); $obj = Helpers::statusFetch($query);
if(!$obj || !isset($obj['id'])) { if (! $obj || ! isset($obj['id'])) {
return $default; return $default;
} }
$note = $mastodonMode ? $note = $mastodonMode ?
StatusService::getMastodon($obj['id'], false) : StatusService::getMastodon($obj['id'], false) :
StatusService::get($obj['id'], false); StatusService::get($obj['id'], false);
if(!$note) { if (! $note) {
return $default; return $default;
} }
if(!isset($note['visibility']) || !in_array($note['visibility'], ['public', 'unlisted'])) { if (! isset($note['visibility']) || ! in_array($note['visibility'], ['public', 'unlisted'])) {
return $default; return $default;
} }
$default['statuses'][] = $note; $default['statuses'][] = $note;
return $default; return $default;
break; break;
case 'Person': case 'Person':
$obj = Helpers::profileFetch($query); $obj = Helpers::profileFetch($query);
if(!$obj) { if (! $obj) {
return $default; return $default;
} }
if(in_array($obj['domain'], $banned)) { if (in_array($obj['domain'], $banned)) {
return $default; return $default;
} }
$default['accounts'][] = $mastodonMode ? $default['accounts'][] = $mastodonMode ?
AccountService::getMastodon($obj['id'], true) : AccountService::getMastodon($obj['id'], true) :
AccountService::get($obj['id'], true); AccountService::get($obj['id'], true);
return $default; return $default;
break; break;
@ -329,18 +333,18 @@ class SearchApiV2Service
$query = urldecode($this->query->input('q')); $query = urldecode($this->query->input('q'));
$query = last(explode('/', parse_url($query, PHP_URL_PATH))); $query = last(explode('/', parse_url($query, PHP_URL_PATH)));
$status = StatusService::getMastodon($query, false); $status = StatusService::getMastodon($query, false);
if(!$status || !in_array($status['visibility'], ['public', 'unlisted'])) { if (! $status || ! in_array($status['visibility'], ['public', 'unlisted'])) {
return [ return [
'accounts' => [], 'accounts' => [],
'hashtags' => [], 'hashtags' => [],
'statuses' => [] 'statuses' => [],
]; ];
} }
$res = [ $res = [
'accounts' => [], 'accounts' => [],
'hashtags' => [], 'hashtags' => [],
'statuses' => [$status] 'statuses' => [$status],
]; ];
return $res; return $res;
@ -355,21 +359,22 @@ class SearchApiV2Service
->whereUsername($query) ->whereUsername($query)
->first(); ->first();
if(!$profile) { if (! $profile) {
return [ return [
'accounts' => [], 'accounts' => [],
'hashtags' => [], 'hashtags' => [],
'statuses' => [] 'statuses' => [],
]; ];
} }
$fractal = new Fractal\Manager(); $fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer()); $fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($profile, new AccountTransformer()); $resource = new Fractal\Resource\Item($profile, new AccountTransformer());
return [ return [
'accounts' => [$fractal->createData($resource)->toArray()], 'accounts' => [$fractal->createData($resource)->toArray()],
'hashtags' => [], 'hashtags' => [],
'statuses' => [] 'statuses' => [],
]; ];
} }
@ -380,22 +385,22 @@ class SearchApiV2Service
$profile = Profile::whereNull('status') $profile = Profile::whereNull('status')
->find($query); ->find($query);
if(!$profile) { if (! $profile) {
return [ return [
'accounts' => [], 'accounts' => [],
'hashtags' => [], 'hashtags' => [],
'statuses' => [] 'statuses' => [],
]; ];
} }
$fractal = new Fractal\Manager(); $fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer()); $fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($profile, new AccountTransformer()); $resource = new Fractal\Resource\Item($profile, new AccountTransformer());
return [ return [
'accounts' => [$fractal->createData($resource)->toArray()], 'accounts' => [$fractal->createData($resource)->toArray()],
'hashtags' => [], 'hashtags' => [],
'statuses' => [] 'statuses' => [],
]; ];
} }
} }

37
app/Services/StatusHashtagService.php
View file

@ -2,22 +2,20 @@
namespace App\Services; namespace App\Services;
use Cache; use App\Hashtag;
use Illuminate\Support\Facades\Redis; use App\Status;
use App\{Status, StatusHashtag}; use App\StatusHashtag;
use App\Transformer\Api\StatusHashtagTransformer;
use App\Transformer\Api\HashtagTransformer; use App\Transformer\Api\HashtagTransformer;
use League\Fractal; use League\Fractal;
use League\Fractal\Serializer\ArraySerializer; use League\Fractal\Serializer\ArraySerializer;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
class StatusHashtagService {
class StatusHashtagService
{
const CACHE_KEY = 'pf:services:status-hashtag:collection:'; const CACHE_KEY = 'pf:services:status-hashtag:collection:';
public static function get($id, $page = 1, $stop = 9) public static function get($id, $page = 1, $stop = 9)
{ {
if($page > 20) { if ($page > 20) {
return []; return [];
} }
@ -33,11 +31,11 @@ class StatusHashtagService {
->map(function ($i, $k) use ($id) { ->map(function ($i, $k) use ($id) {
return self::getStatus($i, $id); return self::getStatus($i, $id);
}) })
->filter(function ($i) use($filtered) { ->filter(function ($i) use ($filtered) {
return isset($i['status']) && return isset($i['status']) &&
!empty($i['status']) && !in_array($i['status']['account']['id'], $filtered) && ! empty($i['status']) && ! in_array($i['status']['account']['id'], $filtered) &&
isset($i['status']['media_attachments']) && isset($i['status']['media_attachments']) &&
!empty($i['status']['media_attachments']); ! empty($i['status']['media_attachments']);
}) })
->values(); ->values();
} }
@ -52,9 +50,10 @@ class StatusHashtagService {
->skip($start) ->skip($start)
->take($stop) ->take($stop)
->pluck('status_id'); ->pluck('status_id');
foreach($ids as $key) { foreach ($ids as $key) {
self::set($id, $key); self::set($id, $key);
} }
return $ids; return $ids;
} }
@ -70,11 +69,12 @@ class StatusHashtagService {
public static function count($id) public static function count($id)
{ {
$key = 'pf:services:status-hashtag:count:' . $id; $cc = Hashtag::find($id);
$ttl = now()->addMinutes(5); if (! $cc) {
return Cache::remember($key, $ttl, function() use($id) { return 0;
return StatusHashtag::whereHashtagId($id)->has('media')->count(); }
});
return $cc->cached_count ?? 0;
} }
public static function getStatus($statusId, $hashtagId) public static function getStatus($statusId, $hashtagId)
@ -85,13 +85,14 @@ class StatusHashtagService {
public static function statusTags($statusId) public static function statusTags($statusId)
{ {
$status = Status::with('hashtags')->find($statusId); $status = Status::with('hashtags')->find($statusId);
if(!$status) { if (! $status) {
return []; return [];
} }
$fractal = new Fractal\Manager(); $fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer()); $fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Collection($status->hashtags, new HashtagTransformer()); $resource = new Fractal\Resource\Collection($status->hashtags, new HashtagTransformer());
return $fractal->createData($resource)->toArray(); return $fractal->createData($resource)->toArray();
} }
} }

BIN
public/js/manifest.js vendored
View file

Binary file not shown.

BIN
public/js/post.chunk.5ff16664f9adb901.js vendored
View file

Binary file not shown.

BIN
public/js/post.chunk.9184101a2b809af1.js vendored Normal file
View file

Binary file not shown.

0
public/js/post.chunk.5ff16664f9adb901.js.LICENSE.txt → public/js/post.chunk.9184101a2b809af1.js.LICENSE.txt
View file

BIN
public/mix-manifest.json
View file

Binary file not shown.

15
resources/assets/components/Post.vue
View file

@ -171,7 +171,7 @@
} }
}, },
beforeMount() { created() {
this.init(); this.init();
}, },
@ -181,20 +181,7 @@
methods: { methods: {
init() { init() {
if(this.cachedStatus && this.cachedProfile) {
this.post = this.cachedStatus;
this.media = this.post.media_attachments;
this.profile = this.post.account;
this.user = this.cachedProfile;
if(this.post.in_reply_to_id) {
this.fetchReply();
} else {
this.isReply = false;
this.fetchRelationship();
}
} else {
this.fetchSelf(); this.fetchSelf();
}
}, },
fetchSelf() { fetchSelf() {