eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[Posting] Fix bug with early DB::flush that would discard attachments relations

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro 2021-09-22 15:01:52 +01:00
parent 3f618c2674
commit c1e7d486a3
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/Posting/Posting.php
View File

@ -89,9 +89,12 @@ class Posting extends Component
]; ];
if (count($available_content_types) > 1) { if (count($available_content_types) > 1) {
$form_params[] = ['content_type', ChoiceType::class, $form_params[] = ['content_type', ChoiceType::class,
['label' => _m('Text format:'), 'multiple' => false, 'expanded' => false, [
'label' => _m('Text format:'), 'multiple' => false, 'expanded' => false,
'data' => $available_content_types[array_key_first($available_content_types)], 'data' => $available_content_types[array_key_first($available_content_types)],
'choices' => $available_content_types, ], ]; 'choices' => $available_content_types,
],
];
} }
$form_params[] = ['post_note', SubmitType::class, ['label' => _m('Post')]]; $form_params[] = ['post_note', SubmitType::class, ['label' => _m('Post')]];
$form = Form::create($form_params); $form = Form::create($form_params);
@ -150,16 +153,15 @@ class Posting extends Component
'Try to upload a smaller version.', ['quota' => $max_file_size, 'size' => $filesize])); 'Try to upload a smaller version.', ['quota' => $max_file_size, 'size' => $filesize]));
} }
Event::handle('EnforceUserFileQuota', [$filesize, $actor->getId()]); Event::handle('EnforceUserFileQuota', [$filesize, $actor->getId()]);
$processed_attachments[] = [GSFile::sanitizeAndStoreFileAsAttachment($f), $f->getClientOriginalName()]; $processed_attachments[] = [GSFile::storeFileAsAttachment($f), $f->getClientOriginalName()];
} }
DB::persist($note); DB::persist($note);
// Need file and note ids for the next step // Need file and note ids for the next step
Event::handle('ProcessNoteContent', [$note, $content, $content_type]); Event::handle('ProcessNoteContent', [$note, $content, $content_type]);
DB::flush();
if ($processed_attachments != []) { if ($processed_attachments !== []) {
foreach ($processed_attachments as [$a, $fname]) { foreach ($processed_attachments as [$a, $fname]) {
if (DB::count('actor_to_attachment', $args = ['attachment_id' => $a->getId(), 'actor_id' => $actor->getId()]) === 0) { if (DB::count('actor_to_attachment', $args = ['attachment_id' => $a->getId(), 'actor_id' => $actor->getId()]) === 0) {
DB::persist(ActorToAttachment::create($args)); DB::persist(ActorToAttachment::create($args));
@ -167,6 +169,8 @@ class Posting extends Component
DB::persist(AttachmentToNote::create(['attachment_id' => $a->getId(), 'note_id' => $note->getId(), 'title' => $fname])); DB::persist(AttachmentToNote::create(['attachment_id' => $a->getId(), 'note_id' => $note->getId(), 'title' => $fname]));
} }
} }
DB::flush();
} }
public function onRenderNoteContent(string $content, string $content_type, ?string &$rendered, Actor $author, ?Note $reply_to = null) public function onRenderNoteContent(string $content, string $content_type, ?string &$rendered, Actor $author, ?Note $reply_to = null)