diff options
Diffstat (limited to 'ircbot')
| -rw-r--r-- | ircbot/main.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ircbot/main.py b/ircbot/main.py index db49a8e..b65b428 100644 --- a/ircbot/main.py +++ b/ircbot/main.py @@ -22,7 +22,7 @@ REALNAME = config['realname'] CHANNELS = config['channels'] GREETINGS = config['greetings'] LOGPATH = config['logpath'] -RELAYBOT = config['relaybot'] +RELAYBOTS = config['relaybots'] IDENT = NICKNAME @@ -501,8 +501,9 @@ class IRCBot: print(f"[{target}] <{sender_nick}>: {message}") write_log(target, sender_nick, message) reply_target = target if target.startswith('#') else sender_nick - + is_cmd = False if message.startswith("!") or message.startswith("！"): + is_cmd = True try: cmd_parts = message[1:].split() cmd = cmd_parts[0].lower() @@ -510,12 +511,13 @@ class IRCBot: self.handle_command(sender_nick, reply_target, cmd, args) except IndexError: pass - elif sender_nick == RELAYBOT: + elif sender_nick in RELAYBOTS: end_of_nick_index = message.find('>') nick = message[1:end_of_nick_index] msg_start_index = end_of_nick_index + 2 msg = message[msg_start_index:].strip() if msg.startswith("!") or msg.startswith("！"): + is_cmd = True try: cmd_parts = msg[1:].split() cmd = cmd_parts[0].lower() @@ -524,7 +526,7 @@ class IRCBot: self.handle_command(nick, reply_target, cmd, args) except IndexError: pass - else: + if not is_cmd: titles = url_titles(message) if len(titles) > 0: for t in titles: |