From 08afec3170857152d4d76fafa3611cb55b066eee Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 21 Apr 2018 22:49:06 -0400 Subject: [PATCH] Only show event reminders of events attendyes or attendmaybe --- src/Model/Profile.php | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/Model/Profile.php b/src/Model/Profile.php index ec53d064d6..2238b3aac5 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -643,27 +643,29 @@ class Profile $bd_format = L10n::t('g A l F d'); // 8 AM Friday January 18 $classtoday = ''; + $self = dba::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]); + $s = dba::p( "SELECT * FROM `event` - WHERE `event`.`uid` = ? - AND `event`.`type` != 'birthday' - AND `event`.`start` < ? - AND `event`.`start` >= ? - AND NOT EXISTS ( - SELECT `id` - FROM `item` - WHERE `item`.`uid` = `event`.`uid` + JOIN `item` + ON `item`.`uid` = `event`.`uid` AND `item`.`parent-uri` = `event`.`uri` - AND `item`.`verb` = ? - AND `item`.`visible` - AND NOT `item`.`deleted` - ) + WHERE `event`.`uid` = ? + AND `event`.`type` != 'birthday' + AND `event`.`start` < ? + AND `event`.`start` >= ? + AND `item`.`author-id` = ? + AND (`item`.`verb` = ? OR `item`.`verb` = ?) + AND `item`.`visible` + AND NOT `item`.`deleted` ORDER BY `event`.`start` ASC", local_user(), DateTimeFormat::utc('now + 7 days'), DateTimeFormat::utc('now - 1 days'), - ACTIVITY_ATTENDNO + $self['id'], + ACTIVITY_ATTEND, + ACTIVITY_ATTENDMAYBE ); $r = []; -- 2.39.5