From 0c24784f5e92e0c8269f255e962312574871f2f0 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 6 Dec 2011 15:24:01 -0800 Subject: include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours) --- mod/network.php | 6 ++++-- mod/notifications.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'mod') diff --git a/mod/network.php b/mod/network.php index 8df3f83df..2a3db597e 100644 --- a/mod/network.php +++ b/mod/network.php @@ -373,9 +373,11 @@ function network_content(&$a, $update = 0) { $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname']; $myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); - $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` regexp '%s' or `tag` regexp '%s' )) ", + $diasp_url = str_replace('/profile/','/u/',$myurl); + $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` regexp '%s' or `tag` regexp '%s' or tag regexp '%s' )) ", dbesc($myurl . '$'), - dbesc($myurl . '\\]') + dbesc($myurl . '\\]'), + dbesc($diasp_url . '\\]') ); } diff --git a/mod/notifications.php b/mod/notifications.php index 385f9d719..5733e6e57 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -297,9 +297,11 @@ function notifications_content(&$a) { $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname']; $myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); - $sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' ) ", + $diasp_url = str_replace('/profile/','/u/',$myurl); + $sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ", dbesc($myurl . '$'), - dbesc($myurl . '\\]') + dbesc($myurl . '\\]'), + dbesc($diasp_url . '\\]') ); -- cgit v1.2.3