Update ComposeController, fix tag mention bug. Closes #5885

pull/5928/head
Daniel Supernault 2 months ago
parent 1356757715
commit 5f5ed1e62d
No known key found for this signature in database
GPG Key ID: 23740873EE6F76A1

@ -30,7 +30,6 @@ use App\Util\Media\License;
use Auth; use Auth;
use Cache; use Cache;
use DB; use DB;
use Purify;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use League\Fractal; use League\Fractal;
@ -240,7 +239,13 @@ class ComposeController extends Controller
abort_if(! $request->user(), 403); abort_if(! $request->user(), 403);
$this->validate($request, [ $this->validate($request, [
'q' => 'required|string|min:1|max:50', 'q' => [
'required',
'string',
'min:1',
'max:300',
new \App\Rules\WebFinger,
],
]); ]);
$q = $request->input('q'); $q = $request->input('q');
@ -571,7 +576,7 @@ class ComposeController extends Controller
$status->cw_summary = $request->input('spoiler_text'); $status->cw_summary = $request->input('spoiler_text');
} }
$defaultCaption = ""; $defaultCaption = '';
$status->caption = strip_tags($request->input('caption')) ?? $defaultCaption; $status->caption = strip_tags($request->input('caption')) ?? $defaultCaption;
$status->rendered = $defaultCaption; $status->rendered = $defaultCaption;
$status->scope = 'draft'; $status->scope = 'draft';
@ -677,7 +682,7 @@ class ComposeController extends Controller
$place = $request->input('place'); $place = $request->input('place');
$cw = $request->input('cw'); $cw = $request->input('cw');
$tagged = $request->input('tagged'); $tagged = $request->input('tagged');
$defaultCaption = config_cache('database.default') === 'mysql' ? null : ""; $defaultCaption = config_cache('database.default') === 'mysql' ? null : '';
if ($place && is_array($place)) { if ($place && is_array($place)) {
$status->place_id = $place['id']; $status->place_id = $place['id'];

Loading…
Cancel
Save