浏览代码

Update ProfileController

Daniel Supernault 3 年之前
父节点
当前提交
1c59933c0a
共有 2 个文件被更改,包括 7 次插入6 次删除
  1. 1 1
      app/Http/Controllers/PollController.php
  2. 6 5
      app/Http/Controllers/ProfileController.php

+ 1 - 1
app/Http/Controllers/PollController.php

@@ -14,7 +14,7 @@ class PollController extends Controller
 
 	public function __construct()
 	{
-		abort_if(!config_cache('exp.polls'), 404);
+		abort_if(!config_cache('instance.polls.enabled'), 404);
 	}
 
 	public function getPoll(Request $request, $id)

+ 6 - 5
app/Http/Controllers/ProfileController.php

@@ -13,6 +13,7 @@ use App\Story;
 use App\User;
 use App\UserFilter;
 use League\Fractal;
+use App\Services\FollowerService;
 use App\Util\Lexer\Nickname;
 use App\Util\Webfinger\Webfinger;
 use App\Transformer\ActivityPub\ProfileOutbox;
@@ -238,12 +239,12 @@ class ProfileController extends Controller
 		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
 		$profile = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
 		$pid = $profile->id;
-		$authed = Auth::user()->profile;
-		abort_if($pid != $authed->id && $profile->followedBy($authed) == false, 404);
+		$authed = Auth::user()->profile_id;
+		abort_if($pid != $authed && !FollowerService::follows($authed, $pid), 404);
 		$exists = Story::whereProfileId($pid)
-			->where('expires_at', '>', now())
-			->count();
-		abort_unless($exists > 0, 404);
+			->whereActive(true)
+			->exists();
+		abort_unless($exists, 404);
 		return view('profile.story', compact('pid', 'profile'));
 	}
 }