Merge pull request #1357 from pixelfed/frontend-ui-refactor

Update AccountTransformer, cache status count

app/Http/Controllers/InternalApiController.php

@@ -347,6 +347,7 @@ class InternalApiController extends Controller
 
         NewStatusPipeline::dispatch($status);
         Cache::forget('user:account:id:'.$profile->user_id);
+        Cache::forget('profile:status_count:'.$profile->id);
         return $status->url();
     }
 }

app/Http/Controllers/StatusController.php

@@ -196,7 +196,8 @@ class StatusController extends Controller
         }
         $status->type = (new self)::mimeTypeCheck($mimes);
         $status->save();
-
+        
+        Cache::forget('profile:status_count:'.$profile->id);
         NewStatusPipeline::dispatch($status);
 
         // TODO: Send to subscribers
@@ -215,6 +216,7 @@ class StatusController extends Controller
         $status = Status::findOrFail($request->input('item'));
 
         if ($status->profile_id === Auth::user()->profile->id || Auth::user()->is_admin == true) {
+            Cache::forget('profile:status_count:'.$status->profile_id);
             StatusDelete::dispatch($status);
         }
         if($request->wantsJson()) {

app/Profile.php

@@ -125,7 +125,7 @@ class Profile extends Model
 
     public function avatarUrl()
     {
-        $url = Cache::remember("avatar:{$this->id}", now()->addYears(1), function () {
+        $url = Cache::remember('avatar:'.$this->id, now()->addYears(1), function () {
             $avatar = $this->avatar;
             $path = $avatar->media_path;
             $version = hash('sha256', $avatar->change_count);
@@ -139,36 +139,20 @@ class Profile extends Model
 
     public function statusCount()
     {
-        return $this->statuses()
+        return Cache::remember('profile:status_count:'.$this->id, now()->addMonths(1), function() {
-        ->getQuery()
+            return $this->statuses()
-        ->whereHas('media')
+                ->getQuery()
-        ->whereNull('in_reply_to_id')
+                ->whereHas('media')
-        ->whereNull('reblog_of_id')
+                ->whereNull('in_reply_to_id')
-        ->count();
+                ->whereNull('reblog_of_id')
+                ->count();
+        });
     }
 
+    // deprecated
     public function recommendFollowers()
     {
-        $follows = $this->following()->pluck('followers.id');
+        return collect([]);
-        $following = $this->following()
-            ->orderByRaw('rand()')
-            ->take(3)
-            ->pluck('following_id');
-        $following->push(Auth::id());
-        $following = Follower::whereNotIn('profile_id', $follows)
-            ->whereNotIn('following_id', $following)
-            ->whereNotIn('following_id', $follows)
-            ->whereIn('profile_id', $following)
-            ->orderByRaw('rand()')
-            ->distinct('id')
-            ->limit(3)
-            ->pluck('following_id');
-        $recommended = [];
-        foreach ($following as $follow) {
-            $recommended[] = self::findOrFail($follow);
-        }
-
-        return $recommended;
     }
 
     public function keyId()

app/Transformer/Api/AccountTransformer.php

@@ -19,7 +19,7 @@ class AccountTransformer extends Fractal\TransformerAbstract
 			'created_at' => null,
 			'followers_count' => $profile->followerCount(),
 			'following_count' => $profile->followingCount(),
-			'statuses_count' => $profile->statusCount(),
+			'statuses_count' => (int) $profile->statusCount(),
 			'note' => $profile->bio,
 			'url' => $profile->url(),
 			'avatar' => $profile->avatarUrl(),
@@ -30,7 +30,7 @@ class AccountTransformer extends Fractal\TransformerAbstract
 			'moved' => null,
 			'fields' => null,
 			'bot' => null,
-			'website' => $profile->website,
+			'website' => null,
 			'software' => 'pixelfed',
 			'is_admin' => (bool) $is_admin
 		];