From b0d44bd02bc2f0124b7434ea0c02151cacb27bce Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Thu, 16 Jan 2020 20:35:41 -0500 Subject: [PATCH] make vrobot able to do nothing on servers not in the config hash --- source/backends/discord.rb | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/source/backends/discord.rb b/source/backends/discord.rb index 0b8c811..d992578 100644 --- a/source/backends/discord.rb +++ b/source/backends/discord.rb @@ -162,17 +162,18 @@ module Backend_Discord @real.message do |evt| if evt.server serv = get_server evt.server + if serv + m = Vrobot4::Server::Message.new \ + msg: evt.message.content, + user: User.new(evt.user, @ops, @hop), + chan: Channel.new(evt.channel), + serv: serv, + bot: self, + reply: -> (text) {evt.channel.send text}, + reply_b: -> (text) {evt.channel.send "```\n#{text}```"} - m = Vrobot4::Server::Message.new \ - msg: evt.message.content, - user: User.new(evt.user, @ops, @hop), - chan: Channel.new(evt.channel), - serv: serv, - bot: self, - reply: -> (text) {evt.channel.send text}, - reply_b: -> (text) {evt.channel.send "```\n#{text}```"} - - serv.handle_text_cmd m + serv.handle_text_cmd m + end end end end @@ -192,11 +193,11 @@ module Backend_Discord @servers[serv.id] = Server.new @info[serv.id] || {}, self, serv end - # Finds a server in the hash, potentially adding it. + # Finds a server in the hash, or nil. # @param serv [Discordrb::Server] server instance # @return [Server] def get_server serv - @servers[serv.id] || add_server(serv) + @servers[serv.id] end end end