zetabot 2.0.6 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16c1d1f4332b4e23e28a90842e9f6ac17f2bfd929f71e6e43876214468a48eff
-  data.tar.gz: 74ddd8fdbb93519876d5e0c3d3388a28cef310142ac41fb70e09d30bf5f93289
+  metadata.gz: 5ca813b62e8520169331f3e978e82d7ae782c96727362bc21125cd973e164b8a
+  data.tar.gz: f34bf6917e3015268b7dfd16684731a79ba27f987810b1fcd2ad59a9d4609071
 SHA512:
-  metadata.gz: 5a1a4b0261e13073b9301d8526579d2b8a9edfb933e5788843961c6cc4856e3adf0be9d05874b42cb951d458bc6f58a2fcaf48feb52b75413882655df6062413
-  data.tar.gz: 2d824fc1a8eb17815a903d386385f77ef5253175f77a64c37c3952ff11e89bcdf368760cecaf15c51f8045e8c9bd7211b6bfd545f4abb81e9c79b4156c4f7712
+  metadata.gz: 2965b9a7c3858b703d606cb444bf76ce707a105dda0c2a51335d255b209264cf94abe44e626658d55baab6da14e4274764edda230da117c2a7a60dedd6ab67fb
+  data.tar.gz: b632e398611d098b88ac692f88c0c7833900a1117e773685c8c869926b0c4832c14b1052904a235677b65aea85131851d1b9b85ab224d12fab62f6c1c1e8d86b

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zetabot (2.0.5)
+    zetabot (2.0.9)
       actionview
       chronic
       chronic_duration
@@ -41,106 +41,127 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    Ascii85 (1.0.3)
-    actionview (6.0.1)
-      activesupport (= 6.0.1)
+    Ascii85 (1.1.0)
+    actionview (7.0.3)
+      activesupport (= 7.0.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.0.1)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     afm (0.2.2)
     ansi (1.5.0)
-    ast (2.4.0)
+    ast (2.4.2)
     binding.repl (3.0.0)
-    builder (3.2.3)
+    builder (3.2.4)
     cd (1.0.1)
     chronic (0.10.2)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
     cinch (2.3.4)
-    cinch-cooldown (1.2.0)
+    cinch-cooldown (1.2.1)
       cinch (~> 2)
       time-lord (~> 1.0, >= 1.0.1)
     cinch-quotes (0.0.4)
       cinch (~> 2.0)
-    cinch-toolbox (1.1.6)
+    cinch-toolbox (1.1.7)
       nokogiri (~> 1.6)
-    clipboard (1.3.3)
-    code (0.9.2)
+    clipboard (1.3.6)
+    code (0.9.3)
       coderay (~> 1.1)
-      method_source (~> 0.9)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    connection_pool (2.2.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    crass (1.0.5)
-    daemons (1.3.1)
-    debugging (1.1.1)
+      method_source (>= 0.9, < 2.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    connection_pool (2.2.5)
+    crack (0.4.5)
+      rexml
+    crass (1.0.6)
+    daemons (1.4.1)
+    debugging (1.1.2)
       binding.repl (~> 3.0)
       paint (>= 0.9, < 3.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     destructor (0.1.0)
-    diff-lcs (1.3)
-    discourse_api (0.38.0)
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.10)
+    diff-lcs (1.5.0)
+    discourse_api (1.0.0)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0)
       rack (>= 1.6)
-    dnsbl-client (1.0.4)
+    dnsbl-client (1.0.6)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dronebl.rb (0.1.0.0)
       httparty (~> 0.13)
       nokogiri (~> 1.6)
-    erubi (1.9.0)
-    every_day_irb (2.1.0)
+    erubi (1.10.0)
+    every_day_irb (2.1.1)
       cd (~> 1.0)
-    fancy_irb (1.2.1)
+    fancy_irb (1.4.3)
       paint (>= 0.9, < 3.0)
-      unicode-display_width (~> 1.1)
-    faraday (0.17.1)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
-    ffi (1.11.3)
-    geocoder (1.5.2)
-    gist (5.0.0)
-    github_api (0.18.2)
+      unicode-display_width (>= 1.1)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    ffi (1.15.5)
+    geocoder (1.8.0)
+    gist (6.0.0)
+    github_api (0.19.0)
       addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8)
+      faraday (>= 0.8, < 2)
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    haml (5.1.2)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
     hashery (2.1.2)
     hashie (3.6.0)
     hirb (0.7.3)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
-    httparty (0.17.1)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     humanize-bytes (2.2.0)
-    i18n (1.7.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     interactive_editor (0.0.11)
       spoon (>= 0.0.1)
+    io-console (0.5.11)
     ipaddress (0.8.3)
-    irb (1.1.0)
-      reline (>= 0.0.1)
-    irbtools (3.0.1)
+    irb (1.4.1)
+      reline (>= 0.3.0)
+    irbtools (3.0.5)
       binding.repl (~> 3.0)
       clipboard (~> 1.3)
       code (>= 0.9.2, < 2.0)
@@ -151,7 +172,7 @@ GEM
       hirb (~> 0.7, >= 0.7.3)
       interactive_editor (~> 0.0, >= 0.0.10)
       irb (>= 0.9.6)
-      methodfinder (~> 2.2)
+      methodfinder (~> 2.2, >= 2.2.2)
       object_shadow (~> 1.1)
       ori (~> 0.1.0)
       os
@@ -159,101 +180,105 @@ GEM
       ruby_engine (~> 1.0)
       ruby_info (~> 1.0)
       ruby_version (~> 1.0)
-      wirb (~> 2.0)
+      wirb (~> 2.0, >= 2.2.1)
     iso8601 (0.9.1)
-    jwt (2.2.1)
+    jwt (2.4.1)
     liner (0.2.4)
-    loofah (2.4.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mechanize (2.7.6)
-      domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0)
-      mime-types (>= 1.17.2)
-      net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (>= 2.5.2)
-      nokogiri (~> 1.6)
-      ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (>= 0.0.9, < 0.2)
+    mechanize (2.8.5)
+      addressable (~> 2.8)
+      domain_name (~> 0.5, >= 0.5.20190701)
+      http-cookie (~> 1.0, >= 1.0.3)
+      mime-types (~> 3.0)
+      net-http-digest_auth (~> 1.4, >= 1.4.1)
+      net-http-persistent (>= 2.5.2, < 5.0.dev)
+      nokogiri (~> 1.11, >= 1.11.2)
+      rubyntlm (~> 0.6, >= 0.6.3)
+      webrick (~> 1.7)
+      webrobots (~> 0.1.2)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    method_source (0.9.2)
-    methodfinder (2.2.1)
-    mime-types (3.3)
+    method_source (1.0.0)
+    methodfinder (2.2.4)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    mime-types-data (3.2022.0105)
+    minitest (5.15.0)
     mkfifo (0.1.1)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     net-http-digest_auth (1.4.1)
-    net-http-persistent (3.1.0)
+    net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
     net_http_timeout_errors (0.3.5)
     netrc (0.11.0)
-    nokogiri (1.10.7)
-      mini_portile2 (~> 2.4.0)
-    ntlm-http (0.1.1)
+    nokogiri (1.13.6-x86_64-darwin)
+      racc (~> 1.4)
     numerizer (0.1.1)
-    oauth2 (1.4.2)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (1.4.9)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    object_shadow (1.1.0)
-    oga (2.15)
+    object_shadow (1.1.1)
+    oga (3.3)
       ast
       ruby-ll (~> 2.1)
     ori (0.1.0)
-    os (1.0.1)
-    paint (2.1.1)
+    os (1.1.4)
+    paint (2.2.1)
     parslet (1.8.2)
-    pdf-reader (2.4.0)
-      Ascii85 (~> 1.0.0)
+    pdf-reader (2.10.0)
+      Ascii85 (~> 1.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
     persist (1.0.0)
-    public_suffix (4.0.1)
-    rack (2.0.7)
+    public_suffix (4.0.7)
+    racc (1.6.0)
+    rack (2.2.3.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     rake (10.5.0)
-    recursive-open-struct (1.1.0)
-    reline (0.0.7)
+    recursive-open-struct (1.1.3)
+    reline (0.3.1)
+      io-console (~> 0.5)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     ruby-ll (2.1.2)
       ansi
       ast
     ruby-rc4 (0.1.5)
+    ruby2_keywords (0.0.5)
     ruby_engine (1.0.1)
     ruby_info (1.0.1)
-    ruby_version (1.0.1)
-    safe_yaml (1.0.5)
+    ruby_version (1.0.2)
+    rubyntlm (0.6.3)
     signed_multiset (0.2.1)
     spoon (0.0.6)
       ffi
@@ -262,40 +287,40 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.10)
     time-lord (1.0.1)
-    ttfunk (1.5.1)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    ttfunk (1.7.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
-    unicode-display_width (1.6.0)
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.1.0)
     unitwise (2.2.0)
       liner (~> 0.2)
       memoizable (~> 0.4)
       parslet (~> 1.5)
       signed_multiset (~> 0.2)
-    video_info (2.7)
+    video_info (3.0.2)
       iso8601 (~> 0.9.1)
       net_http_timeout_errors (~> 0.3.0)
-      oga (~> 2.7)
+      oga (~> 3.0)
+    webrick (1.7.0)
     webrobots (0.1.2)
-    wirb (2.2.0)
+    wirb (2.2.2)
       paint (>= 0.9, < 3.0)
     wolfram (0.2.1)
       nokogiri (>= 1.4.3)
     wolfram-alpha (0.3.1)
       nokogiri
-    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.11)
+  bundler (~> 2.3)
   irbtools
   rake (~> 10.0)
   rspec (~> 3.0)
   zetabot!
 
 BUNDLED WITH
-   1.17.2
+   2.3.15

data/Zeta.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", "~> 2.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "irbtools"

data/lib/Zeta/admin/autovoice.rb

@@ -0,0 +1,42 @@
+module Admin
+  class AutoVoice
+    include Cinch::Plugin
+    include Cinch::Helpers
+    enable_acl()
+
+    # Listeners
+    listen_to :join, method: :autovoice
+
+    match /autovoice (.+)/, method: :autovoice_mode
+
+    def initialize(*args)
+      @auto_voice_state = Array.new
+      super
+    end
+
+    def autovoice_mode(msg, mode='status')
+      return unless msg.user.oper?
+
+      if mode == 'on' || mode == 'true'
+        @auto_voice_state << msg.channel.to_s
+        return msg.reply "AutoVoice is now enabled!"
+      elsif mode == 'off' || mode == 'false'
+        @auto_voice_state.delete_if { _1 == msg.channel.to_s }
+        return msg.reply "AutoVoice is now disabled!"
+      end
+
+      msg.reply "AutoVoice is currently: #{@auto_voice_state.include?(msg.channel.to_s) ? 'On' : 'Off'}"
+    end
+
+    # Methods
+    def autovoice(msg)
+      if @auto_voice_state.include?(msg.channel.to_s) && msg.user.authed?
+        Channel(msg.channel).voice(msg.user)
+      end
+    end
+
+  end
+end
+
+# AutoLoad
+Bot.config.plugins.plugins.push Admin::AutoVoice

data/lib/Zeta/admin.rb

@@ -8,4 +8,5 @@ require 'Zeta/admin/users'
 require 'Zeta/admin/autojoin'
 require 'Zeta/admin/ignore'
 require 'Zeta/admin/bot'
-require 'Zeta/admin/blacklister'
+require 'Zeta/admin/blacklister'
+require 'Zeta/admin/autovoice'

data/lib/Zeta/plugins/fml.rb

@@ -23,7 +23,7 @@ module Plugins
     def fetch_random_fml
       url = 'http://www.fmylife.com/random'
       # fml_story = Nokogiri.HTML(RestClient.get(url)).at('div.article').text.strip
-      fml_story = Nokogiri.HTML(open(url).read).at('div.article').text.strip
+      fml_story = Nokogiri.HTML(RestClient.get(url).body).at('div.article').text.strip
       fml_story[/^Today, (.+) FML/]
     rescue => e
       e.message

data/lib/Zeta/plugins/gif.rb

@@ -33,8 +33,10 @@ module Plugins
     private
 
     def search(query)
-      url = URI.encode "http://www.gifbin.com/search/#{query}/"
-      doc = Nokogiri::HTML( open(url) )
+      parser = URI::Parser.new
+      url = parser.escape "http://www.gifbin.com/search/#{query}/"
+
+      doc = Nokogiri::HTML( RestClient.get(url).body )
       e = doc.css('.thumbs li').length
       return "No Results Found" if e == 0
       result = doc.css('.thumbs li')[rand(e)].css('a img').attribute('src').text.gsub(/tn_/, '')
@@ -42,16 +44,20 @@ module Plugins
     end
 
     def gifbin
-      url = URI.encode 'http://www.gifbin.com/random'
-      doc = Nokogiri.HTML(open url)
+      parser = URI::Parser.new
+
+      url = parser.escape 'http://www.gifbin.com/random'
+      doc = Nokogiri.HTML(RestClient.get(url).body)
       doc.css('div#gifcontainer a img').attribute('src').text
     end
 
     def imgur
       # Cache results for 1 hour
       if @imgurray.empty? || @last_update >= (Time.now + 3600)
-        url = URI.encode('http://reddit.com/r/gifs.json')
-        doc = JSON.load(open(url))
+        parser = URI::Parser.new
+
+        url = parser.escape('http://reddit.com/r/gifs.json')
+        doc = JSON.load(RestClient.get(url).body)
 
         doc['data']['children'].each_with_index do |post, index|
           if doc['data']['children'][index]['data']['url'].to_s =~ /imgur/

data/lib/Zeta/plugins/movie.rb

@@ -25,11 +25,14 @@ module Plugins
 
     private
     def query_movie(m)
+      parser = URI::Parser.new
+
       year = m[/:\d+/].gsub(/:/, '') if m[/:\d+/]
-      movie = URI.encode(m.gsub(/:\d+/, ''))
+      movie = parser.escape(m.gsub(/:\d+/, ''))
+
       data = JSON.parse(
           # RestClient.get("http://www.omdbapi.com/?t=#{movie}&y=#{year}")
-          open("http://www.omdbapi.com/?t=#{movie}&y=#{year}&apikey=#{Config.secrets[:omdb]}").read
+        RestClient.get("http://www.omdbapi.com/?t=#{movie}&y=#{year}&apikey=#{Config.secrets[:omdb]}").body
       )
       OpenStruct.new(
           title:       data['Title'],

data/lib/Zeta/plugins/{whois.rb → noticeme.rb}

@@ -1,18 +1,18 @@
 module Plugins
-  class Whois
+  class Noticeme
     include Cinch::Plugin
     include Cinch::Helpers
 
     # enable_acl
 
-    self.plugin_name = 'Whois'
-    self.help        = 'Resync your user'
+    self.plugin_name = 'Notice ME!'
+    self.help        = 'Make sure zeta can see me!'
 
     # Regex
-    match 'whois', method: :do_whois
+    match 'noticeme', method: :notice_me
 
     # Methods
-    def do_whois(m)
+    def notice_me(m)
       m.user.refresh
       m.user.notice "Refreshing #{m.user.nick}"
     end
@@ -22,4 +22,4 @@ module Plugins
 end
 
 # AutoLoad
-Bot.config.plugins.plugins.push Plugins::Whois
+Bot.config.plugins.plugins.push Plugins::Noticeme

data/lib/Zeta/plugins/snooper.rb

@@ -51,8 +51,9 @@ module Plugins
           react_on: :channel
 
     def execute(msg, url)
+      parser = URI::Parser.new
       url = "http://#{url}" unless url=~/^https?:\/\//
-      url = URI.encode(url)
+      url = parser.escape(url)
 
       # Ignore items on blacklist
       # blacklist = DEFAULT_BLACKLIST.dup

data/lib/Zeta/plugins/urban.rb

@@ -23,10 +23,11 @@ module Plugins
 
 
     def wotd(m)
-      url = URI.encode "http://www.urbandictionary.com/"
+      parser = URI::Parser.new
+      url = parser.escape("http://www.urbandictionary.com/")
+
       doc = Nokogiri.HTML(
-          # RestClient.get(url)
-          open(url)
+          RestClient.get(url).body
       )
       word = doc.at_css('.word').text.strip[0..40]
       meaning = doc.at_css('.meaning').text.strip[0..450] + "... \u263A"
@@ -35,13 +36,12 @@ module Plugins
 
     private
     def search(query)
-      url = URI.encode "http://api.urbandictionary.com/v0/define?term=#{query}"
-      # Nokogiri.HTML(open url).at_css('.meaning').text.strip[0..500]
+      parser = URI::Parser.new
+      url = parser.escape "http://api.urbandictionary.com/v0/define?term=#{query}"
 
       # Load API data
       data = JSON.parse(
-          #RestClient.get(url)
-          open(url).read
+          RestClient.get(url).body
       )
 
       # Return if nothing is found

data/lib/Zeta/plugins/weather.rb

@@ -87,21 +87,21 @@ module Plugins
       location = CGI.escape(location)
 
       ac = JSON.parse(
-        open(
+        RestClient.get(
           "https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}"
-        ).read, object_class: OpenStruct
+        ).body, object_class: OpenStruct
       )
 
       return nil if ac.results.nil? ## Unable to locate
 
       ac = ac.results[0]
-      lat = CGI.escape(ac.geometry.location.lat)
-      lon = CGI.escape(ac.geometry.location.lng)
+      lat = ac.geometry.location.lat
+      lon = ac.geometry.location.lng
 
       # Get Data
       data = JSON.parse(
-        open("https://api.openweathermap.org/data/2.5/weather?lat=#{lat}&lon=#{lon}&APPID=#{Config.secrets[:owm]}"
-        ).read, object_class: OpenStruct
+        RestClient.get("https://api.openweathermap.org/data/2.5/weather?lat=#{lat}&lon=#{lon}&APPID=#{Config.secrets[:owm]}"
+        ).body, object_class: OpenStruct
       )
 
       temp = Unitwise(data.main.temp, 'K') # Data is given in kelvin
@@ -124,7 +124,7 @@ module Plugins
       location = CGI.escape(location)
 
       ac = JSON.parse(
-        open("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}").read,
+        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
@@ -134,7 +134,7 @@ module Plugins
       lon = ac.geometry.location.lng
 
       data = JSON.parse(
-        open("https://api.darksky.net/forecast/#{Config.secrets[:darksky]}/#{lat},#{lon}").read,
+        RestClient.get("https://api.darksky.net/forecast/#{Config.secrets[:darksky]}/#{lat},#{lon}").body,
         object_class: OpenStruct
       )
       data.ac = ac
@@ -165,7 +165,7 @@ module Plugins
       location = CGI.escape(location)
 
       ac = JSON.parse(
-        open("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}").read,
+        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
@@ -175,13 +175,13 @@ module Plugins
       lon = ac.geometry.location.lng
 
       stations = JSON.parse(
-        open("https://api.weather.gov/points/#{lat},#{lon}/stations/").read
+        RestClient.get("https://api.weather.gov/points/#{lat},#{lon}/stations/").body
       ) rescue nil
 
       return nil if stations.nil? ## Unable to find station. probably not in the USA
 
       parsed = JSON.parse(
-        open("#{CGI.escape(stations['observationStations'][0])}/observations/current").read,
+        RestClient.get("#{CGI.escape(stations['observationStations'][0])}/observations/current").body,
         object_class: OpenStruct
       )
 

data/lib/Zeta/plugins/wolfram.rb

@@ -17,14 +17,16 @@ module Plugins
     match /calc (.+)/, method: :calculate
 
     def calculate(m, query)
-      # Rescue incase something goes wrong
+      # Rescue in case something goes wrong
       begin
-        debug 'Query: ' + CGI.escape(query)
         url = "http://api.wolframalpha.com/v2/query?input=#{CGI.escape(query)}&appid=#{Config.secrets[:wolfram]}&primary=true&format=plaintext"
-        request = open(url).read
+        request = RestClient.get(url).body
+
         data = Crack::XML.parse(request)
+
         pod0 = data['queryresult']['pod'][0]['subpod']['plaintext'].strip
         pod1 = data['queryresult']['pod'][1]['subpod']['plaintext'].strip
+
         return 'Unable to get a results' if pod0.nil?
 
         if pod1.lines.count > 2

data/lib/Zeta/version.rb

@@ -1,3 +1,3 @@
 module Zeta
-  VERSION = '2.0.6'
+  VERSION = '2.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.9
 platform: ruby
 authors:
 - Liothen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-08 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -556,7 +556,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - liothen@flagrun.net
 executables:
@@ -566,6 +566,7 @@ extra_rdoc_files: []
 files:
 - ".bundle/config"
 - ".gitignore"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -579,6 +580,7 @@ files:
 - lib/Zeta/access.rb
 - lib/Zeta/admin.rb
 - lib/Zeta/admin/autojoin.rb
+- lib/Zeta/admin/autovoice.rb
 - lib/Zeta/admin/blacklister.rb
 - lib/Zeta/admin/bot.rb
 - lib/Zeta/admin/channels.rb
@@ -621,6 +623,7 @@ files:
 - lib/Zeta/plugins/help.rb
 - lib/Zeta/plugins/macros.rb
 - lib/Zeta/plugins/movie.rb
+- lib/Zeta/plugins/noticeme.rb
 - lib/Zeta/plugins/pdfinfo.rb
 - lib/Zeta/plugins/rainbow.rb
 - lib/Zeta/plugins/russian_roulette.rb
@@ -629,7 +632,6 @@ files:
 - lib/Zeta/plugins/snooper.rb
 - lib/Zeta/plugins/urban.rb
 - lib/Zeta/plugins/weather.rb
-- lib/Zeta/plugins/whois.rb
 - lib/Zeta/plugins/wiki.rb
 - lib/Zeta/plugins/wolfram.rb
 - lib/Zeta/tasks/db.rb
@@ -641,7 +643,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -656,8 +658,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Zeta is a IRC bot written in ruby using the Cinch Framework
 test_files: []