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, false);
$arr = ['items' => $items_unseen];
$intro_count = count($intros1) + count($intros2);
$intros = $intros1 + $intros2;
- $myurl = DI::baseUrl() . '/profile/' . $a->user['nickname'];
- $mails = q(
- "SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
- WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
- intval(local_user()),
- DBA::escape($myurl)
- );
- $mail_count = count($mails);
+ $myurl = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
+ $mail_count = DBA::count('mail', ["`uid` = ? AND NOT `seen` AND `from-url` != ?", local_user(), $myurl]);
if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::APPROVE && is_site_admin()) {
$regs = Friendica\Model\Register::getPending();
$cachekey = "ping_init:".local_user();
$ev = DI::cache()->get($cachekey);
if (is_null($ev)) {
- $ev = q(
- "SELECT type, start, adjust FROM `event`
- WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
- ORDER BY `start` ASC ",
- intval(local_user()),
- DBA::escape(DateTimeFormat::utc('now + 7 days')),
- DBA::escape(DateTimeFormat::utcNow())
- );
+ $ev = DBA::selectToArray('event', ['type', 'start', 'adjust'],
+ ["`uid` = ? AND `start` < ? AND `finish` > ? AND NOT `ignore`",
+ local_user(), DateTimeFormat::utc('now + 7 days'), DateTimeFormat::utcNow()]);
if (DBA::isResult($ev)) {
DI::cache()->set($cachekey, $ev, Duration::HOUR);
}
$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']);
});
}
$notification["message"] = $notification["msg_cache"];
} else {
$notification["name"] = strip_tags(BBCode::convert($notification["name"]));
- $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",
- DBA::escape($notification["name"]),
- DBA::escape($notification["message"]),
- intval($notification["id"])
- );
+ $notification["message"] = \Friendica\Navigation\Notifications\Entity\Notify::formatMessage($notification["name"], BBCode::toPlaintext($notification["msg"]));
+
+ // @todo Replace this with a call of the Notify model class
+ DBA::update('notify', ['name_cache' => $notification["name"], 'msg_cache' => $notification["message"]], ['id' => $notification["id"]]);
}
$notification["href"] = DI::baseUrl() . "/notification/" . $notification["id"];
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;
}
}
}