zetabot 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3cf112f4395bf4c81f0738640cd8b31bed1ad8749e52cb8fe1a985386bc1b59
-  data.tar.gz: a184fedf9faab0a30c2be0af85845825f11f7b6ff1150534c7c0e0ed9a562fe0
+  metadata.gz: 46af2180fa140b7a4a13ff6aa3238a10641aa49aacd602c1681aa188ba086925
+  data.tar.gz: e9fadf22b7c2ea0e310ab6161a06be6e259ca5b85c469e0cc36e6b0c65be54bc
 SHA512:
-  metadata.gz: 04f5b194486be8bcf98da12942e7c065acaa2bcb3c8a37c0cc6ed984699a3423f9cfc46a50b81509f8b91b3006e42bdf1f1d44a696e0be56fb44d5b6203ba5b9
-  data.tar.gz: fa58eb2c5284d4926290a37fe8eecdf23237752d03e7c047804f52722b3c7ed1f825e82fdaad938b6669960e93b81e2cee0ed4ae9e5562af929e00ddc6ad4714
+  metadata.gz: df6c87ba8cffd091d528aeae97be147f5e0e4ed3fd13f1523c43b79112ceb75ffe749040875b08a0921c80336dc59400c17cd3e56d3689061b1dd619414a7a1e
+  data.tar.gz: 807a2d87d838cb17b5e79adcc5ba154d2b207446edf0135eecf58ca846f3b22b44e410cf491096a59f3b165f246cfef787c3422f3fb84cd98865eefbe9744f0f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zetabot (2.0.9)
+    zetabot (2.1.1)
       actionview
       chronic
       chronic_duration
@@ -26,7 +26,7 @@ PATH
       ipaddress
       mechanize
       mkfifo
-      nokogiri
+      nokogiri (~> 1.13.6)
       pdf-reader
       persist
       recursive-open-struct
@@ -42,19 +42,19 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
-    actionview (7.0.3)
-      activesupport (= 7.0.3)
+    actionview (7.0.4.3)
+      activesupport (= 7.0.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.3)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     afm (0.2.2)
     ansi (1.5.0)
     ast (2.4.2)
@@ -77,8 +77,8 @@ GEM
       coderay (~> 1.1)
       method_source (>= 0.9, < 2.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    connection_pool (2.2.5)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -90,23 +90,23 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     destructor (0.1.0)
     diff-lcs (1.5.0)
-    discourse_api (1.0.0)
+    discourse_api (1.1.0)
       faraday (~> 1.0)
       faraday_middleware (~> 1.0)
       rack (>= 1.6)
-    dnsbl-client (1.0.6)
+    dnsbl-client (1.1.1)
     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.10.0)
+    erubi (1.12.0)
     every_day_irb (2.1.1)
       cd (~> 1.0)
     fancy_irb (1.4.3)
       paint (>= 0.9, < 3.0)
       unicode-display_width (>= 1.1)
-    faraday (1.10.0)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -132,7 +132,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     ffi (1.15.5)
-    geocoder (1.8.0)
+    geocoder (1.8.1)
     gist (6.0.0)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -140,8 +140,9 @@ GEM
       faraday (>= 0.8, < 2)
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    haml (6.1.1)
+      temple (>= 0.8.2)
+      thor
       tilt
     hashery (2.1.2)
     hashie (3.6.0)
@@ -149,11 +150,11 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    httparty (0.20.0)
-      mime-types (~> 3.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     humanize-bytes (2.2.0)
-    i18n (1.10.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     interactive_editor (0.0.11)
       spoon (>= 0.0.1)
@@ -181,13 +182,13 @@ GEM
       ruby_info (~> 1.0)
       ruby_version (~> 1.0)
       wirb (~> 2.0, >= 2.2.1)
-    iso8601 (0.9.1)
-    jwt (2.4.1)
+    iso8601 (0.13.0)
+    jwt (2.7.0)
     liner (0.2.4)
-    loofah (2.18.0)
+    loofah (2.20.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mechanize (2.8.5)
+    mechanize (2.9.1)
       addressable (~> 2.8)
       domain_name (~> 0.5, >= 0.5.20190701)
       http-cookie (~> 1.0, >= 1.0.3)
@@ -204,49 +205,52 @@ GEM
     methodfinder (2.2.4)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    minitest (5.15.0)
+    mime-types-data (3.2023.0218.1)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.7)
+    minitest (5.18.0)
     mkfifo (0.1.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
+    multipart-post (2.3.0)
     net-http-digest_auth (1.4.1)
-    net-http-persistent (4.0.1)
+    net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net_http_timeout_errors (0.3.5)
+    net_http_timeout_errors (1.0.0)
     netrc (0.11.0)
-    nokogiri (1.13.6-x86_64-darwin)
+    nokogiri (1.13.10)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     numerizer (0.1.1)
-    oauth2 (1.4.9)
+    oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
     object_shadow (1.1.1)
-    oga (3.3)
+    oga (3.4)
       ast
       ruby-ll (~> 2.1)
     ori (0.1.0)
     os (1.1.4)
     paint (2.2.1)
-    parslet (1.8.2)
-    pdf-reader (2.10.0)
+    parslet (2.0.0)
+    pdf-reader (2.11.0)
       Ascii85 (~> 1.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
     persist (1.0.0)
-    public_suffix (4.0.7)
-    racc (1.6.0)
-    rack (2.2.3.1)
+    public_suffix (5.0.1)
+    racc (1.8.0)
+    rack (3.0.7)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
     rake (10.5.0)
     recursive-open-struct (1.1.3)
     reline (0.3.1)
@@ -283,27 +287,28 @@ GEM
     spoon (0.0.6)
       ffi
     tag_formatter (0.0.3)
-    temple (0.8.2)
+    temple (0.10.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
-    tilt (2.0.10)
+    tilt (2.1.0)
     time-lord (1.0.1)
     ttfunk (1.7.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (2.1.0)
-    unitwise (2.2.0)
+    unitwise (2.3.0)
       liner (~> 0.2)
       memoizable (~> 0.4)
-      parslet (~> 1.5)
+      parslet (~> 2.0)
       signed_multiset (~> 0.2)
-    video_info (3.0.2)
-      iso8601 (~> 0.9.1)
-      net_http_timeout_errors (~> 0.3.0)
-      oga (~> 3.0)
-    webrick (1.7.0)
+    video_info (4.0.0)
+      iso8601 (~> 0.13.0)
+      net_http_timeout_errors (~> 1.0.0)
+      oga (~> 3.4)
+    webrick (1.8.1)
     webrobots (0.1.2)
     wirb (2.2.2)
       paint (>= 0.9, < 3.0)
@@ -316,11 +321,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.3)
+  bundler (~> 2.4)
   irbtools
   rake (~> 10.0)
   rspec (~> 3.0)
   zetabot!
 
 BUNDLED WITH
-   2.3.15
+   2.4.22

data/README.md

@@ -3,23 +3,31 @@ Cinch IRC bot written with plenty of help. I will not claim any of the plugins
 And will try to get the correct credits in source
 
 # Installation
-Zeta requires ruby >= 2.5.0 and rubygems. Installation beyond that is simple
+Zeta requires ruby >= 2.7.6 and rubygems. Installation beyond that is simple
 
 _Steps_
 * gem install zetabot
 * zetabot
 
+
+_Docker_
+
+Zeta will need its config file mounted in the `.zeta/config.rb` image for her to function. 
+
+```dockerfile
+FROM docker.io/ruby:2.7.6
+RUN useradd zeta -m
+USER zeta
+WORKDIR /home/zeta/
+RUN mkdir .zeta .zeta/cache .zeta/log && \
+    gem install zetabot
+# Run zeta
+CMD [ "zetabot"]
+```
+
 _Plugins_
 All plugins are automatically loaded that are in the plugins directory
 
-# Upgrade
-_Steps_
-* git pull
-* bundle
-* update config files to new examples
-* ruby ./migrate.rb
-* ruby ./zeta.rb
-
 ## Commands
 roles: owner,admin,operator,halfop,voice,nobody
 prefix: ?

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", "~> 2.3"
+  spec.add_development_dependency "bundler", "~> 2.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "irbtools"
@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'cinch-quotes'
 
   spec.add_dependency 'mkfifo'
-  spec.add_dependency 'nokogiri'
+  spec.add_dependency 'nokogiri', "~> 1.13.6"
   spec.add_dependency 'dronebl.rb'
   spec.add_dependency 'dnsbl-client'
 

data/lib/Zeta/config.rb

@@ -27,6 +27,8 @@ ConfigStruct = Struct.new(
                          :secure_host,
                          :options,
                          :debug,
+                         :quotes_api_key,
+                         :quotes_api_url,
                          :secrets
 )
 # Initialize Config

data/lib/Zeta/plugins/darkscience.rb

@@ -34,7 +34,7 @@ module Plugins
             RestClient.post(
                 'https://darchoods.net/api/irc/channel/view',
                 {
-                  auth_token: Config.secrets[:darkscience],
+                  auth_token: Config.quotes_api_key,
                   channel: chan,
                 }
             )
@@ -67,7 +67,7 @@ module Plugins
             RestClient.post(
                 'https://darchoods.net/api/irc/user/view',
                 {
-                  auth_token: Config.secrets[:darkscience],
+                  auth_token: Config.quotes_api_key,
                   username: nick,
                 }
             )
@@ -106,9 +106,9 @@ module Plugins
       begin
         data = JSON.parse(
             RestClient.post(
-                'https://darchoods.net/api/irc/user/view',
+                "https://#{Config.quotes_api_url}/api/irc/user/view",
                 {
-                  auth_token: Config.secrets[:darkscience],
+                  auth_token: Config.quotes_api_key,
                   username: nick,
                 }
             )
@@ -141,9 +141,9 @@ module Plugins
       begin
         request = JSON.parse(
             RestClient.post(
-                'https://darchoods.net/api/qdb/create',
+              "https://#{Config.quotes_api_url}/api/qdb/create",
                 {
-                  auth_token: Config.secrets[:darkscience],
+                  auth_token: Config.quotes_api_key,
                   channel: m.channel,
                   author: m.user,
                   quote: quote
@@ -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
@@ -164,9 +164,9 @@ module Plugins
       begin
         request = JSON.parse(
             RestClient.post(
-                'https://darchoods.net/api/qdb/search/byId',
+              "https://#{Config.quotes_api_url}/api/qdb/search/byId",
                 {
-                  auth_token: Config.secrets[:darkscience],
+                  auth_token: Config.quotes_api_key,
                   channel: m.channel,
                   quote_id: search
                 }
@@ -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
@@ -189,15 +189,15 @@ module Plugins
       begin
         request = JSON.parse(
             RestClient.post(
-                'https://darchoods.net/api/qdb/random',
-                { auth_token: Config.secrets[:darkscience],
+              "https://#{Config.quotes_api_url}/api/qdb/random",
+                { auth_token: Config.quotes_api_key,
                   channel: m.channel
                 }
             )
         )
         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/weather.rb

@@ -29,7 +29,7 @@ module Plugins
 
     #####
     def initialize(*args)
-      @api_src = %w{wu noaa darksky owm}
+      @api_src = %w{noaa owm}
       @store = Persist.new(File.join(Dir.home, '.zeta', 'cache', 'weather.pstore'))
       super
     end
@@ -40,17 +40,17 @@ module Plugins
       # Lookup user from pstore
       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 : 'darksky'
+        stored_source = @api_src.include?(stored_source) ? stored_source : 'owm'
         data = send("#{stored_source}_src", stored_location)
         # location = geolookup(@store[msg.user.to_s])
         # data = wunderground_src(stored_location, false)
       elsif query.nil?
-        return msg.reply 'No location set. ?setw <location> :(darksky|noaa|apixu|owm)'
+        return msg.reply 'No location set. ?setw <location> :(noaa|owm)'
       else
         # data = wu_src(query, true)
         src = query[/:\w+/].gsub(/:/, '') if query[/:\w+/]
         query = query.gsub(/:\w+/, '').strip if query
-        true_src = @api_src.include?(src) ? src : 'darksky'
+        true_src = @api_src.include?(src) ? src : 'owm'
         data = send("#{true_src}_src", query)
       end
 
@@ -67,7 +67,7 @@ module Plugins
       query = query.gsub(/:\w+/, '').strip if query
 
       # Sanity Check
-      true_src = @api_src.include?(src) ? src : 'darksky'
+      true_src = @api_src.include?(src) ? src : 'owm'
       data = send("#{true_src}_src", query)
 
       # Error
@@ -119,47 +119,6 @@ module Plugins
       return data
     end
 
-    # DarkSky - https://darksky.net/dev
-    def darksky_src(location)
-      location = CGI.escape(location)
-
-      ac = JSON.parse(
-        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
-
-      ac = ac.results[0]
-      lat = ac.geometry.location.lat
-      lon = ac.geometry.location.lng
-
-      data = JSON.parse(
-        RestClient.get("https://api.darksky.net/forecast/#{Config.secrets[:darksky]}/#{lat},#{lon}").body,
-        object_class: OpenStruct
-      )
-      data.ac = ac
-      current = data.currently
-      alerts = data.alerts.count rescue 0
-      c = Unitwise(current.temperature, '[degF]').convert_to('Cel').to_i
-      c_feels = Unitwise(current.apparentTemperature, '[degF]').convert_to('Cel').to_i
-      p = Unitwise(current.pressure.to_f, 'mbar')
-      gusts = Unitwise(current.windGust, 'mile').convert_to('kilometer').to_i
-
-      tempstring = "#{current.temperature.to_i} F (#{c} C)"
-
-      data.reply = "DS ∴ #{ac.formatted_address} " \
-                  "≈ #{TZInfo::Timezone.get(data.timezone).now.strftime("%c")} " \
-                  "≈ #{current.summary} #{tempstring} " \
-                  "≈ Humidity: #{(current.humidity * 100).round(2)}% " \
-                  "≈ Pressure: #{p.convert_to('[in_i\'Hg]').to_f.round(2)} in/Hg " \
-                  "(#{p.convert_to("kPa").to_f.round(2)} kPa) " \
-                  "≈ Wind: gusts upto #{current.windGust} mph (#{gusts} km/h) ≈ Alerts: #{alerts} ∴"
-
-      return data
-      # rescue
-      #   return nil
-    end
-
     # NOAA - https://graphical.weather.gov/xml/
     def noaa_src(location)
       location = CGI.escape(location)

data/lib/Zeta/version.rb

@@ -1,3 +1,3 @@
 module Zeta
-  VERSION = '2.1.0'
+  VERSION = '2.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Liothen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-12 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -196,16 +196,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.13.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.13.6
 - !ruby/object:Gem::Dependency
   name: dronebl.rb
   requirement: !ruby/object:Gem::Requirement
@@ -566,7 +566,6 @@ extra_rdoc_files: []
 files:
 - ".bundle/config"
 - ".gitignore"
-- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt

data/.tool-versions

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