Merge pull request #5001 from pixelfed/staging

Staging

app/Http/Controllers/Api/ApiV1Dot1Controller.php

@@ -473,15 +473,15 @@ class ApiV1Dot1Controller extends Controller
 	{
 		return [
 			'open' => (bool) config_cache('pixelfed.open_registration'),
-			'iara' => config('pixelfed.allow_app_registration')
+			'iara' => (bool) config_cache('pixelfed.allow_app_registration'),
 		];
 	}
 
 	public function inAppRegistration(Request $request)
 	{
 		abort_if($request->user(), 404);
-		abort_unless(config_cache('pixelfed.open_registration'), 404);
+		abort_unless((bool) config_cache('pixelfed.open_registration'), 404);
-		abort_unless(config('pixelfed.allow_app_registration'), 404);
+		abort_unless((bool) config_cache('pixelfed.allow_app_registration'), 404);
 		abort_unless($request->hasHeader('X-PIXELFED-APP'), 403);
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);
@@ -609,8 +609,8 @@ class ApiV1Dot1Controller extends Controller
 	public function inAppRegistrationConfirm(Request $request)
 	{
 		abort_if($request->user(), 404);
-		abort_unless(config_cache('pixelfed.open_registration'), 404);
+		abort_unless((bool) config_cache('pixelfed.open_registration'), 404);
-		abort_unless(config('pixelfed.allow_app_registration'), 404);
+		abort_unless((bool) config_cache('pixelfed.allow_app_registration'), 404);
 		abort_unless($request->hasHeader('X-PIXELFED-APP'), 403);
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);

app/Http/Controllers/ProfileController.php

@@ -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']);
         }
 

app/Http/Controllers/StatusController.php

@@ -2,31 +2,25 @@
 
 namespace App\Http\Controllers;
 
-use App\Jobs\ImageOptimizePipeline\ImageOptimize;
+use App\AccountInterstitial;
-use App\Jobs\StatusPipeline\NewStatusPipeline;
-use App\Jobs\StatusPipeline\StatusDelete;
-use App\Jobs\StatusPipeline\RemoteStatusDelete;
 use App\Jobs\SharePipeline\SharePipeline;
 use App\Jobs\SharePipeline\UndoSharePipeline;
-use App\AccountInterstitial;
+use App\Jobs\StatusPipeline\RemoteStatusDelete;
-use App\Media;
+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 App\Util\Media\License;
-use Auth, DB, Cache;
+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
 {
@@ -56,6 +50,7 @@ class StatusController extends Controller
             if (ends_with($url, '/activity')) {
                 $url = str_replace('/activity', '', $url);
             }
+
             return redirect($url);
         }
 
@@ -79,7 +74,7 @@ class StatusController extends Controller
             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,13 +101,15 @@ 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']);
         }
 
@@ -119,6 +120,7 @@ class StatusController extends Controller
 
         if (! $profile) {
             $content = view('status.embed-removed');
+
             return response($content)->header('X-Frame-Options', 'ALLOWALL');
         }
 
@@ -133,6 +135,7 @@ class StatusController extends Controller
 
         if ($aiCheck) {
             $res = view('status.embed-removed');
+
             return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
         }
         $status = Status::whereProfileId($profile->id)
@@ -143,12 +146,14 @@ class StatusController extends Controller
             ->find($id);
         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']);
     }
 
@@ -188,7 +193,7 @@ class StatusController extends Controller
 
     public function store(Request $request)
     {
-		return;
+
     }
 
     public function delete(Request $request)
@@ -330,6 +335,7 @@ class StatusController extends Controller
             ->with(['media'])
             ->findOrFail($id);
         $licenses = License::get();
+
         return view('status.edit', compact('user', 'status', 'licenses'));
     }
 
@@ -366,6 +372,7 @@ class StatusController extends Controller
     protected function validateVisibility($visibility)
     {
         $allowed = ['public', 'unlisted', 'private'];
+
         return in_array($visibility, $allowed) ? $visibility : 'public';
     }
 
@@ -405,11 +412,12 @@ class StatusController extends Controller
         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();
@@ -449,7 +457,7 @@ class StatusController extends Controller
                 StatusView::firstOrCreate([
                     'status_id' => $view['sid'],
                     'status_profile_id' => $view['pid'],
-						'profile_id' => $uid
+                    'profile_id' => $uid,
                 ]);
             });
         }

app/Services/ConfigCacheService.php

@@ -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'
             ];
 

app/Services/HashidService.php

@@ -2,11 +2,8 @@
 
 namespace App\Services;
 
-use Cache;
+class HashidService
-
+{
-class HashidService {
-
-	public const MIN_LIMIT = 15;
     public const CMAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
 
     public static function encode($id, $minLimit = true)
@@ -15,12 +12,6 @@ class HashidService {
             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 = '';
@@ -28,28 +19,21 @@ class HashidService {
             $id = ($id - ($r = $id % $base)) / $base;
             $shortcode = $cmap[$r].$shortcode;
         }
+
         return $shortcode;
-		});
     }
 
-	public static function decode($short)
+    public static function decode($short = false)
     {
-		$len = strlen($short);
+        if (! $short) {
-		if($len < 3 || $len > 11) {
+            return;
-			return null;
         }
         $id = 0;
         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;
     }
-
 }

app/Util/Site/Config.php

@@ -32,7 +32,7 @@ class Config
                 'uploader' => [
                     'max_photo_size' => (int) config('pixelfed.max_photo_size'),
                     'max_caption_length' => (int) config_cache('pixelfed.max_caption_length'),
-                    'max_altext_length' => (int) config('pixelfed.max_altext_length', 150),
+                    'max_altext_length' => (int) config_cache('pixelfed.max_altext_length', 150),
                     'album_limit' => (int) config_cache('pixelfed.max_album_length'),
                     'image_quality' => (int) config_cache('pixelfed.image_quality'),
 
@@ -102,6 +102,12 @@ class Config
         });
     }
 
+    public static function refresh()
+    {
+        Cache::forget(self::CACHE_KEY);
+        return self::get();
+    }
+
     public static function json()
     {
         return json_encode(self::get(), JSON_FORCE_OBJECT);