zetabot 2.0.9 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca813b62e8520169331f3e978e82d7ae782c96727362bc21125cd973e164b8a
-  data.tar.gz: f34bf6917e3015268b7dfd16684731a79ba27f987810b1fcd2ad59a9d4609071
+  metadata.gz: 0b53140618ee18e26da975b11636994b8e2e1d1b0a706d2f71bf4a5056d6bbec
+  data.tar.gz: 72d919a4e0df285f135ebc1aece8077cf8de4e44fb2fe990bbae98decb5ab173
 SHA512:
-  metadata.gz: 2965b9a7c3858b703d606cb444bf76ce707a105dda0c2a51335d255b209264cf94abe44e626658d55baab6da14e4274764edda230da117c2a7a60dedd6ab67fb
-  data.tar.gz: b632e398611d098b88ac692f88c0c7833900a1117e773685c8c869926b0c4832c14b1052904a235677b65aea85131851d1b9b85ab224d12fab62f6c1c1e8d86b
+  metadata.gz: db34a813f6c4770564e2b68f30be17f677269c9e175952464693e817376e69564bbc1f28880c05ef2cf96e1792d7bcb531cab5f63d605dcec7f377e32a01a116
+  data.tar.gz: 88078ed8cfa8bb1beae4d5b56bb103ed6aabfbb527c5c80a3d261b64da3a2b3a4040b90b20cbca7e82bb14617eb1ecde3823fa7dbf1b9e691a63e4ed1793cec0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zetabot (2.0.9)
+    zetabot (2.1.0)
       actionview
       chronic
       chronic_duration

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/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
@@ -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
                 }
@@ -189,8 +189,8 @@ 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
                 }
             )

data/lib/Zeta/plugins/fml.rb

@@ -22,8 +22,10 @@ module Plugins
     private
     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(RestClient.get(url).body).at('div.article').text.strip
+
+      html_body = RestClient.get(url).body
+
+      fml_story = Nokogiri.HTML(html_body).at('article').text.strip
       fml_story[/^Today, (.+) FML/]
     rescue => e
       e.message

data/lib/Zeta/plugins/urban.rb

@@ -9,7 +9,7 @@ module Plugins
 
     set(
         plugin_name: 'UrbanDictionary',
-        help: "Urban Dictionary -- Grabs a term from urbandictionary.com.\nUsage: `?urban <term>`; `?wotd`; `!?woty`"
+        help: "Urban Dictionary -- Grabs a term from urbandictionary.com.\nUsage: `?ud <term>`; `?wotd`;"
     )
 
     match /urban (.*)/, method: :query

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.0.9'
+  VERSION = '2.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.1.1
 platform: ruby
 authors:
 - Liothen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-12 00:00:00.000000000 Z
+date: 2023-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -658,7 +658,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Zeta is a IRC bot written in ruby using the Cinch Framework