mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-24 07:21:27 +00:00
New Discover layout on Metro 2.0
This commit is contained in:
Daniel Supernault
parent
160e32a590
commit
0b68009933
2 changed files with 302 additions and 147 deletions
|
|
@ -7,6 +7,8 @@ use App\{
|
|||
Follower,
|
||||
Hashtag,
|
||||
HashtagFollow,
|
||||
Instance,
|
||||
Like,
|
||||
Profile,
|
||||
Status,
|
||||
StatusHashtag,
|
||||
|
|
@ -14,13 +16,7 @@ use App\{
|
|||
};
|
||||
use Auth, DB, Cache;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Transformer\Api\AccountTransformer;
|
||||
use App\Transformer\Api\AccountWithStatusesTransformer;
|
||||
use App\Transformer\Api\StatusTransformer;
|
||||
use App\Transformer\Api\StatusStatelessTransformer;
|
||||
use League\Fractal;
|
||||
use League\Fractal\Serializer\ArraySerializer;
|
||||
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
|
||||
use App\Services\ConfigCacheService;
|
||||
use App\Services\StatusHashtagService;
|
||||
use App\Services\SnowflakeService;
|
||||
use App\Services\StatusService;
|
||||
|
|
@ -28,14 +24,6 @@ use App\Services\UserFilterService;
|
|||
|
||||
class DiscoverController extends Controller
|
||||
{
|
||||
protected $fractal;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->fractal = new Fractal\Manager();
|
||||
$this->fractal->setSerializer(new ArraySerializer());
|
||||
}
|
||||
|
||||
public function home(Request $request)
|
||||
{
|
||||
abort_if(!Auth::check() && config('instance.discover.public') == false, 403);
|
||||
|
|
@ -103,8 +91,7 @@ class DiscoverController extends Controller
|
|||
|
||||
public function profilesDirectory(Request $request)
|
||||
{
|
||||
return redirect('/')
|
||||
->with('statusRedirect', 'The Profile Directory is unavailable at this time.');
|
||||
return redirect('/')->with('statusRedirect', 'The Profile Directory is unavailable at this time.');
|
||||
}
|
||||
|
||||
public function profilesDirectoryApi(Request $request)
|
||||
|
|
@ -192,4 +179,167 @@ class DiscoverController extends Controller
|
|||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
public function myMemories(Request $request)
|
||||
{
|
||||
abort_if(!$request->user(), 404);
|
||||
$pid = $request->user()->profile_id;
|
||||
abort_if(!$this->config()['memories']['enabled'], 404);
|
||||
$type = $request->input('type') ?? 'posts';
|
||||
|
||||
switch($type) {
|
||||
case 'posts':
|
||||
$res = Status::whereProfileId($pid)
|
||||
->whereDay('created_at', date('d'))
|
||||
->whereMonth('created_at', date('m'))
|
||||
->whereYear('created_at', '!=', date('Y'))
|
||||
->whereNull(['reblog_of_id', 'in_reply_to_id'])
|
||||
->limit(20)
|
||||
->pluck('id')
|
||||
->map(function($id) {
|
||||
return StatusService::get($id, false);
|
||||
})
|
||||
->filter(function($post) {
|
||||
return $post && isset($post['account']);
|
||||
})
|
||||
->values();
|
||||
break;
|
||||
|
||||
case 'liked':
|
||||
$res = Like::whereProfileId($pid)
|
||||
->whereDay('created_at', date('d'))
|
||||
->whereMonth('created_at', date('m'))
|
||||
->whereYear('created_at', '!=', date('Y'))
|
||||
->orderByDesc('status_id')
|
||||
->limit(20)
|
||||
->pluck('status_id')
|
||||
->map(function($id) {
|
||||
return StatusService::get($id, false);
|
||||
})
|
||||
->filter(function($post) {
|
||||
return $post && isset($post['account']);
|
||||
})
|
||||
->values();
|
||||
break;
|
||||
}
|
||||
|
||||
return $res;
|
||||
}
|
||||
|
||||
public function accountInsightsPopularPosts(Request $request)
|
||||
{
|
||||
abort_if(!$request->user(), 404);
|
||||
$pid = $request->user()->profile_id;
|
||||
abort_if(!$this->config()['insights']['enabled'], 404);
|
||||
$posts = Cache::remember('pf:discover:metro2:accinsights:popular:' . $pid, 43200, function() use ($pid) {
|
||||
return Status::whereProfileId($pid)
|
||||
->whereNotNull('likes_count')
|
||||
->orderByDesc('likes_count')
|
||||
->limit(12)
|
||||
->pluck('id')
|
||||
->map(function($id) {
|
||||
return StatusService::get($id, false);
|
||||
})
|
||||
->filter(function($post) {
|
||||
return $post && isset($post['account']);
|
||||
})
|
||||
->values();
|
||||
});
|
||||
|
||||
return $posts;
|
||||
}
|
||||
|
||||
public function config()
|
||||
{
|
||||
$cc = ConfigCacheService::get('config.discover.features');
|
||||
if($cc) {
|
||||
return is_string($cc) ? json_decode($cc, true) : $cc;
|
||||
}
|
||||
return [
|
||||
'hashtags' => [
|
||||
'enabled' => false,
|
||||
],
|
||||
'memories' => [
|
||||
'enabled' => false,
|
||||
],
|
||||
'insights' => [
|
||||
'enabled' => false,
|
||||
],
|
||||
'friends' => [
|
||||
'enabled' => false,
|
||||
],
|
||||
'server' => [
|
||||
'enabled' => false,
|
||||
'mode' => 'allowlist',
|
||||
'domains' => []
|
||||
]
|
||||
];
|
||||
}
|
||||
|
||||
public function serverTimeline(Request $request)
|
||||
{
|
||||
abort_if(!$request->user(), 404);
|
||||
abort_if(!$this->config()['server']['enabled'], 404);
|
||||
$pid = $request->user()->profile_id;
|
||||
$domain = $request->input('domain');
|
||||
$config = $this->config();
|
||||
$domains = explode(',', $config['server']['domains']);
|
||||
abort_unless(in_array($domain, $domains), 400);
|
||||
|
||||
$res = Status::whereNotNull('uri')
|
||||
->where('uri', 'like', 'https://' . $domain . '%')
|
||||
->whereNull(['in_reply_to_id', 'reblog_of_id'])
|
||||
->orderByDesc('id')
|
||||
->limit(12)
|
||||
->pluck('id')
|
||||
->map(function($id) {
|
||||
return StatusService::get($id);
|
||||
})
|
||||
->filter(function($post) {
|
||||
return $post && isset($post['account']);
|
||||
})
|
||||
->values();
|
||||
return $res;
|
||||
}
|
||||
|
||||
public function enabledFeatures(Request $request)
|
||||
{
|
||||
abort_if(!$request->user(), 404);
|
||||
return $this->config();
|
||||
}
|
||||
|
||||
public function updateFeatures(Request $request)
|
||||
{
|
||||
abort_if(!$request->user(), 404);
|
||||
abort_if(!$request->user()->is_admin, 404);
|
||||
$pid = $request->user()->profile_id;
|
||||
$this->validate($request, [
|
||||
'features.friends.enabled' => 'boolean',
|
||||
'features.hashtags.enabled' => 'boolean',
|
||||
'features.insights.enabled' => 'boolean',
|
||||
'features.memories.enabled' => 'boolean',
|
||||
'features.server.enabled' => 'boolean',
|
||||
]);
|
||||
$res = $request->input('features');
|
||||
if($res['server'] && isset($res['server']['domains']) && !empty($res['server']['domains'])) {
|
||||
$parts = explode(',', $res['server']['domains']);
|
||||
$parts = array_filter($parts, function($v) {
|
||||
$len = strlen($v);
|
||||
$pos = strpos($v, '.');
|
||||
$domain = trim($v);
|
||||
if($pos == false || $pos == ($len + 1)) {
|
||||
return false;
|
||||
}
|
||||
if(!Instance::whereDomain($domain)->exists()) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
});
|
||||
$parts = array_slice($parts, 0, 10);
|
||||
$d = implode(',', array_map('trim', $parts));
|
||||
$res['server']['domains'] = $d;
|
||||
}
|
||||
ConfigCacheService::put('config.discover.features', json_encode($res));
|
||||
return $res;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -216,6 +216,11 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
|
|||
Route::post('status/{id}/archive', 'ApiController@archive');
|
||||
Route::post('status/{id}/unarchive', 'ApiController@unarchive');
|
||||
Route::get('statuses/archives', 'ApiController@archivedPosts');
|
||||
Route::get('discover/memories', 'DiscoverController@myMemories');
|
||||
Route::get('discover/account-insights', 'DiscoverController@accountInsightsPopularPosts');
|
||||
Route::get('discover/server-timeline', 'DiscoverController@serverTimeline');
|
||||
Route::get('discover/meta', 'DiscoverController@enabledFeatures');
|
||||
Route::post('discover/admin/features', 'DiscoverController@updateFeatures');
|
||||
});
|
||||
|
||||
Route::get('discover/accounts/popular', 'Api\ApiV1Controller@discoverAccountsPopular');
|
||||
|
|
|
|||
Loading…
Reference in a new issue