Superfluous, since we only fetch this data

This commit is contained in:
Michael 2018-09-30 07:48:13 +00:00
parent 82987d018a
commit 2fc79e3886

View file

@ -369,9 +369,6 @@ class ActivityPub
} }
foreach ($terms as $term) { foreach ($terms as $term) {
if ($term['type'] != TERM_MENTION) {
continue;
}
$profile = APContact::getProfileByURL($term['url'], false); $profile = APContact::getProfileByURL($term['url'], false);
if (!empty($profile) && empty($contacts[$profile['url']])) { if (!empty($profile) && empty($contacts[$profile['url']])) {
$data['cc'][] = $profile['url']; $data['cc'][] = $profile['url'];
@ -384,9 +381,6 @@ class ActivityPub
$mentioned = []; $mentioned = [];
foreach ($terms as $term) { foreach ($terms as $term) {
if ($term['type'] != TERM_MENTION) {
continue;
}
$cid = Contact::getIdForURL($term['url'], $item['uid']); $cid = Contact::getIdForURL($term['url'], $item['uid']);
if (!empty($cid) && in_array($cid, $receiver_list)) { if (!empty($cid) && in_array($cid, $receiver_list)) {
$contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => Protocol::ACTIVITYPUB]); $contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => Protocol::ACTIVITYPUB]);
@ -624,16 +618,14 @@ class ActivityPub
$terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION); $terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION);
foreach ($terms as $term) { foreach ($terms as $term) {
if ($term['type'] == TERM_MENTION) { $contact = Contact::getDetailsByURL($term['url']);
$contact = Contact::getDetailsByURL($term['url']); if (!empty($contact['addr'])) {
if (!empty($contact['addr'])) { $mention = '@' . $contact['addr'];
$mention = '@' . $contact['addr']; } else {
} else { $mention = '@' . $term['url'];
$mention = '@' . $term['url'];
}
$tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
} }
$tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
} }
return $tags; return $tags;
} }