mirror of
https://github.com/pixelfed/pixelfed.git
synced 2025-01-31 00:40:47 +00:00
Update StatusController
This commit is contained in:
parent
451a65cc5b
commit
2d519e0aa2
1 changed files with 121 additions and 67 deletions
|
@ -20,7 +20,17 @@ class StatusController extends Controller
|
||||||
if(!$status->media_path && $status->in_reply_to_id) {
|
if(!$status->media_path && $status->in_reply_to_id) {
|
||||||
return redirect($status->url());
|
return redirect($status->url());
|
||||||
}
|
}
|
||||||
return view('status.show', compact('user', 'status'));
|
$replies = Status::whereInReplyToId($status->id)->simplePaginate(30);
|
||||||
|
return view('status.show', compact('user', 'status', 'replies'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function compose()
|
||||||
|
{
|
||||||
|
if(Auth::check() == false)
|
||||||
|
{
|
||||||
|
abort(403);
|
||||||
|
}
|
||||||
|
return view('status.compose');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function store(Request $request)
|
public function store(Request $request)
|
||||||
|
@ -32,6 +42,12 @@ class StatusController extends Controller
|
||||||
|
|
||||||
$user = Auth::user();
|
$user = Auth::user();
|
||||||
|
|
||||||
|
$size = Media::whereUserId($user->id)->sum('size') / 1000;
|
||||||
|
$limit = (int) config('pixelfed.max_account_size');
|
||||||
|
if($size >= $limit) {
|
||||||
|
return redirect()->back()->with('error', 'You have exceeded your storage limit. Please click <a href="#">here</a> for more info.');
|
||||||
|
}
|
||||||
|
|
||||||
$this->validate($request, [
|
$this->validate($request, [
|
||||||
'photo.*' => 'required|mimes:jpeg,png,bmp,gif|max:' . config('pixelfed.max_photo_size'),
|
'photo.*' => 'required|mimes:jpeg,png,bmp,gif|max:' . config('pixelfed.max_photo_size'),
|
||||||
'caption' => 'string|max:' . config('pixelfed.max_caption_length'),
|
'caption' => 'string|max:' . config('pixelfed.max_caption_length'),
|
||||||
|
@ -43,7 +59,6 @@ class StatusController extends Controller
|
||||||
if(count($request->file('photo')) > config('pixelfed.max_album_length')) {
|
if(count($request->file('photo')) > config('pixelfed.max_album_length')) {
|
||||||
return redirect()->back()->with('error', 'Too many files, max limit per post: ' . config('pixelfed.max_album_length'));
|
return redirect()->back()->with('error', 'Too many files, max limit per post: ' . config('pixelfed.max_album_length'));
|
||||||
}
|
}
|
||||||
|
|
||||||
$cw = $request->filled('cw') && $request->cw == 'on' ? true : false;
|
$cw = $request->filled('cw') && $request->cw == 'on' ? true : false;
|
||||||
$monthHash = hash('sha1', date('Y') . date('m'));
|
$monthHash = hash('sha1', date('Y') . date('m'));
|
||||||
$userHash = hash('sha1', $user->id . (string) $user->created_at);
|
$userHash = hash('sha1', $user->id . (string) $user->created_at);
|
||||||
|
@ -102,4 +117,43 @@ class StatusController extends Controller
|
||||||
|
|
||||||
return redirect(Auth::user()->url());
|
return redirect(Auth::user()->url());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function storeShare(Request $request)
|
||||||
|
{
|
||||||
|
$this->validate($request, [
|
||||||
|
'item' => 'required|integer',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$profile = Auth::user()->profile;
|
||||||
|
$status = Status::withCount('shares')->findOrFail($request->input('item'));
|
||||||
|
|
||||||
|
$count = $status->shares_count;
|
||||||
|
|
||||||
|
$exists = Status::whereProfileId(Auth::user()->profile->id)
|
||||||
|
->whereReblogOfId($status->id)
|
||||||
|
->count();
|
||||||
|
if($exists !== 0) {
|
||||||
|
$shares = Status::whereProfileId(Auth::user()->profile->id)
|
||||||
|
->whereReblogOfId($status->id)
|
||||||
|
->get();
|
||||||
|
foreach($shares as $share) {
|
||||||
|
$share->delete();
|
||||||
|
$count--;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$share = new Status;
|
||||||
|
$share->profile_id = $profile->id;
|
||||||
|
$share->reblog_of_id = $status->id;
|
||||||
|
$share->save();
|
||||||
|
$count++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if($request->ajax()) {
|
||||||
|
$response = ['code' => 200, 'msg' => 'Share saved', 'count' => $count];
|
||||||
|
} else {
|
||||||
|
$response = redirect($status->url());
|
||||||
|
}
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue