wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ATTACHMENTS][Embed][UI] Allow plugins to provide a title for an attachment, if a note has none, implement such a mechanism in Embed and cache the result, since it is potentially costly

Browse Source
This commit is contained in:
Hugo Sales 2021-09-15 16:49:29 +01:00 committed by Diogo Peralta Cordeiro
parent 15a2a69274
commit f344ed376c
No known key found for this signature in database
GPG Key ID: 18D2D35001FBFAB0
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/Embed/Embed.php
View File

@ -485,6 +485,17 @@ class Embed extends Plugin
return HTTPClient::get($url)->getContent(); return HTTPClient::get($url)->getContent();
} }
public function onAttachmentGetBestTitle(Attachment $attachment, Note $note, ?string &$title)
{
try {
$embed = DB::findOneBy('attachment_embed', ['attachment_id' => $attachment->getId()]);
$title = $embed->getTitle();
return Event::stop;
} catch (NotFoundException) {
}
return Event::next;
}
/** /**
* Event raised when GNU social polls the plugin for information about it. * Event raised when GNU social polls the plugin for information about it.
* Adds this plugin's version information to $versions array * Adds this plugin's version information to $versions array

26
src/Entity/Attachment.php
View File

@ -21,8 +21,10 @@
namespace App\Entity; namespace App\Entity;
use App\Core\Cache;
use App\Core\DB\DB; use App\Core\DB\DB;
use App\Core\Entity; use App\Core\Entity;
use App\Core\Event;
use App\Core\GSFile; use App\Core\GSFile;
use function App\Core\I18n\_m; use function App\Core\I18n\_m;
use App\Core\Log; use App\Core\Log;
@ -294,12 +296,24 @@ class Attachment extends Entity
{ {
// If we have a note, then the best title is the title itself // If we have a note, then the best title is the title itself
if (!is_null(($note))) { if (!is_null(($note))) {
$attachment_to_note = DB::findOneBy('attachment_to_note', [ $title = Cache::get('attachment-title-' . $this->getId() . '-' . $note->getId(), function () use ($note) {
'attachment_id' => $this->getId(), try {
'note_id' => $note->getId(), $attachment_to_note = DB::findOneBy('attachment_to_note', [
]); 'attachment_id' => $this->getId(),
if (!is_null($attachment_to_note->getTitle())) { 'note_id' => $note->getId(),
return $attachment_to_note->getTitle(); ]);
if (!is_null($attachment_to_note->getTitle())) {
return $attachment_to_note->getTitle();
}
} catch (NotFoundException) {
$title = null;
Event::handle('AttachmentGetBestTitle', [$this, $note, &$title]);
return $title;
}
return null;
});
if ($title != null) {
return $title;
} }
} }
// Else // Else