Small googlecal changes

* if we did a add del or something else return after the operation is done
* always check if events list is empty and send a "no events" message if we got that far
This commit is contained in:
Tatu Wikman 2020-01-02 11:54:31 +02:00
parent e7a7595731
commit b82dc4b720
No known key found for this signature in database
GPG Key ID: BF214F789950B74E
1 changed files with 13 additions and 7 deletions

View File

@ -77,6 +77,8 @@ class MatrixModule:
events = events + self.list_today(calid)
if args[1] == 'list':
await bot.send_text(room, 'Calendars in this room: ' + str(self.calendar_rooms.get(room.room_id)))
return
elif len(args) == 3:
if args[1] == 'add':
bot.must_be_admin(room, event)
@ -98,6 +100,8 @@ class MatrixModule:
bot.save_settings()
await bot.send_text(room, 'Added new google calendar to this room')
return
if args[1] == 'del':
bot.must_be_admin(room, event)
@ -112,17 +116,19 @@ class MatrixModule:
bot.save_settings()
await bot.send_text(room, 'Removed google calendar from this room')
return
else:
for calid in calendars:
print('Listing events in cal', calid)
events = events + self.list_upcoming(calid)
if len(events) == 0:
await bot.send_text(room, 'No events found.')
if len(events):
if len(events) > 0:
print(f'Found {len(events)} events')
await self.send_events(bot, events, room)
else:
print(f'No events found')
await bot.send_text(room, 'No events found, try again later :)')
async def send_events(self, bot, events, room):
for event in events: