clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replaced "getDetailsByURL" with "getByURL/getByURLForUser"

Browse Source
This commit is contained in:
Michael
2020-07-15 04:42:04 +00:00
parent 869f3cfec4
commit d9c6a46ffe
29 changed files with 78 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Protocol/ActivityPub/Transmitter.php
View File

@@ -1008,7 +1008,7 @@ class Transmitter
$url = DI::baseUrl() . '/search?tag=' . urlencode($term['name']);
$tags[] = ['type' => 'Hashtag', 'href' => $url, 'name' => '#' . $term['name']];
} else {
$contact = Contact::getDetailsByURL($term['url']);
$contact = Contact::getByURL($term['url'], 0, ['addr'], false);
if (!empty($contact['addr'])) {
$mention = '@' . $contact['addr'];
} else {
@@ -1141,7 +1141,7 @@ class Transmitter
return '';
}
$data = Contact::getDetailsByURL($match[1]);
$data = Contact::getByURL($match[1], 0, ['url', 'nick'], false);
if (empty($data['nick'])) {
return $match[0];
}
@@ -1861,7 +1861,7 @@ class Transmitter
$mentions = [];
foreach (Tag::getByURIId($uriid, [Tag::IMPLICIT_MENTION]) as $tag) {
$profile = Contact::getDetailsByURL($tag['url']);
$profile = Contact::getByURL($tag['url'], 0, ['addr', 'contact-type', 'nick'], false);
if (!empty($profile['addr'])
&& $profile['contact-type'] != Contact::TYPE_COMMUNITY
&& !strstr($body, $profile['addr'])