zetabot 2.1.1 → 2.2.0

data/lib/Zeta/admin/blacklister.rb

@@ -24,22 +24,22 @@ module Admin
 
 
     def bl_channel(m, chan)
-      m.reply "#{chan} is already on BlackList" if Blacklist.channels.include? chan
+      return m.reply "#{chan} is already on BlackList" if Blacklist.channels.include? chan
       Blacklist.channels << chan
       save_blacklist()
       m.reply "#{chan} is now on the BlackList"
     end
 
     def bl_url(m, url)
-      m.reply "#{url} is already on BlackList" if Blacklist.channels.include? url
+      return m.reply "#{url} is already on BlackList" if Blacklist.urls.include? url
       Blacklist.urls << url
       save_blacklist()
       m.reply "#{url} is now on the BlackList"
     end
 
     def bl_mask(m, mask)
-      m.reply "#{mask} is already on BlackList" if Blacklist.masks.include? mask
-      Blacklist.masks << url
+      return m.reply "#{mask} is already on BlackList" if Blacklist.masks.include? mask
+      Blacklist.masks << mask
       save_blacklist()
       m.reply "#{mask} is now on the BlackList"
     end
@@ -50,10 +50,10 @@ module Admin
 
     def bl_defaults(m)
       clear_blacklist()
-      Blacklist.urls = Config.options[:blacklist][:urls]
-      Blacklist.users = Config.options[:blacklist][:users]
-      Blacklist.masks = Config.options[:blacklist][:masks]
-      Blacklist.channels = Config.options[:blacklist][:channels]
+      Blacklist.urls = Config.options[:blacklist][:urls].dup
+      Blacklist.users = Config.options[:blacklist][:users].dup
+      Blacklist.masks = Config.options[:blacklist][:masks].dup
+      Blacklist.channels = Config.options[:blacklist][:channels].dup
       save_blacklist()
       m.reply 'Default Blacklist Loaded'
     end

data/lib/Zeta/admin/bot.rb

@@ -17,14 +17,24 @@ module Admin
 
     # Methods
     def nick(m, nick)
+      old_nick = @bot.nick
       bot.nick = nick
       synchronize(:nickchange) do
-        @bot.handlers.dispatch :admin, m, "My nick got changed from #{@bot.last_nick} to #{@bot.nick} by #{m.user.nick}", m.target
+        @bot.handlers.dispatch :admin, m, "My nick got changed from #{old_nick} to #{nick} by #{m.user.nick}", m.target
       end
     end
 
-    def mode(m, nick)
-      bot.modes = m
+    def mode(m, modes)
+      add, remove = [], []
+      target = add
+      modes.strip.each_char do |c|
+        case c
+        when '+' then target = add
+        when '-' then target = remove
+        else target << c
+        end
+      end
+      bot.modes = (bot.modes | add) - remove
     end
 
     def quit(m, msg=nil)

data/lib/Zeta/admin/eval.rb

@@ -33,7 +33,7 @@ module Admin
 
     def botevalmsg(m, s)
       return unless Config.debug
-      return m.user.msg eval(s)
+      return m.user.send eval(s)
     rescue => e
       m.user.send "eval error: %s\n- %s (%s)" % [s, e.message, e.class.name]
     end

data/lib/Zeta/admin/fifo.rb

@@ -11,7 +11,7 @@ module Admin
 
     def open_fifo(m)
       # Sometimes FiFo is left open on crash, remove old fifo
-      if File.exists?(File.join(Dir.home, '.zeta', 'zeta.io'))
+      if File.exist?(File.join(Dir.home, '.zeta', 'zeta.io'))
         File.delete(File.join(Dir.home, '.zeta', 'zeta.io'))
       end
 

data/lib/Zeta/admin/ignore.rb

@@ -22,7 +22,7 @@ module Admin
     match 'ignorelist', method: :ignore_list
 
     def finalize
-      save_blacklist()
+      save_blacklist
     end
 
     # Methods
@@ -31,7 +31,7 @@ module Admin
       return m.reply("You can't ignore yourself") if m.user.nick == nickname
       u = User(nickname)
       if m.channel.users.member?(u)
-        if Blacklist.users.include? u
+        if Blacklist.users.include? u.to_s
           m.reply("#{nickname} is already being ignored")
         else
           Blacklist.users << u.to_s
@@ -40,7 +40,8 @@ module Admin
       else
         m.reply "#{nickname} isn't currently in channel"
       end
-      save_blacklist()
+
+      save_blacklist
     end
 
     def unignore_user(m, nickname)
@@ -52,7 +53,8 @@ module Admin
       else
         m.reply "#{nickname} isn't on the ignore list"
       end
-      save_blacklist()
+
+      save_blacklist
     end
 
     def disable_channel(m, channel=nil)
@@ -71,7 +73,8 @@ module Admin
           m.action_reply "has disabled #{m.channel.to_s} buffer"
         end
       end
-      save_blacklist()
+
+      save_blacklist
     end
 
     def enable_channel(m, channel=nil)
@@ -90,11 +93,12 @@ module Admin
           m.reply('Channel is currently enabled')
         end
       end
-      save_blacklist()
+
+      save_blacklist
     end
 
     def ignore_list(m)
-      m.reply "Currently ignored users are: #{Blacklist.users.join(', ')}"
+      m.reply "Currently, ignored users are: #{Blacklist.users.join(', ')}"
     end
 
 

data/lib/Zeta/admin/oper.rb

@@ -30,13 +30,13 @@ module Admin
     def oper_clearchan(m, chan, confirm=false)
       if confirm == 'yes' || confirm == 'true'
         Channel(chan).join
-        User('OperServ').send("mode #{chan} +o #{Zeta}")
+        User('OperServ').send("mode #{chan} +o #{@bot.nick}")
         User('OperServ').send("mode #{chan} +mi")
         Channel(chan).send('This channel is being cleared')
 
         number_killed = 0
         Channel(chan).users.each_key do |u|
-          if u != Zeta
+          if u != @bot
             number_killed += 1
             @bot.irc.send("KILL #{u.nick} This channel is being cleared")
           end

data/lib/Zeta/admin/plugins.rb

@@ -23,25 +23,36 @@ module Admin
         $1 + "_" + $2
       }.downcase # we downcase here to also catch the first letter
 
-      #file_name = "lib/plugins/#{mapping}.rb"
-      stdlib_plugin = File.join('Zeta', 'plugins', p.to_s)
-      custom_plugin = File.join(Dir.home, '.zeta', 'plugins', p.to_s, "#{p.to_s}.rb")
+      # Mapping becomes part of a file path; reject anything that could traverse directories
+      unless mapping.match?(/\A\w+\z/)
+        m.reply "Could not load #{plugin} because #{mapping} is not a valid plugin name."
+        return
+      end
+
+      custom_plugin = File.join(Dir.home, '.zeta', 'plugins', mapping, "#{mapping}.rb")
+      stdlib_plugin = File.expand_path(File.join('..', 'plugins', "#{mapping}.rb"), __dir__)
+      file_name = [custom_plugin, stdlib_plugin].find { |f| File.exist?(f) }
+
+      unless file_name
+        m.reply "Could not load #{plugin} because #{mapping}.rb does not exist."
+        return
+      end
 
-      unless File.exist?(custom_plugin)
-        m.reply "Could not load #{plugin} because #{file_name} does not exist."
+      existing = plugin_class(plugin)
+      if existing && @bot.plugins.any? { |p| p.instance_of?(existing) }
+        m.reply "#{plugin} is already loaded."
         return
       end
 
       begin
-        load(custom_plugin)
-      rescue
+        load(file_name)
+      rescue StandardError, ScriptError
         m.reply "Could not load #{plugin}."
         raise
       end
 
-      begin
-        const = Plugins.const_get(plugin)
-      rescue NameError
+      const = plugin_class(plugin)
+      unless const
         m.reply "Could not load #{plugin} because no matching class was found."
         return
       end
@@ -51,9 +62,8 @@ module Admin
     end
 
     def unload_plugin(m, plugin)
-      begin
-        plugin_class = Plugins.const_get(plugin)
-      rescue NameError
+      plugin_class = plugin_class(plugin)
+      unless plugin_class
         m.reply "Could not unload #{plugin} because no matching class was found."
         return
       end
@@ -92,14 +102,23 @@ module Admin
     end
 
     def set_option(m, plugin, option, value)
-      begin
-        const = Plugins.const_get(plugin)
-      rescue NameError
+      const = plugin_class(plugin)
+      unless const
         m.reply "Could not set plugin option for #{plugin} because no matching class was found."
         return
       end
       @bot.config.plugins.options[const][option.to_sym] = eval(value)
     end
+
+    private
+
+    # Bare `Plugins` here would resolve to this class, not the ::Plugins namespace.
+    def plugin_class(name)
+      const = ::Plugins.const_get(name, false)
+      const if const.is_a?(Class) && const.include?(Cinch::Plugin)
+    rescue NameError
+      nil
+    end
   end
 
 end

data/lib/Zeta/blacklist.rb

@@ -1,7 +1,9 @@
+require 'fileutils'
+
 BlackListStruct = Struct.new :channels, :users, :plugins, :urls, :masks
 
 # Load Cached
-if File.exists?(File.join(Dir.home, '.zeta', 'cache', 'blacklist.rb'))
+if File.exist?(File.join(Dir.home, '.zeta', 'cache', 'blacklist.rb'))
   File.open(File.join(Dir.home, '.zeta', 'cache', 'blacklist.rb')) do |file|
     Blacklist = Marshal.load(file)
   end
@@ -23,5 +25,5 @@ def clear_blacklist()
   Blacklist.channels = []
   Blacklist.urls = []
   Blacklist.masks = []
-  File.delete(File.join(Dir.home, '.zeta', 'cache', 'blacklist.rb'))
+  FileUtils.rm_f(File.join(Dir.home, '.zeta', 'cache', 'blacklist.rb'))
 end

data/lib/Zeta/botinfo.txt

@@ -0,0 +1,3 @@
+Hello I'm {bot_name}.
+I am currently trolling {total_users} users in {total_channels} channels with an uptime of {uptime}
+My master is {owner_name} and he has plugged me with {plugins_count_remaining} plugins

data/lib/Zeta/config.rb

@@ -34,7 +34,7 @@ ConfigStruct = Struct.new(
 # Initialize Config
 Config = ConfigStruct.new
 
-if File.exists? File.join(Dir.home, '.zeta', 'config.rb')
+if File.exist? File.join(Dir.home, '.zeta', 'config.rb')
   begin
     require File.join(Dir.home, '.zeta', 'config.rb')
   rescue => e

data/lib/Zeta/locale.rb

@@ -1,7 +1,7 @@
 def load_locale(file)
   Config.locale ||= 'en' # Default to english
 
-  if File.exists?( File.join(Dir.home, '.zeta', 'locale', Config.locale, "#{file}.yml") )
+  if File.exist?( File.join(Dir.home, '.zeta', 'locale', Config.locale, "#{file}.yml") )
     ## Overide included library if file exists
     YAML::load_file(
         File.join(Dir.home, '.zeta', 'locale', Config.locale, "#{file}.yml")

data/lib/Zeta/plugins/attack.rb

@@ -25,7 +25,8 @@ module Plugins
 
     # Methods
     def execute(m, target=nil)
-      target = target.rstrip
+      target = target&.rstrip
+      target = nil if target&.empty?
       target = m.user.nick if !target.nil? && target.match(/(\bmy\b|\b#{@bot.nick}\S*\b|\b\S*self\b)/i)
       target.gsub(/(\bmy\b|\b#{@bot.nick}\S*\b|\b\S*self\b)/i,m.user.nick+"'s") if !target.nil?;
        populate_attacks!

data/lib/Zeta/plugins/botinfo.rb

@@ -57,7 +57,7 @@ module Plugins
         uptime: ChronicDuration.output(Time.now.to_i - @started_at.to_i)
       }
 
-      tf = TagFormatter.new open(File.join(__dir__, '../botinfo.txt'),&:read), tags: tags
+      tf = TagFormatter.new File.read(File.join(__dir__, '../botinfo.txt')), tags: tags
 
       m.user.notice tf.parse
     end

data/lib/Zeta/plugins/darkscience.rb

@@ -40,7 +40,7 @@ module Plugins
             )
         )
       rescue RestClient::Unauthorized
-        msg.action_reply "isn't currently authorized to do that"
+        return msg.action_reply "isn't currently authorized to do that"
       end
 
       # Turn JSON into an object
@@ -73,7 +73,7 @@ module Plugins
             )
         )
       rescue RestClient::Unauthorized
-        msg.action_reply "isn't currently authorized to do that"
+        return msg.action_reply "isn't currently authorized to do that"
       end
 
       # Turn JSON into an object
@@ -114,7 +114,7 @@ module Plugins
             )
         )
       rescue RestClient::Unauthorized
-        msg.action_reply "isn't currently authorized to do that"
+        return msg.action_reply "isn't currently authorized to do that"
       end
 
       # Turn JSON into an object
@@ -152,7 +152,7 @@ module Plugins
         )
         quote = Hashie::Mash.new(request)
 
-        m.reply "Quote ##{quote.data.quote.quote_id} added by #{m.user}!"
+        m.reply "Quote ##{quote.response.quote.quote_id} added by #{m.user}!"
       rescue RestClient::Unauthorized
         m.action_reply "isn't currently authorized to do that"
       rescue
@@ -174,9 +174,9 @@ module Plugins
         )
         quote = Hashie::Mash.new(request)
 
-        return m.reply 'There is no quote by that ID' unless quote.data.quote
+        return m.reply 'There is no quote by that ID' unless quote.response.quote
 
-        m.reply "QDB##{quote.data.quote.quote_id}: #{quote.data.quote.content}"
+        m.reply "QDB##{quote.response.quote.quote_id}: #{quote.response.quote.content}"
       rescue RestClient::Unauthorized
         m.action_reply "isn't currently authorized to do that"
       rescue
@@ -197,7 +197,7 @@ module Plugins
         )
         quote = Hashie::Mash.new(request)
 
-        m.reply "QDB##{quote.data.quote.quote_id}: #{quote.data.quote.content}"
+        m.reply "QDB##{quote.response.quote.quote_id}: #{quote.response.quote.content}"
       rescue RestClient::Unauthorized
         m.action_reply "isn't currently authorized to do that"
       rescue

data/lib/Zeta/plugins/gif.rb

@@ -15,7 +15,7 @@ module Plugins
     def initialize(*args)
       super
       @imgurray = []
-      @last_update = Time
+      @last_update = Time.at(0)
     end
 
     match 'randomgif', method: :imgif
@@ -53,11 +53,12 @@ module Plugins
 
     def imgur
       # Cache results for 1 hour
-      if @imgurray.empty? || @last_update >= (Time.now + 3600)
+      if @imgurray.empty? || @last_update < (Time.now - 3600)
         parser = URI::Parser.new
 
         url = parser.escape('http://reddit.com/r/gifs.json')
         doc = JSON.load(RestClient.get(url).body)
+        @imgurray.clear
 
         doc['data']['children'].each_with_index do |post, index|
           if doc['data']['children'][index]['data']['url'].to_s =~ /imgur/

data/lib/Zeta/plugins/macros.rb

@@ -22,7 +22,7 @@ module Plugins
 
     match /reload/, method: :execute_reloadmacros, react_on: :private
     def execute_reloadmacros m
-      return unless check_user(m, :admin)
+      return unless check?(m, :admin, true)
       # return unless check_channel(m)
       begin
         # @macros = YAML::load_file($root_path + '/locales/macros.yml')
@@ -36,7 +36,8 @@ module Plugins
     match /(\w+)(?: (.+))?/, method: :execute_macro, group: :macro
     def execute_macro m, macro, arguments
       return unless @macros.has_key?(macro)
-      parse(arguments.to_s.rstrip, @macros[macro], m.channel, m.user)
+      input = arguments.to_s.strip
+      parse(input.empty? ? nil : input, @macros[macro], m.channel, m.user)
 
 
       # Guide to writing macros:

data/lib/Zeta/plugins/pdfinfo.rb

@@ -44,7 +44,7 @@ module Plugins
 
 
       # Get file and parse metadata
-      open(url, "rb") do |io|
+      URI.open(url, "rb") do |io|
         reader = PDF::Reader.new(io)
         creator = reader.info[:Creator] || 'Anon'
         producer = reader.info[:Producer] || 'Anon'

data/lib/Zeta/plugins/rainbow.rb

@@ -18,7 +18,7 @@ module Plugins
     set plugin_name: "Rainbow", help: "Rainbowificates your text.\nUsage: `?rainbow [text]`.\nUsage: `?eyerape [text]`.", suffix: /$/
 
     def rainbowification(s)
-      s.gsub(/\x03([0-9]{2}(,[0-9]{2})?)?/, "") # Because total function abuse.
+      s = s.gsub(/\x03([0-9]{2}(,[0-9]{2})?)?/, "") # Because total function abuse.
       colour = %w{04 07 08 09 10 06 13}
       i = Random.new.rand(0..colour.size-1);
       new_string = ""
@@ -31,7 +31,7 @@ module Plugins
 
     def eyerapeification(s)
       sd = s.dup
-      sd.gsub(/\x03([0-9]{2}(,[0-9]{2})?)?/, "") # Because total function abuse.
+      sd = sd.gsub(/\x03([0-9]{2}(,[0-9]{2})?)?/, "") # Because total function abuse.
       colour = %w{04 07 08 09 10 06 13}
       offset = Random.new.rand(0..colour.size-1)
       sd = "\x02" + sd.upcase.split(" ").map { |c|

data/lib/Zeta/plugins/russian_roulette.rb

@@ -84,7 +84,7 @@ module Plugins
 
     def end_game(channel, premature=false)
       @games.delete channel.name
-      channel.msg "Oh vell, it vas fun vhile it lasted." if premature
+      channel.send "Oh vell, it vas fun vhile it lasted." if premature
       sleep 1
       channel.action "holsters the pistol."
     end

data/lib/Zeta/plugins/seen.rb

@@ -24,7 +24,7 @@ module Plugins
 
     def listen(m)
       return if m.channel == '#services'
-      @users[m.user.nick] = SeenStruct.new(m.user, m.channel, Time.now)
+      @users[m.user.nick] = SeenStruct.new(m.user.nick, m.channel.name, Time.now)
     end
 
     def execute(m, nick)
@@ -33,7 +33,7 @@ module Plugins
         m.reply 'You are a Stupid human!'
       elsif nick == m.user.nick
         m.reply "Unfortunately, I see an idiot by the name of #{m.user.nick}"
-      elsif @users.key?(nick) && (@users[nick].where == m.channel)
+      elsif @users.key?(nick) && (@users[nick].where.to_s == m.channel.name)
         time_ago = time_ago_in_words(Time.at(@users[nick].time))
         m.reply "Seen ∴ \x0304#{@users[nick].who}\x0F was last seen talking in here about \x02#{time_ago}\x0F ago."
       else
@@ -53,7 +53,7 @@ module Plugins
     end
 
     def load_seen
-      if File.exists?(File.join(Dir.home, '.zeta', 'cache', 'seen.rb'))
+      if File.exist?(File.join(Dir.home, '.zeta', 'cache', 'seen.rb'))
         begin
           File.open(File.join(Dir.home, '.zeta', 'cache', 'seen.rb')) do |file|
             return Marshal.load(file)

data/lib/Zeta/plugins/silly.rb

@@ -71,8 +71,8 @@ module Plugins
 
     def halloween(m, tz = nil)
       tz ||= "-00:00"
-      tz = tzparser(tz)
       begin
+        tz = tzparser(tz)
         today = Time.now.localtime(tz)
         hw = Time.new(today.year, 10, 31, 0, 0, 0, tz)
         hw = hw.next_year if hw.to_date.past?
@@ -93,8 +93,8 @@ module Plugins
 
     def xmas(m, tz = nil)
       tz ||= "-00:00"
-      tz = tzparser(tz)
       begin
+        tz = tzparser(tz)
         today   = Time.now.localtime(tz)
         xmas    = Time.new(today.year, 12, 25, 0, 0, 0, tz)
         xmas    = xmas.next_year if xmas.to_date.past?
@@ -115,8 +115,8 @@ module Plugins
 
     def newyear(m, tz = nil)
       tz ||= "-00:00"
-      tz = tzparser(tz)
       begin
+        tz = tzparser(tz)
         today = Time.now.localtime(tz)
         nyear = Time.new(today.year.succ, 1, 1, 0, 0, 0, tz)
         #nyear = nyear.next_year if nyear.to_date.past?
@@ -137,8 +137,8 @@ module Plugins
 
     def tz(m, tz = nil)
       tz ||= "-00:00"
-      tz = tzparser(tz)
       begin
+        tz = tzparser(tz)
         today = Time.now.localtime(tz)
         message = today.to_s
       rescue ArgumentError => ae

data/lib/Zeta/plugins/snooper.rb

@@ -46,7 +46,7 @@ module Plugins
     meta tags, and paste the result back into the channel.
     HELP
 
-    match %r{\b((https?:\/\/)?(([0-9a-zA-Z_!~*'().&=+$%-]+:)?[0-9a-zA-Z_!~*'().&=+$%-]+\@)?(([0-9]{1,3}\.){3}[0-9]{1,3}|([0-9a-zA-Z_!~*'()-]+\.)*([0-9a-zA-Z][0-9a-zA-Z-]{0,61})?[0-9a-zA-Z]\.[a-zA-Z]{2,6})(:[0-9]{1,4})?((\/[0-9a-zA-Z_!~*'().;?:\@&=+$,%#-]+)*\/?))}i,
+    match %r{\b((https?:\/\/)?(([0-9a-zA-Z_!~*'().&=+$%-]+:)?[0-9a-zA-Z_!~*'().&=+$%-]+\@)?(([0-9]{1,3}\.){3}[0-9]{1,3}|([0-9a-zA-Z_!~*'()-]+\.)*([0-9a-zA-Z][0-9a-zA-Z-]{0,61})?[0-9a-zA-Z]\.[a-zA-Z]{2,63})(:[0-9]{1,5})?((\/[0-9a-zA-Z_!~*'().;?:\@&=+$,%#-]+)*\/?))}i,
           use_prefix: false,
           react_on: :channel
 
@@ -151,7 +151,7 @@ module Plugins
         error "[408] #{msg.user} - #{url}"
         msg.reply 'URL was forced Timed out'
       rescue => e
-        error e
+        error "#{e.class.name}: #{e.message}"
         error "[404] #{msg.user} - #{url}"
         msg.safe_reply 'I am unable to load that URL'
       end

data/lib/Zeta/plugins/weather.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'cgi/escape'
 require 'persist'
 require 'open-uri'
 require 'json'
@@ -24,8 +25,6 @@ module Plugins
     match /setw (.+)/, method: :set_location
     match /wx (.+)/, method: :weather
     match /weather (.+)/, method: :weather
-    match /almanac (.+)/, method: :almanac
-    match /hurricane/, method: :hurricane
 
     #####
     def initialize(*args)
@@ -41,7 +40,9 @@ module Plugins
       if !@store[msg.user.to_s].nil? && query.nil?
         stored_location, stored_source = @store[msg.user.to_s].split('::')
         stored_source = @api_src.include?(stored_source) ? stored_source : 'owm'
-        data = send("#{stored_source}_src", stored_location)
+        true_src = stored_source
+        query = stored_location
+        data = send("#{true_src}_src", query)
         # location = geolookup(@store[msg.user.to_s])
         # data = wunderground_src(stored_location, false)
       elsif query.nil?
@@ -74,9 +75,9 @@ module Plugins
       return msg.reply "No results found for #{query}." if data.nil?
 
       # Store and display general location
-      serial_location = "#{query}::#{src}"
+      serial_location = "#{query}::#{true_src}"
       @store[msg.user.to_s] = serial_location unless data.nil?
-      msg.reply "Your location is now set to #{data.ac.name}, #{data.ac.c}!"
+      msg.reply "Your location is now set to #{data.ac.formatted_address}!"
     end
 
     # -private
@@ -92,7 +93,7 @@ module Plugins
         ).body, object_class: OpenStruct
       )
 
-      return nil if ac.results.nil? ## Unable to locate
+      return nil if ac.results.blank? ## Unable to locate
 
       ac = ac.results[0]
       lat = ac.geometry.location.lat
@@ -108,6 +109,7 @@ module Plugins
       pressure = Unitwise(data.main.pressure.to_f, 'mbar')
       wind = Unitwise(data.wind.speed, 'kilometer')
 
+      data.ac = ac
       data.reply = "OWM ∴ #{ac.formatted_address} " \
                   "≈ #{(Time.now.utc + data.timezone.seconds).strftime("%c")} " \
                   "≈ #{data.weather[0].description},  #{temp.convert_to('[degF]').to_i.round(2)} F (#{temp.convert_to('Cel').to_i.round(2)} C) " \
@@ -127,7 +129,7 @@ module Plugins
         RestClient.get("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}").body,
         object_class: OpenStruct
       )
-      return nil if ac.results.nil? ## Unable to locate
+      return nil if ac.results.blank? ## Unable to locate
 
       ac = ac.results[0]
       lat = ac.geometry.location.lat
@@ -140,13 +142,13 @@ module Plugins
       return nil if stations.nil? ## Unable to find station. probably not in the USA
 
       parsed = JSON.parse(
-        RestClient.get("#{CGI.escape(stations['observationStations'][0])}/observations/current").body,
+        RestClient.get("#{stations['observationStations'][0]}/observations/current").body,
         object_class: OpenStruct
       )
 
       data = parsed.properties
       data.ac = ac
-      f = data.temperature.value * 9 / 5
+      f = data.temperature.value * 9 / 5.0 + 32
       temp = "#{f.round(2)} F (#{data.temperature.value.to_i.round(2)} C) "
       wind = "Gusts: #{data.windGust.value} avg: #{data.windSpeed.value.to_i.round(2)}"
       feelslike = "#{data.windChill.value.to_i.round(2)} C"