twitch-bot 4.1.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b95458f55a188c3e08f200675f0147561f9316aea8eeac3f570eb5a1f984e755
-  data.tar.gz: b63b75edbe1b0f2fa6f31e8e0ca1064e8a6c6b0cf9defd9f91f13646ca48fdc6
+  metadata.gz: 7e01b9b202dc484cc6f55788d1adc6cc7b6272c1bb3ff67fcb2e0615956ea761
+  data.tar.gz: d819d7d5be9b59fdbdf9bcb1ebb100272f79fcb8377a887ad3e4450aee3b437a
 SHA512:
-  metadata.gz: 9b1be2870429a4748980a9490749181275a0d59ac9cae46be6538e7a93e98dcbd6fbdf6614b9a6701e508156e35d5db77c98685ea44dcae8263461a3dc8f58e9
-  data.tar.gz: a6be65d6a5369df67ec3243c7c17313a45fb7df135ea862c0b04e92b2d5ac6953c18993277e33772f373dfbdc6d46154edfc36e287788c6f388e5829a80104a7
+  metadata.gz: 96ab9830ae76529ef3f8f92e9876fb043e01afa2f7d4ee354dae4014e377df3f3e427c1a6f54dfdb515e7b2ec0018416f39874420f74e5659f8d83453b2d293b
+  data.tar.gz: 16a25b0062f8a1066442305ffc54c6d9ed1b573bfc836f990830f6c075738c6438876da82bdc4caa0220e88f1fa5e1cbd64ab151e7479fadb4dba00378dbda28

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog Twitch::Bot
 
+## v5.0.2
+
+- [FIX] `PART` command caused a crash when not in a channel.
+
+## v5.0.1
+
+- [FIX] Environment variable `REDIS_URL` now has precedence over configuration 
+  object values.
+
+## v5.0.0
+
+- [BREAKING] Complex values like arrays and hashes get serialized as JSON before 
+  being stored in Redis.
+
 ## v4.1.1
 
 - [NEW] `CommandHandler` by default responds to `:user_message` events.

data/lib/twitch/bot/adapter/irc.rb

@@ -9,6 +9,7 @@ module Twitch
       class Irc
         def initialize(client:)
           @client = client
+          @channel = nil
 
           open_socket
         end
@@ -29,7 +30,7 @@ module Twitch
         end
 
         def send_message(text)
-          privmsg = "PRIVMSG ##{channel.name} :#{text}"
+          privmsg = "PRIVMSG ##{@channel.name} :#{text}"
           send_data(privmsg)
         end
 
@@ -37,19 +38,19 @@ module Twitch
           send_data_to_socket(data)
         end
 
-        def join_channel(channel)
-          @channel = channel
-          send_data "JOIN ##{channel.name}"
+        def join_channel(channel_object)
+          @channel = channel_object
+          send_data "JOIN ##{@channel.name}"
         end
 
         def part_channel
-          send_data "PART ##{channel.name}"
+          send_data "PART ##{@channel.name}" if @channel
           @channel = nil
         end
 
         private
 
-        attr_reader :socket, :client, :channel
+        attr_reader :socket, :client
 
         def open_socket
           @socket = ::TCPSocket.new(

data/lib/twitch/bot/client.rb

@@ -11,7 +11,7 @@ module Twitch
       # Represent the event triggered when quitting the client loop.
       class StopEvent < Twitch::Bot::Event
         def initialize
-          @type = :stop
+          super(type: :stop)
         end
       end
 
@@ -22,7 +22,7 @@ module Twitch
       attr_reader :channel, :config, :memory
 
       def initialize(
-        channel: nil, config:, &block
+        config:, channel: nil, &block
       )
         @config = config
         @channel = Twitch::Bot::Channel.new(channel) if channel

data/lib/twitch/bot/logger.rb

@@ -16,7 +16,7 @@ module Twitch
       end
 
       def self.logger
-        @logger ||= ::Logger.new(STDOUT)
+        @logger ||= ::Logger.new($stdout)
       end
     end
   end

data/lib/twitch/bot/memory/redis.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "redis"
+require "json"
 
 module Twitch
   module Bot
@@ -13,11 +14,12 @@ module Twitch
         end
 
         def store(key, value)
-          redis.set(key, value)
+          redis.set(key, value.to_json)
         end
 
         def retrieve(key)
-          redis.get(key)
+          value = redis.get(key)
+          JSON.parse(value)
         end
 
         private
@@ -25,17 +27,15 @@ module Twitch
         attr_reader :client, :redis
 
         def connect_db
-          url = redis_config_url || ENV["REDIS_URL"]
+          url = ENV["REDIS_URL"] || redis_config_url
           ::Redis.new(url: url)
         end
 
         def redis_config_url
           config = client.config
-          if config.setting("redis_host")
-            host = config.setting("redis_host") || "localhost"
-            port = config.setting("redis_port") || 6379
-            "redis://#{host}:#{port}"
-          end
+          host = config.setting("redis_host") || "localhost"
+          port = config.setting("redis_port") || 6379
+          "redis://#{host}:#{port}"
         end
       end
     end

data/lib/twitch/bot/message/user_message.rb

@@ -10,7 +10,7 @@ module Twitch
         def initialize(text:, user:)
           @text = text
           @user = user
-          @type = :user_message
+          super(type: :user_message)
         end
 
         def command_name?(check_command)

data/lib/twitch/bot/message.rb

@@ -5,8 +5,8 @@ module Twitch
     module Message
       # This class is the abstract base class for IRC events.
       class Base < Twitch::Bot::Event
-        def initialize(_message)
-          @type = :unknown
+        def initialize(type: :unknown)
+          super(type: type)
         end
       end
 
@@ -16,7 +16,7 @@ module Twitch
 
         def initialize(message)
           @message = message
-          @type = :not_supported
+          super(type: :not_supported)
         end
       end
 
@@ -26,7 +26,7 @@ module Twitch
 
         def initialize(hostname:)
           @hostname = hostname
-          @type = :ping
+          super(type: :ping)
         end
       end
 
@@ -37,21 +37,21 @@ module Twitch
         def initialize(user:, mode:)
           @user = user
           @mode = mode
-          @type = :mode
+          super(type: :mode)
         end
       end
 
       # This class stores the details of an Authenticated event.
       class Authenticated < Base
         def initialize
-          @type = :authenticated
+          super(type: :authenticated)
         end
       end
 
       # This class stores the details of a Join event.
       class Join < Base
         def initialize
-          @type = :join
+          super(type: :join)
         end
       end
 
@@ -61,7 +61,7 @@ module Twitch
 
         def initialize(user:)
           @user = user
-          @type = :subscription
+          super(type: :subscription)
         end
       end
 
@@ -71,7 +71,7 @@ module Twitch
 
         def initialize(user:)
           @user = user
-          @type = :login_failed
+          super(type: :login_failed)
         end
       end
 
@@ -82,7 +82,7 @@ module Twitch
         def initialize(status:, channel:)
           @status = status
           @channel = channel
-          @type = :slow_mode
+          super(type: :slow_mode)
         end
 
         def enabled?
@@ -96,7 +96,7 @@ module Twitch
 
         def initialize(status:)
           @status = status
-          @type = :followers_only_mode
+          super(type: :followers_only_mode)
         end
       end
 
@@ -107,7 +107,7 @@ module Twitch
         def initialize(status:, channel:)
           @status = status
           @channel = channel
-          @type = :subs_only_mode
+          super(type: :subs_only_mode)
         end
       end
 
@@ -118,7 +118,7 @@ module Twitch
         def initialize(status:, channel:)
           @status = status
           @channel = channel
-          @type = :r9k_mode
+          super(type: :r9k_mode)
         end
       end
     end

data/lib/twitch/bot/version.rb

@@ -2,6 +2,6 @@
 
 module Twitch
   module Bot
-    VERSION = "4.1.1"
+    VERSION = "5.0.2"
   end
 end

data/spec/twitch/bot/memory/hash_spec.rb

@@ -9,5 +9,26 @@ RSpec.describe Twitch::Bot::Memory::Hash do
 
       expect(mem.retrieve("foo")).to eq "bar"
     end
+
+    it "persists an Array" do
+      mem = described_class.new(client: nil)
+
+      mem.store("foo", [1, 2])
+
+      result = mem.retrieve("foo")
+      expect(result).to be_an Array
+      expect(result[0]).to eq 1
+      expect(result[1]).to eq 2
+    end
+
+    it "persists a Hash" do
+      mem = described_class.new(client: nil)
+
+      mem.store("foo", { "bar" => "baz" })
+
+      result = mem.retrieve("foo")
+      expect(result).to be_a Hash
+      expect(result["bar"]).to eq "baz"
+    end
   end
 end

data/spec/twitch/bot/memory/redis_spec.rb

@@ -40,5 +40,44 @@ RSpec.describe Twitch::Bot::Memory::Redis do
 
       expect(mem.retrieve("foo")).to eq "bar"
     end
+
+    it "persists an Array" do
+      config = Twitch::Bot::Config.new(
+        settings: {
+          bot_user: "testuser",
+        },
+      )
+      client = Twitch::Bot::Client.new(
+        config: config,
+        channel: "testchannel",
+      )
+      mem = described_class.new(client: client)
+
+      mem.store("foo", [1, 2])
+
+      result = mem.retrieve("foo")
+      expect(result).to be_an Array
+      expect(result[0]).to eq 1
+      expect(result[1]).to eq 2
+    end
+
+    it "persists a Hash" do
+      config = Twitch::Bot::Config.new(
+        settings: {
+          bot_user: "testuser",
+        },
+      )
+      client = Twitch::Bot::Client.new(
+        config: config,
+        channel: "testchannel",
+      )
+      mem = described_class.new(client: client)
+
+      mem.store("foo", { "bar" => "baz" })
+
+      result = mem.retrieve("foo")
+      expect(result).to be_a Hash
+      expect(result["bar"]).to eq "baz"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitch-bot
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Jochen Lillich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -174,7 +174,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
-- ".env.dist"
+- ".env.sample"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
@@ -221,7 +221,7 @@ homepage: https://github.com/geewiz/twitch-bot
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: twitch-bot is a Twitch chat client that uses Twitch IRC that can be used
   as a Twitch chat bot engine.