keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Issue 2657: Mentions will now be recognized by clients

Browse source
This commit is contained in:
Michael 2022-11-06 05:43:34 +00:00
parent b9f0985467
commit 56ac879c92
3 changed files with 19 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Content/Text/BBCode.php
View file

@ -1971,13 +1971,20 @@ class BBCode
$text = preg_replace("/([#])\[url\=(.*?)\](.*?)\[\/url\]/ism", $text = preg_replace("/([#])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<a href="$2" class="mention hashtag" rel="tag">$1<span>$3</span></a>', '<a href="$2" class="mention hashtag" rel="tag">$1<span>$3</span></a>',
$text); $text);
} elseif (in_array($simple_html, [self::INTERNAL, self::EXTERNAL, self::API])) { } elseif (in_array($simple_html, [self::INTERNAL, self::EXTERNAL])) {
$text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", $text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<bdi>$1<a href="$2" class="userinfo mention" title="$3">$3</a></bdi>', '<bdi>$1<a href="$2" class="userinfo mention" title="$3">$3</a></bdi>',
$text); $text);
$text = preg_replace("/([#])\[url\=(.*?)\](.*?)\[\/url\]/ism", $text = preg_replace("/([#])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<a class="mention hashtag status-link" href="$2" rel="tag">$1<span>$3</span></a>', '<a class="mention hashtag status-link" href="$2" rel="tag">$1<span>$3</span></a>',
$text); $text);
} elseif ($simple_html == self::API) {
$text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<a class="u-url mention status-link" href="$2" rel="nofollow noopener noreferrer" target="_blank" title="$3">$1<span>$3</span></a>',
$text);
$text = preg_replace("/([#])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<a class="mention hashtag status-link" href="$2" rel="tag">$1<span>$3</span></a>',
$text);
} else { } else {
$text = preg_replace("/([#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $text); $text = preg_replace("/([#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $text);
} }

22
src/Module/Api/Mastodon/Accounts/Search.php
View file

@ -52,27 +52,15 @@ class Search extends BaseApi
$accounts = []; $accounts = [];
if ($request['resolve']) { if ((strrpos($request['q'], '@') > 0) || Network::isValidHttpUrl($request['q'])) {
if ((strrpos($request['q'], '@') > 0) || Network::isValidHttpUrl($request['q'])) { $id = Contact::getIdForURL($request['q'], 0, $request['resolve'] ? null : false);
$results = CoreSearch::getContactsFromProbe($request['q']);
}
if (!empty($results)) { if (!empty($id)) {
$counter = 0; $accounts[] = DI::mstdnAccount()->createFromContactId($id, $uid);
foreach ($results->getResults() as $result) {
if (++$counter > $request['limit']) {
continue;
}
if ($result instanceof ContactResult) {
$id = Contact::getIdForURL($result->getUrl(), 0, false);
$accounts[] = DI::mstdnAccount()->createFromContactId($id, $uid);
}
}
} }
} }
if (count($accounts) < $request['limit']) { if (empty($accounts)) {
$contacts = Contact::searchByName($request['q'], '', $request['following'] ? $uid : 0, $request['limit']); $contacts = Contact::searchByName($request['q'], '', $request['following'] ? $uid : 0, $request['limit']);
foreach ($contacts as $contact) { foreach ($contacts as $contact) {
$accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid); $accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid);

24
src/Module/Api/Mastodon/Search.php
View file

@ -84,28 +84,16 @@ class Search extends BaseApi
{ {
$accounts = []; $accounts = [];
if ($resolve) { if ((strrpos($q, '@') > 0) || Network::isValidHttpUrl($q)) {
if ((strrpos($q, '@') > 0) || Network::isValidHttpUrl($q)) { $id = Contact::getIdForURL($q, 0, $resolve ? null : false);
$results = CoreSearch::getContactsFromProbe($q);
}
if (!empty($results)) { if (!empty($id)) {
$counter = 0; $accounts[] = DI::mstdnAccount()->createFromContactId($id, $uid);
foreach ($results->getResults() as $result) {
if (++$counter > $limit) {
continue;
}
if ($result instanceof ContactResult) {
$id = Contact::getIdForURL($result->getUrl(), 0, false);
$accounts[] = DI::mstdnAccount()->createFromContactId($id, $uid);
}
}
} }
} }
if (count($accounts) < $limit) { if (empty($accounts)) {
$contacts = Contact::searchByName($q, '', $following ? $uid : 0, $limit - count($accounts), $offset); $contacts = Contact::searchByName($q, '', $following ? $uid : 0, $limit, $offset);
foreach ($contacts as $contact) { foreach ($contacts as $contact) {
$accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid); $accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid);
} }