kopia lustrzana https://github.com/pixelfed/pixelfed
				
				
				
			Update ProfileController and partial, fix status count
							rodzic
							
								
									c636aae3b7
								
							
						
					
					
						commit
						f746299711
					
				|  | @ -18,7 +18,12 @@ class ProfileController extends Controller | |||
|     public function show(Request $request, $username) | ||||
|     { | ||||
|       $user = Profile::whereUsername($username)->firstOrFail(); | ||||
|       $settings = User::whereUsername($username)->firstOrFail()->settings; | ||||
|       if($user->remote_url) { | ||||
|         $settings = new \StdClass; | ||||
|         $settings->crawlable = false; | ||||
|       } else { | ||||
|         $settings = User::whereUsername($username)->firstOrFail()->settings; | ||||
|       } | ||||
| 
 | ||||
|       if($request->wantsJson() && config('pixelfed.activitypub_enabled')) { | ||||
|         return $this->showActivityPub($request, $user); | ||||
|  | @ -37,6 +42,7 @@ class ProfileController extends Controller | |||
|       $timeline = $user->statuses() | ||||
|                   ->whereHas('media') | ||||
|                   ->whereNull('in_reply_to_id') | ||||
|                   ->whereNull('reblog_of_id') | ||||
|                   ->orderBy('created_at','desc') | ||||
|                   ->withCount(['comments', 'likes']) | ||||
|                   ->simplePaginate(21); | ||||
|  |  | |||
|  | @ -53,7 +53,7 @@ | |||
|           <div class="profile-stats pb-3 d-inline-flex lead"> | ||||
|             <div class="font-weight-light pr-5"> | ||||
|               <a class="text-dark" href="{{$user->url()}}"> | ||||
|               <span class="font-weight-bold">{{$user->statuses()->whereNull('in_reply_to_id')->count()}}</span>  | ||||
|               <span class="font-weight-bold">{{$user->statuses()->whereNull('reblog_of_id')->whereNull('in_reply_to_id')->count()}}</span>  | ||||
|               Posts | ||||
|               </a> | ||||
|             </div> | ||||
|  |  | |||
		Ładowanie…
	
		Reference in New Issue
	
	 Daniel Supernault
						Daniel Supernault