From: Michael Date: Fri, 22 Sep 2023 05:16:46 +0000 (+0000) Subject: Add author to the search content / fix sidebar link to channels X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c66e841c38db202c6879fc1d9a267ae1c7ce9d10;p=friendica.git Add author to the search content / fix sidebar link to channels --- diff --git a/src/Model/Post/Engagement.php b/src/Model/Post/Engagement.php index 3df364b907..3aec0c1e12 100644 --- a/src/Model/Post/Engagement.php +++ b/src/Model/Post/Engagement.php @@ -53,7 +53,9 @@ class Engagement return; } - $parent = Post::selectFirst(['uri-id', 'created', 'owner-id', 'uid', 'private', 'contact-contact-type', 'language', 'title', 'content-warning', 'body'], ['uri-id' => $item['parent-uri-id']]); + $parent = Post::selectFirst(['uri-id', 'created', 'owner-id', 'uid', 'private', 'contact-contact-type', 'language', + 'title', 'content-warning', 'body', 'author-name', 'author-nick', 'author-addr', 'owner-name', 'owner-nick', 'owner-addr'], + ['uri-id' => $item['parent-uri-id']]); if ($parent['created'] < DateTimeFormat::utc('now - ' . DI::config()->get('channel', 'engagement_hours') . ' hour')) { Logger::debug('Post is too old', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'created' => $parent['created']]); @@ -108,7 +110,10 @@ class Engagement private static function getSearchText(array $item): string { - $body = $item['title'] . "\n" . $item['content-warning'] . "\n" . $item['body'] . "\n"; + $body = $item['title'] . ' ' . $item['content-warning'] . ' ' . $item['body'] . ' ' . + $item['author-name'] . ' ' . $item['author-nick'] . ' ' . $item['author-addr'] . ' ' . + $item['owner-name'] . ' ' . $item['owner-nick'] . ' ' . $item['owner-addr']; + $body = Post\Media::addAttachmentsToBody($item['uri-id'], $body); $text = BBCode::toPlaintext($body, false); diff --git a/src/Module/BaseSettings.php b/src/Module/BaseSettings.php index 495c175bde..c1033e730c 100644 --- a/src/Module/BaseSettings.php +++ b/src/Module/BaseSettings.php @@ -124,7 +124,7 @@ class BaseSettings extends BaseModule $tabs[] = [ 'label' => $this->t('Channels'), 'url' => 'settings/channels', - 'selected' => static::class == Settings\Display::class ? 'active' : '', + 'selected' => static::class == Settings\Channels::class ? 'active' : '', 'accesskey' => '', ];