From 2fc79e3886af68463a7851e5cad2c0a968d15e73 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 30 Sep 2018 07:48:13 +0000 Subject: [PATCH] Superfluous, since we only fetch this data --- src/Protocol/ActivityPub.php | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php index 58bd9dcfe1..c04347f4e9 100644 --- a/src/Protocol/ActivityPub.php +++ b/src/Protocol/ActivityPub.php @@ -369,9 +369,6 @@ class ActivityPub } foreach ($terms as $term) { - if ($term['type'] != TERM_MENTION) { - continue; - } $profile = APContact::getProfileByURL($term['url'], false); if (!empty($profile) && empty($contacts[$profile['url']])) { $data['cc'][] = $profile['url']; @@ -384,9 +381,6 @@ class ActivityPub $mentioned = []; foreach ($terms as $term) { - if ($term['type'] != TERM_MENTION) { - continue; - } $cid = Contact::getIdForURL($term['url'], $item['uid']); if (!empty($cid) && in_array($cid, $receiver_list)) { $contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => Protocol::ACTIVITYPUB]); @@ -624,16 +618,14 @@ class ActivityPub $terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION); foreach ($terms as $term) { - if ($term['type'] == TERM_MENTION) { - $contact = Contact::getDetailsByURL($term['url']); - if (!empty($contact['addr'])) { - $mention = '@' . $contact['addr']; - } else { - $mention = '@' . $term['url']; - } - - $tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention]; + $contact = Contact::getDetailsByURL($term['url']); + if (!empty($contact['addr'])) { + $mention = '@' . $contact['addr']; + } else { + $mention = '@' . $term['url']; } + + $tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention]; } return $tags; } -- 2.39.5