cinchrb · ghost · Mar 24, 2018 · Mar 24, 2018 · Mar 24, 2018
diff --git a/lib/cinch/bot.rb b/lib/cinch/bot.rb
@@ -109,6 +109,10 @@ class Bot < User
     # @since 2.0.0
     attr_reader :handlers
 
+    # The bot's OPER state.
+    # @return [Boolean]
+    attr_accessor :is_oper
+
     # The bot's modes.
     #
     # @return [Array<String>]
@@ -235,6 +239,7 @@ def quit(message = nil)
     #   `@config.plugins.plugins`?
     # @return [void]
     def start(plugins = true)
+      @is_oper = false
       @reconnects = 0
       @plugins.register_plugins(@config.plugins.plugins) if plugins
 

diff --git a/lib/cinch/configuration/bot.rb b/lib/cinch/configuration/bot.rb
@@ -4,7 +4,7 @@ module Cinch
   class Configuration
     # @since 2.0.0
     class Bot < Configuration
-      KnownOptions = [:server, :port, :ssl, :password, :nick, :nicks,
+      KnownOptions = [:server, :port, :ssl, :password, :nick, :nicks, :oper,
                       :realname, :user, :messages_per_second, :server_queue_size,
                       :strictness, :message_split_start, :message_split_end,
                       :max_messages, :plugins, :channels, :encoding, :reconnect, :max_reconnect_delay,
@@ -22,6 +22,7 @@ def self.default_config
           :realname => "cinch",
           :user => "cinch",
           :modes => [],
+          :oper => nil,
           :messages_per_second => nil,
           :server_queue_size => nil,
           :strictness => :forgiving,

diff --git a/lib/cinch/irc.rb b/lib/cinch/irc.rb
@@ -95,7 +95,6 @@ def setup_ssl(socket)
         ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
       @bot.loggers.info "Using SSL with #{@bot.config.server}:#{@bot.config.port}"
-
       @socket      = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
       @socket.sync = true
       @socket.connect
@@ -611,6 +610,9 @@ def on_001(msg, events)
       # Ensure that we know our real, possibly truncated or otherwise
       # modified nick.
       @bot.set_nick msg.params.first
+      if !@bot.config.oper.nil? && @bot.config.oper["user"] != "" && @bot.config.oper["pass"] != ""
+        @bot.oper @bot.config.oper["pass"], @bot.config.oper["user"]
+      end
     end
 
     # @since 2.0.0
@@ -817,6 +819,12 @@ def on_368(msg, events)
       msg.channel.mark_as_synced(:bans)
     end
 
+    def on_381(msg, events)
+      @bot.is_oper = true
+      update_whois(@bot, {:oper? => true})
+      events << [:oper]
+    end
+
     def on_386(msg, events)
       # RPL_QLIST
       unless @in_lists.include?(:owners)
@@ -873,6 +881,10 @@ def on_671(msg, events)
       update_whois(user, {:secure? => true})
     end
 
+    def on_464(msg, events)
+      events << [:oper_fail]
+    end
+
     # @since 2.0.0
     def on_730(msg, events)
       # RPL_MONONLINE