personal notifications
This commit is contained in:
friendica
parent
37730ecc2a
commit
f1af2c224f
8 changed files with 114 additions and 11 deletions
|
|
@ -72,6 +72,11 @@ function notifications_content(&$a) {
|
||||||
'url'=>$a->get_baseurl() . '/notifications/network',
|
'url'=>$a->get_baseurl() . '/notifications/network',
|
||||||
'sel'=> (($a->argv[1] == 'network') ? 'active' : ''),
|
'sel'=> (($a->argv[1] == 'network') ? 'active' : ''),
|
||||||
),
|
),
|
||||||
|
array(
|
||||||
|
'label' => t('Personal'),
|
||||||
|
'url'=>$a->get_baseurl() . '/notifications/personal',
|
||||||
|
'sel'=> (($a->argv[1] == 'personal') ? 'active' : ''),
|
||||||
|
),
|
||||||
array(
|
array(
|
||||||
'label' => t('Home'),
|
'label' => t('Home'),
|
||||||
'url' => $a->get_baseurl() . '/notifications/home',
|
'url' => $a->get_baseurl() . '/notifications/home',
|
||||||
|
|
@ -191,7 +196,7 @@ function notifications_content(&$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
info( t('No notifications.') . EOL);
|
info( t('No introductions.') . EOL);
|
||||||
|
|
||||||
$o .= replace_macros($notif_tpl,array(
|
$o .= replace_macros($notif_tpl,array(
|
||||||
'$notif_header' => t('Notifications'),
|
'$notif_header' => t('Notifications'),
|
||||||
|
|
@ -276,7 +281,7 @@ function notifications_content(&$a) {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
$notif_content = t('Nothing new!');
|
$notif_content = t('No more network notifications.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$o .= replace_macros($notif_tpl,array(
|
$o .= replace_macros($notif_tpl,array(
|
||||||
|
|
@ -285,6 +290,104 @@ function notifications_content(&$a) {
|
||||||
'$notif_content' => $notif_content,
|
'$notif_content' => $notif_content,
|
||||||
));
|
));
|
||||||
|
|
||||||
|
} else if (($a->argc > 1) && ($a->argv[1] == 'personal')) {
|
||||||
|
|
||||||
|
$notif_tpl = get_markup_template('notifications.tpl');
|
||||||
|
|
||||||
|
$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' ) ",
|
||||||
|
dbesc($myurl . '$'),
|
||||||
|
dbesc($myurl . '\\]')
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
|
||||||
|
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`,
|
||||||
|
`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
|
||||||
|
FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
|
||||||
|
WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1
|
||||||
|
$sql_extra
|
||||||
|
AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" ,
|
||||||
|
intval(local_user())
|
||||||
|
);
|
||||||
|
|
||||||
|
$tpl_item_likes = get_markup_template('notifications_likes_item.tpl');
|
||||||
|
$tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl');
|
||||||
|
$tpl_item_friends = get_markup_template('notifications_friends_item.tpl');
|
||||||
|
$tpl_item_comments = get_markup_template('notifications_comments_item.tpl');
|
||||||
|
$tpl_item_posts = get_markup_template('notifications_posts_item.tpl');
|
||||||
|
|
||||||
|
$notif_content = '';
|
||||||
|
|
||||||
|
if (count($r) > 0) {
|
||||||
|
|
||||||
|
foreach ($r as $it) {
|
||||||
|
switch($it['verb']){
|
||||||
|
case ACTIVITY_LIKE:
|
||||||
|
$notif_content .= replace_macros($tpl_item_likes,array(
|
||||||
|
'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
|
||||||
|
'$item_image' => $it['author-avatar'],
|
||||||
|
'$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
|
||||||
|
'$item_when' => relative_date($it['created'])
|
||||||
|
));
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ACTIVITY_DISLIKE:
|
||||||
|
$notif_content .= replace_macros($tpl_item_dislikes,array(
|
||||||
|
'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
|
||||||
|
'$item_image' => $it['author-avatar'],
|
||||||
|
'$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
|
||||||
|
'$item_when' => relative_date($it['created'])
|
||||||
|
));
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ACTIVITY_FRIEND:
|
||||||
|
|
||||||
|
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
|
||||||
|
$obj = parse_xml_string($xmlhead.$it['object']);
|
||||||
|
$it['fname'] = $obj->title;
|
||||||
|
|
||||||
|
$notif_content .= replace_macros($tpl_item_friends,array(
|
||||||
|
'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
|
||||||
|
'$item_image' => $it['author-avatar'],
|
||||||
|
'$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
|
||||||
|
'$item_when' => relative_date($it['created'])
|
||||||
|
));
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
$item_text = (($it['id'] == $it['parent'])
|
||||||
|
? sprintf( t("%s created a new post"), $it['author-name'])
|
||||||
|
: sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']));
|
||||||
|
$tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments);
|
||||||
|
|
||||||
|
$notif_content .= replace_macros($tpl,array(
|
||||||
|
'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
|
||||||
|
'$item_image' => $it['author-avatar'],
|
||||||
|
'$item_text' => $item_text,
|
||||||
|
'$item_when' => relative_date($it['created'])
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
$notif_content = t('No more personal notifications.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$o .= replace_macros($notif_tpl,array(
|
||||||
|
'$notif_header' => t('Notifications'),
|
||||||
|
'$tabs' => $tabs,
|
||||||
|
'$notif_content' => $notif_content,
|
||||||
|
));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
} else if (($a->argc > 1) && ($a->argv[1] == 'home')) {
|
} else if (($a->argc > 1) && ($a->argv[1] == 'home')) {
|
||||||
|
|
||||||
$notif_tpl = get_markup_template('notifications.tpl');
|
$notif_tpl = get_markup_template('notifications.tpl');
|
||||||
|
|
@ -352,7 +455,7 @@ function notifications_content(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$notif_content = t('Nothing new!');
|
$notif_content = t('No more home notifications.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$o .= replace_macros($notif_tpl,array(
|
$o .= replace_macros($notif_tpl,array(
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
<div class="notif-item">
|
<div class="notif-item">
|
||||||
<a href="$item_link"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
|
<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
<div class="notif-item">
|
<div class="notif-item">
|
||||||
<a href="$item_link"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
|
<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
<div class="notif-item">
|
<div class="notif-item">
|
||||||
<a href="$item_link"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
|
<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
<div class="notif-item">
|
<div class="notif-item">
|
||||||
<a href="$item_link"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
|
<a href="$item_link" target="friendica-notification"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
<div class="notif-item">
|
<div class="notif-item">
|
||||||
<a href="{$item_link}"><img src="{$item_image}" class="notif-image">{$item_text} <span class="notif-when">{$item_when}</span></a>
|
<a href="{$item_link}" target="friendica-notifications"><img src="{$item_image}" class="notif-image">{$item_text} <span class="notif-when">{$item_when}</span></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
<div class="notif-item">
|
<div class="notif-item">
|
||||||
<a href="$item_link"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
|
<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -13,9 +13,9 @@
|
||||||
/>
|
/>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
{{ if $group.edit }}
|
{{ if $group.edit }}
|
||||||
<a class="groupsideedit" href="$group.edit.href"><span class="icon small-pencil"></span></a>
|
<a class="groupsideedit" href="$group.edit.href"><span id="group-side-editicon-$group.id" class="icon small-pencil"></span></a>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
<a class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
|
<a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
|
||||||
</li>
|
</li>
|
||||||
{{ endfor }}
|
{{ endfor }}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue