- "SELECT `event`.* FROM `event`
- WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
- ORDER BY `start` ASC ",
+ "SELECT `event`.*
+ FROM `event`
+ INNER JOIN `item`
+ ON `item`.`uid` = `event`.`uid`
+ AND `item`.`parent-uri` = `event`.`uri`
+ 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",