mirror
/
pixelfed
kopia lustrzana https://github.com/pixelfed/pixelfed
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Update DiscoverController, handle discover hashtag redirects

pull/4989/head
Daniel Supernault 2024-03-07 02:38:50 -07:00
rodzic 592c84125c
commit 18382e8a1f
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 23740873EE6F76A1
1 zmienionych plików z 333 dodań i 320 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

157
app/Http/Controllers/DiscoverController.php
Wyświetl plik

@ -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;
} }
} }