Merge pull request #1887 from pixelfed/staging

Update Redis namespace

app/Console/Commands/Installer.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use Redis;
+use Illuminate\Support\Facades\Redis;
 
 class Installer extends Command
 {

app/Http/Controllers/AccountController.php

@@ -5,7 +5,7 @@ namespace App\Http\Controllers;
 use Auth; 
 use Cache; 
 use Mail; 
-use Redis;
+use Illuminate\Support\Facades\Redis;
 use Carbon\Carbon;
 use App\Mail\ConfirmEmail;
 use Illuminate\Http\Request;
@@ -264,7 +264,6 @@ class AccountController extends Controller
 
 		$pid = $user->id;
 		Cache::forget("user:filter:list:$pid");
-		Cache::forget("feature:discover:posts:$pid");
 		Cache::forget("api:local:exp:rec:$pid");
 
 		return redirect()->back();

app/Http/Controllers/ApiController.php

@@ -10,7 +10,8 @@ use App\{
     Profile,
     UserFilter
 };
-use Auth, Cache, Redis;
+use Auth, Cache;
+use Illuminate\Support\Facades\Redis;
 use App\Util\Site\Config;
 use Illuminate\Http\Request;
 use App\Services\SuggestionService;

app/Http/Controllers/Settings/LabsSettings.php

@@ -3,7 +3,8 @@
 namespace App\Http\Controllers\Settings;
 
 use Illuminate\Http\Request;
-use Cookie, Redis;
+use Cookie;
+use Illuminate\Support\Facades\Redis;
 use App\Services\SuggestionService;
 
 trait LabsSettings {

app/Jobs/CommentPipeline/CommentPipeline.php

@@ -8,7 +8,8 @@ use App\{
     UserFilter
 };
 use App\Services\NotificationService;
-use DB, Cache, Log, Redis;
+use DB, Cache, Log;
+use Illuminate\Support\Facades\Redis;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -57,6 +58,7 @@ class CommentPipeline implements ShouldQueue
         if ($actor->id === $target->id || $status->comments_disabled == true) {
             return true;
         }
+        
         $filtered = UserFilter::whereUserId($target->id)
             ->whereFilterableType('App\Profile')
             ->whereIn('filter_type', ['mute', 'block'])

app/Jobs/FollowPipeline/FollowActivityPubDeliver.php

@@ -8,7 +8,8 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-use Cache, Log, Redis;
+use Cache, Log;
+use Illuminate\Support\Facades\Redis;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
 use App\FollowRequest;

app/Jobs/FollowPipeline/FollowPipeline.php

@@ -10,7 +10,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Log;
-use Redis;
+use Illuminate\Support\Facades\Redis;
 
 class FollowPipeline implements ShouldQueue
 {

app/Jobs/LikePipeline/LikePipeline.php

@@ -2,7 +2,8 @@
 
 namespace App\Jobs\LikePipeline;
 
-use Cache, Log, Redis;
+use Cache, Log;
+use Illuminate\Support\Facades\Redis;
 use App\{Like, Notification};
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

app/Jobs/SharePipeline/SharePipeline.php

@@ -2,7 +2,8 @@
 
 namespace App\Jobs\SharePipeline;
 
-use Cache, Log, Redis;
+use Cache, Log;
+use Illuminate\Support\Facades\Redis;
 use App\{Status, Notification};
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

app/Jobs/StatusPipeline/NewStatusPipeline.php

@@ -9,7 +9,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Redis;
+use Illuminate\Support\Facades\Redis;
 
 class NewStatusPipeline implements ShouldQueue
 {

app/Services/FollowerService.php

@@ -2,7 +2,7 @@
 
 namespace App\Services;
 
-use Redis;
+use Illuminate\Support\Facades\Redis;
 
 use App\{
 	Follower,

app/Services/NotificationService.php

@@ -2,7 +2,8 @@
 
 namespace App\Services;
 
-use Cache, Redis;
+use Cache;
+use Illuminate\Support\Facades\Redis;
 use App\{
 	Notification,
 	Profile

app/Services/ProfileService.php

@@ -2,7 +2,8 @@
 
 namespace App\Services;
 
-use Cache, Redis;
+use Cache;
+use Illuminate\Support\Facades\Redis;
 
 use App\{
 	Follower,

app/Services/PublicTimelineService.php

@@ -2,7 +2,7 @@
 
 namespace App\Services;
 
-use Redis;
+use Illuminate\Support\Facades\Redis;
 use App\{
 	Profile,
 	Status,

app/Services/StatusHashtagService.php

@@ -2,7 +2,8 @@
 
 namespace App\Services;
 
-use Cache, Redis;
+use Cache;
+use Illuminate\Support\Facades\Redis;
 use App\{Status, StatusHashtag};
 use App\Transformer\Api\StatusHashtagTransformer;
 use League\Fractal;

app/Services/SuggestionService.php

@@ -2,7 +2,7 @@
 
 namespace App\Services;
 
-use Redis;
+use Illuminate\Support\Facades\Redis;
 use App\Profile;
 
 class SuggestionService {

app/Services/UserFilterService.php

@@ -2,7 +2,8 @@
 
 namespace App\Services;
 
-use Cache, Redis;
+use Cache;
+use Illuminate\Support\Facades\Redis;
 
 use App\{
 	Follower,

app/Util/Lexer/RestrictedNames.php

@@ -95,6 +95,8 @@ class RestrictedNames
      'a',
      'app',
      'about',
+     'aboutus',
+     'about-us',
      'abuse',
      'account',
      'admins',