Skip to content

Commit 16d821f

Browse files
committed
reminder_send and reminder_edit can both return None, which should not be treated as a successful action (see #108).
Release as 0.3.25.1.
1 parent 0924934 commit 16d821f

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

metabot/modules/reminders.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,13 @@ def _daily_messages(multibot, records): # pylint: disable=too-many-branches,too
119119
if events:
120120
url = eventutil.get_image(events[0], botconf)
121121
message = reminder_send(bot, groupid, text, url)
122-
records[key] = (period, [event.copy() for event in events], message, text, '')
123-
if last:
124-
_, _, text = annconf.get_events(bot, last.time, perioddt, countdown=False)
125-
reminder_edit(bot, groupid, last.message['message_id'], text,
126-
last.message.get('caption'))
122+
if message:
123+
records[key] = (period, [event.copy() for event in events], message, text,
124+
'')
125+
if last:
126+
text = annconf.get_events(bot, last.time, perioddt, countdown=False)[2]
127+
reminder_edit(bot, groupid, last.message['message_id'], text,
128+
last.message.get('caption'))
127129
continue
128130

129131
if last:
@@ -157,8 +159,9 @@ def _daily_messages(multibot, records): # pylint: disable=too-many-branches,too
157159
newtext = f'{newtext}\n\n[{suffix}]'
158160
message = reminder_edit(bot, groupid, last.message['message_id'], newtext,
159161
last.message.get('caption'))
160-
records[key] = (last.time, [event.copy() for event in events], message, text,
161-
suffix)
162+
if message:
163+
records[key] = (last.time, [event.copy() for event in events], message,
164+
text, suffix)
162165

163166

164167
def reminder_send(bot, groupid, text, photo):

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = 'metabot'
3-
version = '0.3.25'
3+
version = '0.3.25.1'
44
description = 'Modularized, multi-account bot.'
55
readme = 'README.md'
66
authors = [

0 commit comments

Comments
 (0)