Update PrivacySettings, add domainBlocks

app/Http/Controllers/Settings/PrivacySettings.php

@@ -14,6 +14,7 @@ use App\Util\Lexer\PrettyNumber;
 use App\Util\ActivityPub\Helpers;
 use Auth, Cache, DB;
 use Illuminate\Http\Request;
+use App\Models\UserDomainBlock;
 
 trait PrivacySettings
 {
@@ -149,47 +150,25 @@ trait PrivacySettings
 
     public function blockedInstances()
     {
-        $pid = Auth::user()->profile->id;
+        // deprecated
-        $filters = UserFilter::whereUserId($pid)
+        abort(404);
-            ->whereFilterableType('App\Instance')
-            ->whereFilterType('block')
-            ->orderByDesc('id')
-            ->paginate(10);
-        return view('settings.privacy.blocked-instances', compact('filters'));
     }
 
-    public function blockedInstanceStore(Request $request)
+    public function domainBlocks()
     {
-        $this->validate($request, [
+        return view('settings.privacy.domain-blocks');
-            'domain' => 'required|url|min:1|max:120'
-        ]);
-        $domain = $request->input('domain');
-        if(Helpers::validateUrl($domain) == false) {
-            return abort(400, 'Invalid domain');
     }
-        $domain = parse_url($domain, PHP_URL_HOST);
+
-        $instance = Instance::firstOrCreate(['domain' => $domain]);
+    public function blockedInstanceStore(Request $request)
-        $filter = new UserFilter;
+    {
-        $filter->user_id = Auth::user()->profile->id;
+        // deprecated
-        $filter->filterable_id = $instance->id;
+        abort(404);
-        $filter->filterable_type = 'App\Instance';
-        $filter->filter_type = 'block';
-        $filter->save();
-        return response()->json(['msg' => 200]);
     }
 
     public function blockedInstanceUnblock(Request $request)
     {
-        $this->validate($request, [
+        // deprecated
-            'id'    => 'required|integer|min:1'
+        abort(404);
-        ]);
-        $pid = Auth::user()->profile->id;
-
-        $filter = UserFilter::whereFilterableType('App\Instance')
-            ->whereUserId($pid)
-            ->findOrFail($request->input('id'));
-        $filter->delete();
-        return redirect(route('settings.privacy.blocked-instances'));
     }
 
     public function blockedKeywords()