<?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\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;
$condition = ["`unseen` AND `uid` = ? AND NOT `origin` AND (`vid` != ? OR `vid` IS NULL)",
local_user(), Verb::getID(Activity::FOLLOW)];
- $items = Post::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 = Post::toArray($items);
+ $items_unseen = Post::toArray($items, false);
$arr = ['items' => $items_unseen];
Hook::callAll('network_ping', $arr);
$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;
usort($notifications, $sort_function);
array_walk($notifications, function (&$notification) {
- if (empty($notification['photo'])) {
- $contact = Contact::getByURL($notification['url'], false, ['micro', 'id', 'avatar']);
- $notification['photo'] = Contact::getMicro($contact, $notification['photo']);
- }
-
+ $notification['photo'] = Contact::getAvatarUrlForUrl($notification['url'], local_user(), Proxy::SIZE_MICRO);
$notification['timestamp'] = DateTimeFormat::local($notification['date']);
- $notification['date'] = Temporal::getRelativeDate($notification['date']);
+ $notification['date'] = Temporal::getRelativeDate($notification['date']);
});
}
do {
$r = q(
- "SELECT `notify`.*, `post-view`.`visible`, `post-view`.`deleted`
- FROM `notify` LEFT JOIN `post-view` ON `post-view`.`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;
}
}
}