Merge pull request #6909 from annando/fix-mentions

Fixing automention
This commit is contained in:
Hypolite Petovan 2019-03-19 22:20:39 -04:00 committed by GitHub
commit 3a0a6cd659
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -808,7 +808,7 @@ class Post extends BaseObject
$terms = Term::tagArrayFromItemId($this->getId(), [Term::MENTION, Term::IMPLICIT_MENTION]); $terms = Term::tagArrayFromItemId($this->getId(), [Term::MENTION, Term::IMPLICIT_MENTION]);
foreach ($terms as $term) { foreach ($terms as $term) {
$profile = Contact::getDetailsByURL($term['url']); $profile = Contact::getDetailsByURL($term['url']);
if (!empty($profile['addr']) && (defaults($profile, 'contact-type', Contact::TYPE_COMMUNITY) != Contact::TYPE_COMMUNITY) && if (!empty($profile['addr']) && (defaults($profile, 'contact-type', Contact::TYPE_UNKNOWN) != Contact::TYPE_COMMUNITY) &&
($profile['addr'] != $owner['addr']) && !strstr($text, $profile['addr'])) { ($profile['addr'] != $owner['addr']) && !strstr($text, $profile['addr'])) {
$text .= '@' . $profile['addr'] . ' '; $text .= '@' . $profile['addr'] . ' ';
} }