From e7b005b1f86b276476aaade7b5b20ff04e5ec72e Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 9 Sep 2014 22:33:23 -0700 Subject: go through the entire discovery sequence for mentions to make sure we have the correct URL --- include/bb2diaspora.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 0f91c8bc8..c499a046a 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -85,13 +85,21 @@ function diaspora_mention_callback($matches) { $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1", dbesc($webbie) ); + if(! $r) { + $x = discover_by_webbie($webbie); + if($x) { + $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1", + dbesc($webbie) + ); + } + } if($r) $link = $r[0]['xchan_url']; } if(! $link) $link = 'https://' . $matches[3] . '/u/' . $matches[2]; - return '@[url=' . $link . ']' . trim($matches[1]) . ((substr($mentions[0],-1,1) === '+') ? '+' : '') . '[/url]' ; + return '@[url=' . $link . ']' . trim($matches[1]) . ((substr($matches[0],-1,1) === '+') ? '+' : '') . '[/url]' ; } -- cgit v1.2.3