Browse Source

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

Frontend ui refactor
daniel 6 years ago
parent
commit
dbfbed5cea

+ 2 - 4
app/Http/Controllers/CommentController.php

@@ -43,8 +43,8 @@ class CommentController extends Controller
             abort(403);
         }
         $this->validate($request, [
-            'item'    => 'required|integer',
-            'comment' => 'required|string|max:500',
+            'item'    => 'required|integer|min:1',
+            'comment' => 'required|string|max:'.(int) config('pixelfed.max_caption_length'),
         ]);
         $comment = $request->input('comment');
         $statusId = $request->item;
@@ -57,8 +57,6 @@ class CommentController extends Controller
             return;
         }
 
-        Cache::forget('transform:status:'.$status->url());
-
         $reply = DB::transaction(function() use($comment, $status, $profile) {
             $autolink = Autolink::create()->autolink($comment);
             $reply = new Status();

+ 1 - 5
app/Http/Controllers/LikeController.php

@@ -20,14 +20,12 @@ class LikeController extends Controller
     public function store(Request $request)
     {
         $this->validate($request, [
-        'item'    => 'required|integer',
+        'item'    => 'required|integer|min:1',
       ]);
 
         $profile = Auth::user()->profile;
         $status = Status::withCount('likes')->findOrFail($request->input('item'));
 
-        Cache::forget('transform:status:'.$status->url());
-
         $count = $status->likes_count;
 
         if ($status->likes()->whereProfileId($profile->id)->count() !== 0) {
@@ -48,8 +46,6 @@ class LikeController extends Controller
                ->take(1000)
                ->pluck('status_id');
 
-        Cache::put('api:like-ids:user:'.$profile->id, $likes, now()->addMinutes(1440));
-
         if ($request->ajax()) {
             $response = ['code' => 200, 'msg' => 'Like saved', 'count' => $count];
         } else {

+ 3 - 1
app/Http/Controllers/Settings/LabsSettings.php

@@ -53,7 +53,9 @@ trait LabsSettings {
 			if($profile->is_suggestable == false) {
 				$profile->is_suggestable = true;
 				$changes = true;
-				SuggestionService::set($profile->id);
+				if($profile->statuses->count() > 0) {
+					SuggestionService::set($profile->id);
+				}
 			} 
 		} else {
 			$profile->is_suggestable = false;

+ 1 - 3
app/Http/Controllers/StatusController.php

@@ -229,14 +229,12 @@ class StatusController extends Controller
         $this->authCheck();
         
         $this->validate($request, [
-          'item'    => 'required|integer',
+          'item'    => 'required|integer|min:1',
         ]);
 
         $profile = Auth::user()->profile;
         $status = Status::withCount('shares')->findOrFail($request->input('item'));
 
-        Cache::forget('transform:status:'.$status->url());
-
         $count = $status->shares_count;
 
         $exists = Status::whereProfileId(Auth::user()->profile->id)

+ 1 - 0
app/Services/SuggestionService.php

@@ -45,6 +45,7 @@ class SuggestionService {
 			$ids = Profile::whereNull('domain')
 				->whereIsSuggestable(true)
 				->whereIsPrivate(false)
+				->whereHas('statuses')
 				->pluck('id');
 			foreach($ids as $id) {
 				self::set($id);