mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-10 08:44:49 +00:00
Merge pull request #1292 from pixelfed/frontend-ui-refactor
Frontend ui refactor
This commit is contained in:
commit
dbfbed5cea
5 changed files with 8 additions and 13 deletions
|
@ -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();
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue