fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update StatusController, use transactions for status views

Browse source
This commit is contained in:
Daniel Supernault 2021-05-31 23:54:20 -06:00
parent e3899d3684
commit 7cbd6bc36d
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/Http/Controllers/StatusController.php
View file

@ -14,7 +14,7 @@ use App\StatusView;
use App\Transformer\ActivityPub\StatusTransformer; use App\Transformer\ActivityPub\StatusTransformer;
use App\Transformer\ActivityPub\Verb\Note; use App\Transformer\ActivityPub\Verb\Note;
use App\User; use App\User;
use Auth, Cache; use Auth, DB, Cache;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use League\Fractal; use League\Fractal;
use App\Util\Media\Filter; use App\Util\Media\Filter;
@ -75,12 +75,6 @@ class StatusController extends Controller
} }
$template = $status->in_reply_to_id ? 'status.reply' : 'status.show'; $template = $status->in_reply_to_id ? 'status.reply' : 'status.show';
// $template = $status->type === 'video' &&
// $request->has('video_beta') &&
// $request->video_beta == 1 &&
// $request->user() ?
// 'status.show_video' : 'status.show';
return view($template, compact('user', 'status')); return view($template, compact('user', 'status'));
} }
@ -403,27 +397,25 @@ class StatusController extends Controller
public function storeView(Request $request) public function storeView(Request $request)
{ {
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
$this->validate($request, [
'_v' => 'required|array'
]);
$views = $request->input('_v'); $views = $request->input('_v');
$uid = $request->user()->profile_id; $uid = $request->user()->profile_id;
if(empty($views)) { if(empty($views) || !is_array($views)) {
return; return response()->json(0);
} }
foreach($views as $view) { foreach($views as $view) {
if(!isset($view['sid']) || !isset($view['pid'])) { if(!isset($view['sid']) || !isset($view['pid'])) {
continue; continue;
} }
DB::transaction(function () use($view, $uid) {
StatusView::firstOrCreate([ StatusView::firstOrCreate([
'status_id' => $view['sid'], 'status_id' => $view['sid'],
'status_profile_id' => $view['pid'], 'status_profile_id' => $view['pid'],
'profile_id' => $uid 'profile_id' => $uid
]); ]);
});
} }
return response()->json(1); return response()->json(1);