item tag notifications

diff --git a/include/items.php b/include/items.php
index 9f2cc491b6ef4a7728bed4912bb2418982075f34..fd90494b166411ee22060e09f9f57235fe81d121 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -905,7 +905,7 @@ function item_store($arr,$force_parent = false) {
                );
        }
 
-       tgroup_deliver($arr['uid'],$current_post);
+       tag_deliver($arr['uid'],$current_post);
 
        return $current_post;
 }
@@ -923,22 +923,22 @@ function get_item_contact($item,$contacts) {
 }
 
 
-function tgroup_deliver($uid,$item_id) {
+function tag_deliver($uid,$item_id) {
 
-
-       // setup a second delivery chain for forum/community posts if appropriate
+       // look for mention tags and setup a second delivery chain for forum/community posts if appropriate
 
        $a = get_app();
 
-       $deliver_to_tgroup = false;
+       $mention = false;
 
-       $u = q("select * from user where uid = %d and `page-flags` = %d limit 1",
-               intval($uid),
-               intval(PAGE_COMMUNITY)
+       $u = q("select uid, nickname, language, username, email, `page-flags`, `notify-flags` from user where uid = %d limit 1",
+               intval($uid)
        );
        if(! count($u))
                return;
 
+       $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+
        $i = q("select * from item where id = %d and uid = %d limit 1",
                intval($item_id),
                intval($uid)
@@ -948,13 +948,6 @@ function tgroup_deliver($uid,$item_id) {
 
        $item = $i[0];
 
-       // prevent delivery looping - only proceed
-       // if the message originated elsewhere and is a top-level post
-
-       if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent']))
-               return;
-
-
        $link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
 
        // Diaspora uses their own hardwired link URL in @-tags
@@ -966,24 +959,49 @@ function tgroup_deliver($uid,$item_id) {
        if($cnt) {
                foreach($matches as $mtch) {
                        if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
-                               $deliver_to_tgroup = true;
-                               logger('tgroup_deliver: local group mention found: ' . $mtch[2]);
+                               $mention = true;
+                               logger('tag_deliver: mention found: ' . $mtch[2]);
                        }
                }
        }
 
-       if(! $deliver_to_tgroup)
+       if(! $mention)
+               return;
+
+       if(! $community_page) {
+               require_once('include/enotify.php');
+               notification(array(
+                       'type'         => NOTIFY_TAGSELF,
+                       'notify_flags' => $u[0]['notify-flags'],
+                       'language'     => $u[0]['language'],
+                       'to_name'      => $u[0]['username'],
+                       'to_email'     => $u[0]['email'],
+                       'item'         => $item,
+                       'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item['id'],
+                       'source_name'  => $item['author-name'],
+                       'source_link'  => $item['author-link'],
+                       'source_photo' => $item['author-avatar'],
+                       'verb'         => ACTIVITY_TAG,
+                       'otype'        => 'item'
+               ));
                return;
+       }
+       else {
+               // prevent delivery looping - only proceed
+               // if the message originated elsewhere and is a top-level post
 
-       // now change this copy of the post to a forum head message and deliver to all the tgroup members
+               if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent']))
+                       return;
 
+               // now change this copy of the post to a forum head message and deliver to all the tgroup members
 
-       q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1",
-               intval($item_id)
-       );
 
-       proc_run('php','include/notifier.php','tgroup',$item_id);                       
+               q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1",
+                       intval($item_id)
+               );
 
+               proc_run('php','include/notifier.php','tgroup',$item_id);                       
+       }
 }
 
 

diff --git a/mod/settings.php b/mod/settings.php
index e75272539d1dc16d497196f200e81429f1b9be55..b4cd2e608a92f749a105a374e0b61f15406f8fe5 100755 (executable)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -818,6 +818,7 @@ function settings_content(&$a) {
                '$notify4'      => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''),
                '$notify5'      => array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''),
                '$notify6'  => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''),          
+               '$notify7'  => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),         
                
                
                '$h_advn' => t('Advanced Page Settings'),

diff --git a/view/settings.tpl b/view/settings.tpl
index 6310ff47e8f7f45ea2b9036656a1cdb937970403..1172df8b91d0e3890849e91f4bb148ff38ad3934 100755 (executable)
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -108,6 +108,7 @@ $suggestme
 {{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
 </div>