Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 14:24:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

"media" is added to the search text

Browse source
This commit is contained in:
Michael 2024-02-02 10:46:20 +00:00
parent 7faa42882b
commit fc05daefb5
2 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/Model/Post/Engagement.php
View file

@ -39,10 +39,12 @@ use Friendica\Util\DateTimeFormat;
class Engagement
{
const KEYWORDS = ['source', 'server', 'from', 'to', 'group', 'application', 'tag', 'network', 'platform', 'visibility', 'language'];
const KEYWORDS = ['source', 'server', 'from', 'to', 'group', 'application', 'tag', 'network', 'platform', 'visibility', 'language', 'media'];
const SHORTCUTS = ['lang' => 'language', 'net' => 'network', 'relay' => 'application'];
const ALTERNATIVES = ['source:news' => 'source:service', 'source:relay' => 'source:application',
'network:activitypub' => 'network:apub', 'network:friendica' => 'network:dfrn', 'network:diaspora' => 'network:dspr', 'network:ostatus' => 'network:stat',
'media:picture' => 'media:image', 'media:photo' => 'media:image',
'network:activitypub' => 'network:apub', 'network:friendica' => 'network:dfrn',
'network:diaspora' => 'network:dspr', 'network:ostatus' => 'network:stat',
'network:discourse' => 'network:dscs', 'network:tumblr' => 'network:tmbl', 'network:bluesky' => 'network:bsky'];
/**
@ -93,7 +95,7 @@ class Engagement
$store = !empty($mediatype);
}
$searchtext = self::getSearchTextForItem($parent);
$searchtext = self::getSearchTextForItem($parent, $mediatype);
$language = !empty($parent['language']) ? (array_key_first(json_decode($parent['language'], true)) ?? L10n::UNDETERMINED_LANGUAGE) : L10n::UNDETERMINED_LANGUAGE;
if (!$store) {
$store = DI::userDefinedChannel()->match($searchtext, $language);
@ -172,7 +174,7 @@ class Engagement
}
}
return self::getSearchText($item, $receivers, $tags);
return self::getSearchText($item, $receivers, $tags, 0);
}
public static function getSearchTextForUriId(int $uri_id, bool $refresh = false): string
@ -190,17 +192,18 @@ class Engagement
if (empty($post['uri-id'])) {
return '';
}
return self::getSearchTextForItem($post);
$mediatype = self::getMediaType($uri_id);
return self::getSearchTextForItem($post, $mediatype);
}
private static function getSearchTextForItem(array $item): string
private static function getSearchTextForItem(array $item, int $mediatype): string
{
$receivers = array_column(Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION, Tag::AUDIENCE]), 'url');
$tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
return self::getSearchText($item, $receivers, $tags);
return self::getSearchText($item, $receivers, $tags, $mediatype);
}
private static function getSearchText(array $item, array $receivers, array $tags): string
private static function getSearchText(array $item, array $receivers, array $tags, int $mediatype): string
{
$body = '[nosmile]network_' . $item['network'];
@ -286,6 +289,18 @@ class Engagement
$body .= ' language_' . array_key_first($languages);
}
if ($mediatype & 1) {
$body .= ' media_image';
}
if ($mediatype & 2) {
$body .= ' media_video';
}
if ($mediatype & 4) {
$body .= ' media_audio';
}
$body .= ' ' . $item['title'] . ' ' . $item['content-warning'] . ' ' . $item['body'];
return BBCode::toSearchText($body, $item['uri-id']);