<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Group;
-use Friendica\Model\Item;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
+use Friendica\Model\Post;
use Friendica\Model\Verb;
use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy;
use Friendica\Util\Temporal;
use Friendica\Util\XML;
exit();
}
- $notifs = ping_get_notifications(local_user());
+ $notifications = ping_get_notifications(local_user());
$condition = ["`unseen` AND `uid` = ? AND NOT `origin` AND (`vid` != ? OR `vid` IS NULL)",
local_user(), Verb::getID(Activity::FOLLOW)];
- $items = Item::selectForUser(local_user(), ['wall', 'uid', 'uri-id'], $condition);
+ $items = Post::selectForUser(local_user(), ['wall', 'uid', 'uri-id'], $condition, ['limit' => 1000]);
if (DBA::isResult($items)) {
- $items_unseen = Item::inArray($items);
+ $items_unseen = Post::toArray($items, false);
$arr = ['items' => $items_unseen];
Hook::callAll('network_ping', $arr);
$intros1 = q(
"SELECT `intro`.`id`, `intro`.`datetime`,
`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
- FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
- WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid` != 0",
+ FROM `intro` INNER JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
+ WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`fid` != 0",
intval(local_user())
);
$intros2 = q(
"SELECT `intro`.`id`, `intro`.`datetime`,
`contact`.`name`, `contact`.`url`, `contact`.`photo`
- FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
- WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id` != 0",
+ FROM `intro` INNER JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
+ WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND (`intro`.`fid` = 0 OR `intro`.`fid` IS NULL)",
intval(local_user())
);
$intro_count = count($intros1) + count($intros2);
$intros = $intros1 + $intros2;
- $myurl = DI::baseUrl() . '/profile/' . $a->user['nickname'];
+ $myurl = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
$mails = q(
"SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
$all_events = count($ev);
if ($all_events) {
- $str_now = DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d');
+ $str_now = DateTimeFormat::timezoneNow($a->getTimeZone(), 'Y-m-d');
foreach ($ev as $x) {
$bd = false;
if ($x['type'] === 'birthday') {
} else {
$events ++;
}
- if (DateTimeFormat::convert($x['start'], ((intval($x['adjust'])) ? $a->timezone : 'UTC'), 'UTC', 'Y-m-d') === $str_now) {
+ if (DateTimeFormat::convert($x['start'], ((intval($x['adjust'])) ? $a->getTimeZone() : 'UTC'), 'UTC', 'Y-m-d') === $str_now) {
$all_events_today ++;
if ($bd) {
$birthdays_today ++;
$data['intro'] = $intro_count;
$data['mail'] = $mail_count;
- $data['net'] = $network_count;
- $data['home'] = $home_count;
+ $data['net'] = ($network_count < 1000) ? $network_count : '999+';
+ $data['home'] = ($home_count < 1000) ? $home_count : '999+';
$data['register'] = $register_count;
$data['all-events'] = $all_events;
$data['birthdays'] = $birthdays;
$data['birthdays-today'] = $birthdays_today;
- if (DBA::isResult($notifs)) {
- foreach ($notifs as $notif) {
+ if (DBA::isResult($notifications)) {
+ foreach ($notifications as $notif) {
if ($notif['seen'] == 0) {
$sysnotify_count ++;
}
$notif = [
'id' => 0,
'href' => DI::baseUrl() . '/notifications/intros/' . $intro['id'],
- 'name' => $intro['name'],
+ 'name' => BBCode::convert($intro['name']),
'url' => $intro['url'],
'photo' => $intro['photo'],
'date' => $intro['datetime'],
'seen' => false,
'message' => DI::l10n()->t('{0} wants to be your friend'),
];
- $notifs[] = $notif;
+ $notifications[] = $notif;
}
}
if (DBA::isResult($regs)) {
- foreach ($regs as $reg) {
+ if (count($regs) <= 1 || DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
+ foreach ($regs as $reg) {
+ $notif = [
+ 'id' => 0,
+ 'href' => DI::baseUrl() . '/admin/users/pending',
+ 'name' => $reg['name'],
+ 'url' => $reg['url'],
+ 'photo' => $reg['micro'],
+ 'date' => $reg['created'],
+ 'seen' => false,
+ 'message' => DI::l10n()->t('{0} requested registration'),
+ ];
+ $notifications[] = $notif;
+ }
+ } else {
$notif = [
'id' => 0,
- 'href' => DI::baseUrl() . '/admin/users/',
- 'name' => $reg['name'],
- 'url' => $reg['url'],
- 'photo' => $reg['micro'],
- 'date' => $reg['created'],
+ 'href' => DI::baseUrl() . '/admin/users/pending',
+ 'name' => $regs[0]['name'],
+ 'url' => $regs[0]['url'],
+ 'photo' => $regs[0]['micro'],
+ 'date' => $regs[0]['created'],
'seen' => false,
- 'message' => DI::l10n()->t('{0} requested registration'),
+ 'message' => DI::l10n()->t('{0} and %d others requested registration', count($regs) - 1),
];
- $notifs[] = $notif;
+ $notifications[] = $notif;
}
}
}
return ($adate < $bdate) ? 1 : -1;
};
- usort($notifs, $sort_function);
-
- if (DBA::isResult($notifs)) {
- foreach ($notifs as $notif) {
- $contact = Contact::getByURL($notif['url'], false, ['micro', 'id', 'avatar']);
- $notif['photo'] = Contact::getMicro($contact, $notif['photo']);
-
- $local_time = DateTimeFormat::local($notif['date']);
-
- $notifications[] = [
- 'id' => $notif['id'],
- 'href' => $notif['href'],
- 'name' => $notif['name'],
- 'url' => $notif['url'],
- 'photo' => $notif['photo'],
- 'date' => Temporal::getRelativeDate($notif['date']),
- 'message' => $notif['message'],
- 'seen' => $notif['seen'],
- 'timestamp' => strtotime($local_time)
- ];
- }
- }
+ usort($notifications, $sort_function);
+
+ array_walk($notifications, function (&$notification) {
+ $notification['photo'] = Contact::getAvatarUrlForUrl($notification['url'], local_user(), Proxy::SIZE_MICRO);
+ $notification['timestamp'] = DateTimeFormat::local($notification['date']);
+ $notification['date'] = Temporal::getRelativeDate($notification['date']);
+ });
}
$sysmsgs = [];
do {
$r = q(
- "SELECT `notify`.*, `item`.`visible`, `item`.`deleted`
- FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
+ "SELECT `notify`.*, `post`.`visible`, `post`.`deleted`
+ FROM `notify` LEFT JOIN `post` ON `post`.`uri-id` = `notify`.`uri-id`
WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
AND NOT (`notify`.`type` IN (%d, %d))
AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50",
intval($uid),
- intval(Type::INTRO),
- intval(Type::MAIL),
+ intval(Notification\Type::INTRO),
+ intval(Notification\Type::MAIL),
intval($offset)
);
$notification["message"] = $notification["msg_cache"];
} else {
$notification["name"] = strip_tags(BBCode::convert($notification["name"]));
- $notification["message"] = Friendica\Model\Notify::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
+ $notification["message"] = Notification::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
q(
"UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
if ($notification["visible"]
&& !$notification["deleted"]
- && empty($result[$notification['parent']])
+ && empty($result['p:' . $notification['parent']])
) {
// Should we condense the notifications or show them all?
- if (DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
- $result[$notification["id"]] = $notification;
+ if (($notification['verb'] != Activity::POST) || DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
+ $result[] = $notification;
} else {
- $result[$notification['parent']] = $notification;
+ $result['p:' . $notification['parent']] = $notification;
}
}
}
projects / friendica.git / blobdiff