mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-22 14:31:26 +00:00
Update config_cache
This commit is contained in:
Daniel Supernault
parent
b0cb4456a9
commit
bf46f6f5f4
4 changed files with 482 additions and 488 deletions
|
|
@ -332,7 +332,7 @@ class ProfileController extends Controller
|
|||
{
|
||||
$res = view('profile.embed-removed');
|
||||
|
||||
if (! config('instance.embed.profile')) {
|
||||
if (! (bool) config_cache('instance.embed.profile')) {
|
||||
return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,84 +2,79 @@
|
|||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Jobs\ImageOptimizePipeline\ImageOptimize;
|
||||
use App\Jobs\StatusPipeline\NewStatusPipeline;
|
||||
use App\Jobs\StatusPipeline\StatusDelete;
|
||||
use App\Jobs\StatusPipeline\RemoteStatusDelete;
|
||||
use App\AccountInterstitial;
|
||||
use App\Jobs\SharePipeline\SharePipeline;
|
||||
use App\Jobs\SharePipeline\UndoSharePipeline;
|
||||
use App\AccountInterstitial;
|
||||
use App\Media;
|
||||
use App\Jobs\StatusPipeline\RemoteStatusDelete;
|
||||
use App\Jobs\StatusPipeline\StatusDelete;
|
||||
use App\Profile;
|
||||
use App\Services\HashidService;
|
||||
use App\Services\ReblogService;
|
||||
use App\Services\StatusService;
|
||||
use App\Status;
|
||||
use App\StatusArchived;
|
||||
use App\StatusView;
|
||||
use App\Transformer\ActivityPub\StatusTransformer;
|
||||
use App\Transformer\ActivityPub\Verb\Note;
|
||||
use App\Transformer\ActivityPub\Verb\Question;
|
||||
use App\User;
|
||||
use Auth, DB, Cache;
|
||||
use App\Util\Media\License;
|
||||
use Auth;
|
||||
use Cache;
|
||||
use DB;
|
||||
use Illuminate\Http\Request;
|
||||
use League\Fractal;
|
||||
use App\Util\Media\Filter;
|
||||
use Illuminate\Support\Str;
|
||||
use App\Services\HashidService;
|
||||
use App\Services\StatusService;
|
||||
use App\Util\Media\License;
|
||||
use App\Services\ReblogService;
|
||||
|
||||
class StatusController extends Controller
|
||||
{
|
||||
public function show(Request $request, $username, $id)
|
||||
{
|
||||
// redirect authed users to Metro 2.0
|
||||
if($request->user()) {
|
||||
if ($request->user()) {
|
||||
// unless they force static view
|
||||
if(!$request->has('fs') || $request->input('fs') != '1') {
|
||||
return redirect('/i/web/post/' . $id);
|
||||
if (! $request->has('fs') || $request->input('fs') != '1') {
|
||||
return redirect('/i/web/post/'.$id);
|
||||
}
|
||||
}
|
||||
|
||||
$user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
|
||||
|
||||
if($user->status != null) {
|
||||
if ($user->status != null) {
|
||||
return ProfileController::accountCheck($user);
|
||||
}
|
||||
|
||||
$status = Status::whereProfileId($user->id)
|
||||
->whereNull('reblog_of_id')
|
||||
->whereIn('scope', ['public','unlisted', 'private'])
|
||||
->whereIn('scope', ['public', 'unlisted', 'private'])
|
||||
->findOrFail($id);
|
||||
|
||||
if($status->uri || $status->url) {
|
||||
if ($status->uri || $status->url) {
|
||||
$url = $status->uri ?? $status->url;
|
||||
if(ends_with($url, '/activity')) {
|
||||
if (ends_with($url, '/activity')) {
|
||||
$url = str_replace('/activity', '', $url);
|
||||
}
|
||||
|
||||
return redirect($url);
|
||||
}
|
||||
|
||||
if($status->visibility == 'private' || $user->is_private) {
|
||||
if(!Auth::check()) {
|
||||
if ($status->visibility == 'private' || $user->is_private) {
|
||||
if (! Auth::check()) {
|
||||
abort(404);
|
||||
}
|
||||
$pid = Auth::user()->profile;
|
||||
if($user->followedBy($pid) == false && $user->id !== $pid->id && Auth::user()->is_admin == false) {
|
||||
if ($user->followedBy($pid) == false && $user->id !== $pid->id && Auth::user()->is_admin == false) {
|
||||
abort(404);
|
||||
}
|
||||
}
|
||||
|
||||
if($status->type == 'archived') {
|
||||
if(Auth::user()->profile_id !== $status->profile_id) {
|
||||
if ($status->type == 'archived') {
|
||||
if (Auth::user()->profile_id !== $status->profile_id) {
|
||||
abort(404);
|
||||
}
|
||||
}
|
||||
|
||||
if($request->user() && $request->user()->profile_id != $status->profile_id) {
|
||||
if ($request->user() && $request->user()->profile_id != $status->profile_id) {
|
||||
StatusView::firstOrCreate([
|
||||
'status_id' => $status->id,
|
||||
'status_profile_id' => $status->profile_id,
|
||||
'profile_id' => $request->user()->profile_id
|
||||
'profile_id' => $request->user()->profile_id,
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -88,12 +83,16 @@ class StatusController extends Controller
|
|||
}
|
||||
|
||||
$template = $status->in_reply_to_id ? 'status.reply' : 'status.show';
|
||||
|
||||
return view($template, compact('user', 'status'));
|
||||
}
|
||||
|
||||
public function shortcodeRedirect(Request $request, $id)
|
||||
{
|
||||
abort(404);
|
||||
$hid = HashidService::decode($id);
|
||||
abort_if(! $hid, 404);
|
||||
|
||||
return redirect('/i/web/post/'.$hid);
|
||||
}
|
||||
|
||||
public function showId(int $id)
|
||||
|
|
@ -102,53 +101,59 @@ class StatusController extends Controller
|
|||
$status = Status::whereNull('reblog_of_id')
|
||||
->whereIn('scope', ['public', 'unlisted'])
|
||||
->findOrFail($id);
|
||||
|
||||
return redirect($status->url());
|
||||
}
|
||||
|
||||
public function showEmbed(Request $request, $username, int $id)
|
||||
{
|
||||
if(!config('instance.embed.post')) {
|
||||
if (! (bool) config_cache('instance.embed.post')) {
|
||||
$res = view('status.embed-removed');
|
||||
|
||||
return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
|
||||
}
|
||||
|
||||
$profile = Profile::whereNull(['domain','status'])
|
||||
$profile = Profile::whereNull(['domain', 'status'])
|
||||
->whereIsPrivate(false)
|
||||
->whereUsername($username)
|
||||
->first();
|
||||
|
||||
if(!$profile) {
|
||||
if (! $profile) {
|
||||
$content = view('status.embed-removed');
|
||||
|
||||
return response($content)->header('X-Frame-Options', 'ALLOWALL');
|
||||
}
|
||||
|
||||
$aiCheck = Cache::remember('profile:ai-check:spam-login:' . $profile->id, 86400, function() use($profile) {
|
||||
$aiCheck = Cache::remember('profile:ai-check:spam-login:'.$profile->id, 86400, function () use ($profile) {
|
||||
$exists = AccountInterstitial::whereUserId($profile->user_id)->where('is_spam', 1)->count();
|
||||
if($exists) {
|
||||
if ($exists) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
if($aiCheck) {
|
||||
if ($aiCheck) {
|
||||
$res = view('status.embed-removed');
|
||||
|
||||
return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
|
||||
}
|
||||
$status = Status::whereProfileId($profile->id)
|
||||
->whereNull('uri')
|
||||
->whereScope('public')
|
||||
->whereIsNsfw(false)
|
||||
->whereIn('type', ['photo', 'video','photo:album'])
|
||||
->whereIn('type', ['photo', 'video', 'photo:album'])
|
||||
->find($id);
|
||||
if(!$status) {
|
||||
if (! $status) {
|
||||
$content = view('status.embed-removed');
|
||||
|
||||
return response($content)->header('X-Frame-Options', 'ALLOWALL');
|
||||
}
|
||||
$showLikes = $request->filled('likes') && $request->likes == true;
|
||||
$showCaption = $request->filled('caption') && $request->caption !== false;
|
||||
$layout = $request->filled('layout') && $request->layout == 'compact' ? 'compact' : 'full';
|
||||
$content = view('status.embed', compact('status', 'showLikes', 'showCaption', 'layout'));
|
||||
|
||||
return response($content)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
|
||||
}
|
||||
|
||||
|
|
@ -156,22 +161,22 @@ class StatusController extends Controller
|
|||
{
|
||||
$user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
|
||||
|
||||
if($user->status != null) {
|
||||
if ($user->status != null) {
|
||||
return ProfileController::accountCheck($user);
|
||||
}
|
||||
|
||||
$status = Status::whereProfileId($user->id)
|
||||
->whereNotIn('visibility',['draft','direct'])
|
||||
->whereNotIn('visibility', ['draft', 'direct'])
|
||||
->findOrFail($id);
|
||||
|
||||
abort_if($status->uri, 404);
|
||||
|
||||
if($status->visibility == 'private' || $user->is_private) {
|
||||
if(!Auth::check()) {
|
||||
if ($status->visibility == 'private' || $user->is_private) {
|
||||
if (! Auth::check()) {
|
||||
abort(403);
|
||||
}
|
||||
$pid = Auth::user()->profile;
|
||||
if($user->followedBy($pid) == false && $user->id !== $pid->id) {
|
||||
if ($user->followedBy($pid) == false && $user->id !== $pid->id) {
|
||||
abort(403);
|
||||
}
|
||||
}
|
||||
|
|
@ -188,7 +193,7 @@ class StatusController extends Controller
|
|||
|
||||
public function store(Request $request)
|
||||
{
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
public function delete(Request $request)
|
||||
|
|
@ -203,7 +208,7 @@ class StatusController extends Controller
|
|||
|
||||
$user = Auth::user();
|
||||
|
||||
if($status->profile_id != $user->profile->id &&
|
||||
if ($status->profile_id != $user->profile->id &&
|
||||
$user->is_admin == true &&
|
||||
$status->uri == null
|
||||
) {
|
||||
|
|
@ -235,26 +240,26 @@ class StatusController extends Controller
|
|||
$u->save();
|
||||
}
|
||||
|
||||
if($status->in_reply_to_id) {
|
||||
if ($status->in_reply_to_id) {
|
||||
$parent = Status::find($status->in_reply_to_id);
|
||||
if($parent && ($parent->profile_id == $user->profile_id) || ($status->profile_id == $user->profile_id) || $user->is_admin) {
|
||||
Cache::forget('_api:statuses:recent_9:' . $status->profile_id);
|
||||
Cache::forget('profile:status_count:' . $status->profile_id);
|
||||
Cache::forget('profile:embed:' . $status->profile_id);
|
||||
if ($parent && ($parent->profile_id == $user->profile_id) || ($status->profile_id == $user->profile_id) || $user->is_admin) {
|
||||
Cache::forget('_api:statuses:recent_9:'.$status->profile_id);
|
||||
Cache::forget('profile:status_count:'.$status->profile_id);
|
||||
Cache::forget('profile:embed:'.$status->profile_id);
|
||||
StatusService::del($status->id, true);
|
||||
Cache::forget('profile:status_count:'.$status->profile_id);
|
||||
$status->uri ? RemoteStatusDelete::dispatch($status) : StatusDelete::dispatch($status);
|
||||
}
|
||||
} else if ($status->profile_id == $user->profile_id || $user->is_admin == true) {
|
||||
Cache::forget('_api:statuses:recent_9:' . $status->profile_id);
|
||||
Cache::forget('profile:status_count:' . $status->profile_id);
|
||||
Cache::forget('profile:embed:' . $status->profile_id);
|
||||
} elseif ($status->profile_id == $user->profile_id || $user->is_admin == true) {
|
||||
Cache::forget('_api:statuses:recent_9:'.$status->profile_id);
|
||||
Cache::forget('profile:status_count:'.$status->profile_id);
|
||||
Cache::forget('profile:embed:'.$status->profile_id);
|
||||
StatusService::del($status->id, true);
|
||||
Cache::forget('profile:status_count:'.$status->profile_id);
|
||||
$status->uri ? RemoteStatusDelete::dispatch($status) : StatusDelete::dispatch($status);
|
||||
}
|
||||
|
||||
if($request->wantsJson()) {
|
||||
if ($request->wantsJson()) {
|
||||
return response()->json(['Status successfully deleted.']);
|
||||
} else {
|
||||
return redirect($user->url());
|
||||
|
|
@ -319,7 +324,7 @@ class StatusController extends Controller
|
|||
$resource = new Fractal\Resource\Item($status, $object);
|
||||
$res = $fractal->createData($resource)->toArray();
|
||||
|
||||
return response()->json($res['data'], 200, ['Content-Type' => 'application/activity+json'], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
|
||||
return response()->json($res['data'], 200, ['Content-Type' => 'application/activity+json'], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
|
||||
}
|
||||
|
||||
public function edit(Request $request, $username, $id)
|
||||
|
|
@ -330,6 +335,7 @@ class StatusController extends Controller
|
|||
->with(['media'])
|
||||
->findOrFail($id);
|
||||
$licenses = License::get();
|
||||
|
||||
return view('status.edit', compact('user', 'status', 'licenses'));
|
||||
}
|
||||
|
||||
|
|
@ -347,7 +353,7 @@ class StatusController extends Controller
|
|||
|
||||
$licenseId = $request->input('license');
|
||||
|
||||
$status->media->each(function($media) use($licenseId) {
|
||||
$status->media->each(function ($media) use ($licenseId) {
|
||||
$media->license = $licenseId;
|
||||
$media->save();
|
||||
Cache::forget('status:transformer:media:attachments:'.$media->status_id);
|
||||
|
|
@ -366,6 +372,7 @@ class StatusController extends Controller
|
|||
protected function validateVisibility($visibility)
|
||||
{
|
||||
$allowed = ['public', 'unlisted', 'private'];
|
||||
|
||||
return in_array($visibility, $allowed) ? $visibility : 'public';
|
||||
}
|
||||
|
||||
|
|
@ -375,41 +382,42 @@ class StatusController extends Controller
|
|||
$count = count($mimes);
|
||||
$photos = 0;
|
||||
$videos = 0;
|
||||
foreach($mimes as $mime) {
|
||||
if(in_array($mime, $allowed) == false && $mime !== 'video/mp4') {
|
||||
foreach ($mimes as $mime) {
|
||||
if (in_array($mime, $allowed) == false && $mime !== 'video/mp4') {
|
||||
continue;
|
||||
}
|
||||
if(str_contains($mime, 'image/')) {
|
||||
if (str_contains($mime, 'image/')) {
|
||||
$photos++;
|
||||
}
|
||||
if(str_contains($mime, 'video/')) {
|
||||
if (str_contains($mime, 'video/')) {
|
||||
$videos++;
|
||||
}
|
||||
}
|
||||
if($photos == 1 && $videos == 0) {
|
||||
if ($photos == 1 && $videos == 0) {
|
||||
return 'photo';
|
||||
}
|
||||
if($videos == 1 && $photos == 0) {
|
||||
if ($videos == 1 && $photos == 0) {
|
||||
return 'video';
|
||||
}
|
||||
if($photos > 1 && $videos == 0) {
|
||||
if ($photos > 1 && $videos == 0) {
|
||||
return 'photo:album';
|
||||
}
|
||||
if($videos > 1 && $photos == 0) {
|
||||
if ($videos > 1 && $photos == 0) {
|
||||
return 'video:album';
|
||||
}
|
||||
if($photos >= 1 && $videos >= 1) {
|
||||
if ($photos >= 1 && $videos >= 1) {
|
||||
return 'photo:video:album';
|
||||
}
|
||||
|
||||
return 'text';
|
||||
}
|
||||
|
||||
public function toggleVisibility(Request $request) {
|
||||
public function toggleVisibility(Request $request)
|
||||
{
|
||||
$this->authCheck();
|
||||
$this->validate($request, [
|
||||
'item' => 'required|string|min:1|max:20',
|
||||
'disableComments' => 'required|boolean'
|
||||
'disableComments' => 'required|boolean',
|
||||
]);
|
||||
|
||||
$user = Auth::user();
|
||||
|
|
@ -418,7 +426,7 @@ class StatusController extends Controller
|
|||
|
||||
$status = Status::findOrFail($id);
|
||||
|
||||
if($status->profile_id != $user->profile->id && $user->is_admin == false) {
|
||||
if ($status->profile_id != $user->profile->id && $user->is_admin == false) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
|
|
@ -430,26 +438,26 @@ class StatusController extends Controller
|
|||
|
||||
public function storeView(Request $request)
|
||||
{
|
||||
abort_if(!$request->user(), 403);
|
||||
abort_if(! $request->user(), 403);
|
||||
|
||||
$views = $request->input('_v');
|
||||
$uid = $request->user()->profile_id;
|
||||
|
||||
if(empty($views) || !is_array($views)) {
|
||||
if (empty($views) || ! is_array($views)) {
|
||||
return response()->json(0);
|
||||
}
|
||||
|
||||
Cache::forget('profile:home-timeline-cursor:' . $request->user()->id);
|
||||
Cache::forget('profile:home-timeline-cursor:'.$request->user()->id);
|
||||
|
||||
foreach($views as $view) {
|
||||
if(!isset($view['sid']) || !isset($view['pid'])) {
|
||||
foreach ($views as $view) {
|
||||
if (! isset($view['sid']) || ! isset($view['pid'])) {
|
||||
continue;
|
||||
}
|
||||
DB::transaction(function () use($view, $uid) {
|
||||
DB::transaction(function () use ($view, $uid) {
|
||||
StatusView::firstOrCreate([
|
||||
'status_id' => $view['sid'],
|
||||
'status_profile_id' => $view['pid'],
|
||||
'profile_id' => $uid
|
||||
'profile_id' => $uid,
|
||||
]);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,6 +87,8 @@ class ConfigCacheService
|
|||
'pixelfed.app_registration_rate_limit_decay',
|
||||
'pixelfed.app_registration_confirm_rate_limit_attempts',
|
||||
'pixelfed.app_registration_confirm_rate_limit_decay',
|
||||
'instance.embed.profile',
|
||||
'instance.embed.post',
|
||||
// 'system.user_mode'
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,54 +2,38 @@
|
|||
|
||||
namespace App\Services;
|
||||
|
||||
use Cache;
|
||||
|
||||
class HashidService {
|
||||
|
||||
public const MIN_LIMIT = 15;
|
||||
class HashidService
|
||||
{
|
||||
public const CMAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
|
||||
|
||||
public static function encode($id, $minLimit = true)
|
||||
{
|
||||
if(!is_numeric($id) || $id > PHP_INT_MAX) {
|
||||
if (! is_numeric($id) || $id > PHP_INT_MAX) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if($minLimit && strlen($id) < self::MIN_LIMIT) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$key = "hashids:{$id}";
|
||||
return Cache::remember($key, now()->hours(48), function() use($id) {
|
||||
$cmap = self::CMAP;
|
||||
$base = strlen($cmap);
|
||||
$shortcode = '';
|
||||
while($id) {
|
||||
while ($id) {
|
||||
$id = ($id - ($r = $id % $base)) / $base;
|
||||
$shortcode = $cmap[$r] . $shortcode;
|
||||
}
|
||||
return $shortcode;
|
||||
});
|
||||
$shortcode = $cmap[$r].$shortcode;
|
||||
}
|
||||
|
||||
public static function decode($short)
|
||||
return $shortcode;
|
||||
}
|
||||
|
||||
public static function decode($short = false)
|
||||
{
|
||||
$len = strlen($short);
|
||||
if($len < 3 || $len > 11) {
|
||||
return null;
|
||||
if (! $short) {
|
||||
return;
|
||||
}
|
||||
$id = 0;
|
||||
foreach(str_split($short) as $needle) {
|
||||
foreach (str_split($short) as $needle) {
|
||||
$pos = strpos(self::CMAP, $needle);
|
||||
// if(!$pos) {
|
||||
// return null;
|
||||
// }
|
||||
$id = ($id*64) + $pos;
|
||||
}
|
||||
if(strlen($id) < self::MIN_LIMIT) {
|
||||
return null;
|
||||
}
|
||||
return $id;
|
||||
$id = ($id * 64) + $pos;
|
||||
}
|
||||
|
||||
return $id;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue