aboutsummaryrefslogtreecommitdiffstats
path: root/include/diaspora.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2012-03-17 08:44:36 +0100
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2012-03-17 08:44:36 +0100
commit96da328acf838faff3fe823f3dd7557d16fe1d8b (patch)
treefb26adfc9fc61077033fa707fae24ba70ee9876a /include/diaspora.php
parent74c64ef2d244df47b2bea6527bbeb5cc62ca8845 (diff)
parent057a142b8cd01cd8ab6212e9d958989c82dfccc3 (diff)
downloadvolse-hubzilla-96da328acf838faff3fe823f3dd7557d16fe1d8b.tar.gz
volse-hubzilla-96da328acf838faff3fe823f3dd7557d16fe1d8b.tar.bz2
volse-hubzilla-96da328acf838faff3fe823f3dd7557d16fe1d8b.zip
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'include/diaspora.php')
-rwxr-xr-xinclude/diaspora.php42
1 files changed, 42 insertions, 0 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index dca857a19..1b5af42cd 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1159,6 +1159,48 @@ function diaspora_comment($importer,$xml,$msg) {
proc_run('php','include/notifier.php','comment',$message_id);
}
+
+ $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+ dbesc($parent_item['uri']),
+ intval($importer['uid'])
+ );
+
+ if(count($myconv)) {
+ $importer_url = $a->get_baseurl() . '/profile/' . $importer['nickname'];
+
+ foreach($myconv as $conv) {
+
+ // now if we find a match, it means we're in this conversation
+
+ if(! link_compare($conv['author-link'],$importer_url))
+ continue;
+
+ require_once('include/enotify.php');
+
+ $conv_parent = $conv['parent'];
+
+ notification(array(
+ 'type' => NOTIFY_COMMENT,
+ 'notify_flags' => $importer['notify-flags'],
+ 'language' => $importer['language'],
+ 'to_name' => $importer['username'],
+ 'to_email' => $importer['email'],
+ 'uid' => $importer['uid'],
+ 'item' => $datarray,
+ 'link' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id,
+ 'source_name' => $datarray['author-name'],
+ 'source_link' => $datarray['author-link'],
+ 'source_photo' => $datarray['author-avatar'],
+ 'verb' => ACTIVITY_POST,
+ 'otype' => 'item',
+ 'parent' => $conv_parent,
+
+ ));
+
+ // only send one notification
+ break;
+ }
+ }
return;
}