From c369882b4824e7750f77b8f266fb2b7b4f9dccce Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 10 Dec 2019 23:04:03 -0700 Subject: [PATCH] Update Redis namespace --- app/Console/Commands/Installer.php | 2 +- app/Http/Controllers/AccountController.php | 3 +-- app/Http/Controllers/ApiController.php | 3 ++- app/Http/Controllers/Settings/LabsSettings.php | 3 ++- app/Jobs/CommentPipeline/CommentPipeline.php | 4 +++- app/Jobs/FollowPipeline/FollowActivityPubDeliver.php | 3 ++- app/Jobs/FollowPipeline/FollowPipeline.php | 2 +- app/Jobs/LikePipeline/LikePipeline.php | 3 ++- app/Jobs/SharePipeline/SharePipeline.php | 3 ++- app/Jobs/StatusPipeline/NewStatusPipeline.php | 2 +- app/Services/FollowerService.php | 2 +- app/Services/NotificationService.php | 3 ++- app/Services/ProfileService.php | 3 ++- app/Services/PublicTimelineService.php | 2 +- app/Services/StatusHashtagService.php | 3 ++- app/Services/SuggestionService.php | 2 +- app/Services/UserFilterService.php | 3 ++- app/Util/Lexer/RestrictedNames.php | 2 ++ 18 files changed, 30 insertions(+), 18 deletions(-) diff --git a/app/Console/Commands/Installer.php b/app/Console/Commands/Installer.php index aea9d5e4e..35d4a6573 100644 --- a/app/Console/Commands/Installer.php +++ b/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 { diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index d84f8ff77..57301a8b1 100644 --- a/app/Http/Controllers/AccountController.php +++ b/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(); diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 38e888644..0e8313f1e 100644 --- a/app/Http/Controllers/ApiController.php +++ b/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; diff --git a/app/Http/Controllers/Settings/LabsSettings.php b/app/Http/Controllers/Settings/LabsSettings.php index 20e2106df..b18045dcb 100644 --- a/app/Http/Controllers/Settings/LabsSettings.php +++ b/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 { diff --git a/app/Jobs/CommentPipeline/CommentPipeline.php b/app/Jobs/CommentPipeline/CommentPipeline.php index b028bdae7..b1cd5df38 100644 --- a/app/Jobs/CommentPipeline/CommentPipeline.php +++ b/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']) diff --git a/app/Jobs/FollowPipeline/FollowActivityPubDeliver.php b/app/Jobs/FollowPipeline/FollowActivityPubDeliver.php index 42006b27c..cd8d9353a 100644 --- a/app/Jobs/FollowPipeline/FollowActivityPubDeliver.php +++ b/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; diff --git a/app/Jobs/FollowPipeline/FollowPipeline.php b/app/Jobs/FollowPipeline/FollowPipeline.php index 57ed1d2e4..0441531c3 100644 --- a/app/Jobs/FollowPipeline/FollowPipeline.php +++ b/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 { diff --git a/app/Jobs/LikePipeline/LikePipeline.php b/app/Jobs/LikePipeline/LikePipeline.php index 896827917..593b4c4bc 100644 --- a/app/Jobs/LikePipeline/LikePipeline.php +++ b/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; diff --git a/app/Jobs/SharePipeline/SharePipeline.php b/app/Jobs/SharePipeline/SharePipeline.php index c7328db38..f5669009f 100644 --- a/app/Jobs/SharePipeline/SharePipeline.php +++ b/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; diff --git a/app/Jobs/StatusPipeline/NewStatusPipeline.php b/app/Jobs/StatusPipeline/NewStatusPipeline.php index 0b392639b..e2f2a4c69 100644 --- a/app/Jobs/StatusPipeline/NewStatusPipeline.php +++ b/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 { diff --git a/app/Services/FollowerService.php b/app/Services/FollowerService.php index 3a7120ef5..e5dba73fc 100644 --- a/app/Services/FollowerService.php +++ b/app/Services/FollowerService.php @@ -2,7 +2,7 @@ namespace App\Services; -use Redis; +use Illuminate\Support\Facades\Redis; use App\{ Follower, diff --git a/app/Services/NotificationService.php b/app/Services/NotificationService.php index cfe61cdad..bbf7a34f3 100644 --- a/app/Services/NotificationService.php +++ b/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 diff --git a/app/Services/ProfileService.php b/app/Services/ProfileService.php index 1ef93febb..4d07dad34 100644 --- a/app/Services/ProfileService.php +++ b/app/Services/ProfileService.php @@ -2,7 +2,8 @@ namespace App\Services; -use Cache, Redis; +use Cache; +use Illuminate\Support\Facades\Redis; use App\{ Follower, diff --git a/app/Services/PublicTimelineService.php b/app/Services/PublicTimelineService.php index 49d0eb598..56990c9af 100644 --- a/app/Services/PublicTimelineService.php +++ b/app/Services/PublicTimelineService.php @@ -2,7 +2,7 @@ namespace App\Services; -use Redis; +use Illuminate\Support\Facades\Redis; use App\{ Profile, Status, diff --git a/app/Services/StatusHashtagService.php b/app/Services/StatusHashtagService.php index ef8c80a83..29d1488e2 100644 --- a/app/Services/StatusHashtagService.php +++ b/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; diff --git a/app/Services/SuggestionService.php b/app/Services/SuggestionService.php index d34ac17a4..57fabc388 100644 --- a/app/Services/SuggestionService.php +++ b/app/Services/SuggestionService.php @@ -2,7 +2,7 @@ namespace App\Services; -use Redis; +use Illuminate\Support\Facades\Redis; use App\Profile; class SuggestionService { diff --git a/app/Services/UserFilterService.php b/app/Services/UserFilterService.php index e365fe8b2..d449435bf 100644 --- a/app/Services/UserFilterService.php +++ b/app/Services/UserFilterService.php @@ -2,7 +2,8 @@ namespace App\Services; -use Cache, Redis; +use Cache; +use Illuminate\Support\Facades\Redis; use App\{ Follower, diff --git a/app/Util/Lexer/RestrictedNames.php b/app/Util/Lexer/RestrictedNames.php index 97dd29fb7..7aa2fd8ee 100644 --- a/app/Util/Lexer/RestrictedNames.php +++ b/app/Util/Lexer/RestrictedNames.php @@ -95,6 +95,8 @@ class RestrictedNames 'a', 'app', 'about', + 'aboutus', + 'about-us', 'abuse', 'account', 'admins',