From d4199cf103c46ecd7773a23960b8455b68dd747c Mon Sep 17 00:00:00 2001 From: Marrub Date: Tue, 5 Mar 2019 02:23:15 -0500 Subject: [PATCH] fix irc module --- source/backends/discord.rb | 4 ++++ source/backends/irc.rb | 11 ++++++++--- source/modules/irc.rb | 2 +- source/robots.rb | 7 ------- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/source/backends/discord.rb b/source/backends/discord.rb index f2ec95c..0b8c811 100644 --- a/source/backends/discord.rb +++ b/source/backends/discord.rb @@ -51,6 +51,10 @@ module Backend_Discord @name = ?# + chan.name @id = chan.id end + + def send_msg text + @real.send text + end end # A Discord server. diff --git a/source/backends/irc.rb b/source/backends/irc.rb index d70626f..a22061a 100644 --- a/source/backends/irc.rb +++ b/source/backends/irc.rb @@ -45,6 +45,10 @@ module Backend_IRC @name = chan.name.downcase @id = Vrobot4.hash_str chan.name.downcase end + + def send_msg text + @real.send text + end end # An IRC server. @@ -94,13 +98,14 @@ module Backend_IRC Vrobot4::Robots.add_bot_type self attr_accessor :serv # @return [Vrobot4::Server::Server] the server + attr_reader :real # @return [Cinch::Bot] the bot instance # (see Vrobot4::Robots::Bot#initialize) def initialize info super this = self - @bot = Cinch::Bot.new do + @real = Cinch::Bot.new do configure do |cfg| cfg.server = info[:server] cfg.nick = info[:nick] || "vrobot4" @@ -130,13 +135,13 @@ module Backend_IRC end end - @bot.loggers.level = :warn + @real.loggers.level = :warn @serv = Server.new info, self end # (see Vrobot4::Robots::Bot#connect) def connect - @bot.start + @real.start end end end diff --git a/source/modules/irc.rb b/source/modules/irc.rb index c6c588c..4af4d74 100644 --- a/source/modules/irc.rb +++ b/source/modules/irc.rb @@ -8,7 +8,7 @@ class Mod_IRC < Vrobot4::Module::Module end def c_raw m, argv - m.serv.bot.irc.send argv + m.bot.real.irc.send argv end end diff --git a/source/robots.rb b/source/robots.rb index c4dd34e..be65895 100644 --- a/source/robots.rb +++ b/source/robots.rb @@ -6,13 +6,6 @@ module Vrobot4::Robots def initialize info @info = info end - - # Connect to all servers. - # @abstract - # @return [void] - def connect - raise NotImplementedError, "Bot#connect not implemented" - end end # Adds a bot type to the global list.