From 9254a4ae1e216a0fc95d07bf5405d86ee1880198 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 21 Aug 2012 21:15:30 +0000 Subject: [PATCH] Make 'meetingname' a required argument of startmeeting. The meetingname can be used in the filename of the meeting logs. Change-Id: I8a72f292a6a995e517114350373507c20ca4ce7e --- MeetBot/plugin.py | 4 ++++ ircmeeting/meeting.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/MeetBot/plugin.py b/MeetBot/plugin.py index e7a621a..633b80c 100644 --- a/MeetBot/plugin.py +++ b/MeetBot/plugin.py @@ -94,6 +94,10 @@ class MeetBot(callbacks.Plugin): if M is not None: irc.error("Can't start another meeting, one is in progress.") return + name = payload[13:].strip() + if not name: + irc.error("A meeting name is required, e.g., '#startmeeting Marketing Committee'") + return # This callback is used to send data to the channel: def _setTopic(x): irc.sendMsg(ircmsgs.topic(channel, x)) diff --git a/ircmeeting/meeting.py b/ircmeeting/meeting.py index b717f4f..9514749 100644 --- a/ircmeeting/meeting.py +++ b/ircmeeting/meeting.py @@ -314,7 +314,7 @@ class MeetingCommands(object): for messageline in message.split('\n'): self.reply(messageline) if line.strip(): - self.do_meetingtopic(nick=nick, line=line, time_=time_, **kwargs) + self.do_meetingname(nick=nick, line=line, time_=time_, **kwargs) def do_endmeeting(self, nick, time_, **kwargs): """End the meeting.""" if not self.isChair(nick): return