activematrix 0.0.0 → 0.0.1

data/lib/{matrix_sdk → active_matrix}/protocols/cs.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # rubocop:disable Metrics/ModuleLength
-module MatrixSdk::Protocols::CS
+module ActiveMatrix::Protocols::CS
   # Gets the available client API versions
   # @return [Array]
   #
@@ -12,7 +12,7 @@ module MatrixSdk::Protocols::CS
   #   # => 'latest'
   def client_api_versions
     (@client_api_versions ||= request(:get, :client, '/versions')).versions.tap do |vers|
-      vers.instance_eval <<-'CODE', __FILE__, __LINE__ + 1
+      vers.instance_eval <<-CODE, __FILE__, __LINE__ + 1
         if !respond_to? :latest
           def latest
             last
@@ -32,7 +32,7 @@ module MatrixSdk::Protocols::CS
   #   # => true
   def client_api_unstable_features
     (@client_api_versions ||= request(:get, :client, '/versions')).unstable_features.tap do |vers|
-      vers.instance_eval <<-'CODE', __FILE__, __LINE__ + 1
+      vers.instance_eval <<-CODE, __FILE__, __LINE__ + 1
         def has?(feature)
           feature = feature.to_s.to_sym unless feature.is_a? Symbol
           fetch(feature, nil)
@@ -68,9 +68,7 @@ module MatrixSdk::Protocols::CS
   # @see https://matrix.org/docs/spec/client_server/latest.html#get-matrix-client-r0-sync
   #      For more information on the parameters and what they mean
   def sync(timeout: 30.0, **params)
-    query = params.select do |k, _v|
-      %i[since filter full_state set_presence].include? k
-    end
+    query = params.slice(:since, :filter, :full_state, :set_presence)
 
     query[:timeout] = (timeout * 1000).to_i if timeout
     query[:timeout] = params.delete(:timeout_ms).to_i if params.key? :timeout_ms
@@ -198,7 +196,7 @@ module MatrixSdk::Protocols::CS
 
     data = {
       type: login_type,
-      initial_device_display_name: params.delete(:initial_device_display_name) { MatrixSdk::Api::USER_AGENT }
+      initial_device_display_name: params.delete(:initial_device_display_name) { ActiveMatrix::Api::USER_AGENT }
     }.merge params
     data[:device_id] = device_id if device_id
 
@@ -785,7 +783,7 @@ module MatrixSdk::Protocols::CS
     state_type = ERB::Util.url_encode state_type.to_s
     key = ERB::Util.url_encode key.to_s
 
-    request(:get, client_api_latest, "/rooms/#{room_id}/state/#{state_type}#{key.empty? ? nil : "/#{key}"}", query: query)
+    request(:get, client_api_latest, "/rooms/#{room_id}/state/#{state_type}#{"/#{key}" unless key.empty?}", query: query)
   end
 
   # Retrieves all current state objects from a room

data/lib/{matrix_sdk → active_matrix}/protocols/is.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module MatrixSdk::Protocols::IS
+module ActiveMatrix::Protocols::IS
   def identity_status
     request(:get, :identity_api_v1, '/')
   end

data/lib/{matrix_sdk → active_matrix}/protocols/msc.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Preliminary support for unmerged MSCs (Matrix Spec Changes)
-module MatrixSdk::Protocols::MSC
+module ActiveMatrix::Protocols::MSC
   def refresh_mscs
     @msc = {}
   end
@@ -9,12 +9,12 @@ module MatrixSdk::Protocols::MSC
   # Check if there's support for MSC2108 - Sync over Server Sent Events
   def msc2108?
     @msc ||= {}
-    @msc[2108] ||= \
+    @msc[2108] ||=
       begin
         request(:get, :client_r0, '/sync/sse', skip_auth: true, headers: { accept: 'text/event-stream' })
-      rescue MatrixSdk::MatrixNotAuthorizedError # Returns 401 if implemented
+      rescue ActiveMatrix::MatrixNotAuthorizedError # Returns 401 if implemented
         true
-      rescue MatrixSdk::MatrixRequestError
+      rescue ActiveMatrix::MatrixRequestError
         false
       end
   rescue StandardError => e
@@ -41,9 +41,7 @@ module MatrixSdk::Protocols::MSC
       unless on_data.is_a?(Proc) && on_data.arity == 2
     raise 'Needs to be logged in' unless access_token # TODO: Better error
 
-    query = params.select do |k, _v|
-      %i[filter full_state set_presence].include? k
-    end
+    query = params.slice(:filter, :full_state, :set_presence)
     query[:user_id] = params.delete(:user_id) if protocol?(:AS) && params.key?(:user_id)
 
     req = Net::HTTP::Get.new(homeserver.dup.tap do |u|
@@ -125,7 +123,7 @@ module MatrixSdk::Protocols::MSC
 
             if %w[sync sync_error].include? event
               data = JSON.parse(data, symbolize_names: true)
-              yield((MatrixSdk::Response.new self, data), event: event, id: id)
+              yield((ActiveMatrix::Response.new self, data), event: event, id: id)
             elsif event
               logger.info "MSC2108 : #{stream_id} : Received unknown event '#{event}'; #{data}"
             end

data/lib/{matrix_sdk → active_matrix}/protocols/ss.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-module MatrixSdk::Protocols::SS
+module ActiveMatrix::Protocols::SS
   # Gets the server version
   def server_version
-    MatrixSdk::Response.new(self, request(:get, :federation_v1, '/version').server).tap do |resp|
+    ActiveMatrix::Response.new(self, request(:get, :federation_v1, '/version').server).tap do |resp|
       resp.instance_eval <<-'CODE', __FILE__, __LINE__ + 1
         def to_s
           "#{name} #{version}"

data/lib/active_matrix/railtie.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails/railtie'
+
+module ActiveMatrix
+  class Railtie < Rails::Railtie
+    initializer 'activematrix.configure_rails_initialization' do
+      # Configure Rails.logger as the default logger
+      ActiveMatrix.logger = Rails.logger
+    end
+
+    initializer 'activematrix.configure_cache' do
+      # Rails cache adapter is automatically used when Rails is detected
+      require 'active_matrix/util/rails_cache_adapter'
+      ActiveMatrix::Util::Tinycache.adapter = ActiveMatrix::Util::RailsCacheAdapter
+    end
+  end
+end

data/lib/{matrix_sdk → active_matrix}/response.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module MatrixSdk
+module ActiveMatrix
   # An usability wrapper for API responses as an extended [Hash]
   # All results can be read as both hash keys and as read-only methods on the key
   #
@@ -39,7 +39,7 @@ module MatrixSdk
       data.instance_variable_set(:@api, api)
 
       data.select { |_k, v| v.is_a? Hash }
-          .each { |_v, v| Response.new api, v }
+          .each_value { |v| Response.new api, v }
 
       data
     end

data/lib/{matrix_sdk → active_matrix}/room.rb

@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
-require 'matrix_sdk'
-require 'matrix_sdk/util/events'
-require 'matrix_sdk/util/tinycache'
-
-module MatrixSdk
+module ActiveMatrix
   # A class for tracking the information about a room on Matrix
   class Room
-    extend MatrixSdk::Extensions
-    extend MatrixSdk::Util::Tinycache
-    include MatrixSdk::Logging
+    extend ActiveMatrix::Extensions
+    extend ActiveMatrix::Util::Tinycache
+    include ActiveMatrix::Logging
 
     # @!attribute [rw] event_history_limit
     #   @return [Fixnum] the limit of events to keep in the event log
@@ -34,8 +30,8 @@ module MatrixSdk
     cached :joined_members, cache_level: :all, expires_in: 60 * 60
 
     # Only cache unfiltered requests for aliases and members
-    cached :aliases, unless: proc { |args| args.any? }, cache_level: :all, expires_in: 60 * 60
-    cached :all_members, unless: proc { |args| args.any? }, cache_level: :all, expires_in: 60 * 60
+    cached :aliases, unless: proc { |_, args| args.any? }, cache_level: :all, expires_in: 60 * 60
+    cached :all_members, unless: proc { |_, args| args.any? }, cache_level: :all, expires_in: 60 * 60
 
     alias room_id id
     alias members joined_members
@@ -90,7 +86,7 @@ module MatrixSdk
       data.each do |k, v|
         next if %i[client].include? k
 
-        if respond_to?("#{k}_cached?".to_sym) && send("#{k}_cached?".to_sym)
+        if respond_to?(:"#{k}_cached?") && send(:"#{k}_cached?")
           tinycache_adapter.write(k, v)
         elsif instance_variable_defined? "@#{k}"
           instance_variable_set("@#{k}", v)
@@ -178,7 +174,7 @@ module MatrixSdk
     # @return [String, nil] the canonical alias of the room
     def canonical_alias
       get_state('m.room.canonical_alias')[:alias]
-    rescue MatrixSdk::MatrixNotFoundError
+    rescue ActiveMatrix::MatrixNotFoundError
       nil
     end
 
@@ -292,9 +288,9 @@ module MatrixSdk
     end
 
     def room_state
-      return MatrixSdk::Util::StateEventCache.new self if client.cache == :none
+      return ActiveMatrix::Util::StateEventCache.new self if client.cache == :none
 
-      @room_state ||= MatrixSdk::Util::StateEventCache.new self
+      @room_state ||= ActiveMatrix::Util::StateEventCache.new self
     end
 
     # Gets a state object in the room
@@ -525,7 +521,7 @@ module MatrixSdk
     # @param user_id [String,User] the MXID of the user
     # @return [Boolean] wether the action succeeded
     def invite_user(user_id)
-      user_id = user_id.id if user_id.is_a? MatrixSdk::User
+      user_id = user_id.id if user_id.is_a? ActiveMatrix::User
       client.api.invite_user(id, user_id)
       true
     end
@@ -536,7 +532,7 @@ module MatrixSdk
     # @param reason [String] the reason for the kick
     # @return [Boolean] wether the action succeeded
     def kick_user(user_id, reason = '')
-      user_id = user_id.id if user_id.is_a? MatrixSdk::User
+      user_id = user_id.id if user_id.is_a? ActiveMatrix::User
       client.api.kick_user(id, user_id, reason: reason)
       true
     end
@@ -547,7 +543,7 @@ module MatrixSdk
     # @param reason [String] the reason for the ban
     # @return [Boolean] wether the action succeeded
     def ban_user(user_id, reason = '')
-      user_id = user_id.id if user_id.is_a? MatrixSdk::User
+      user_id = user_id.id if user_id.is_a? ActiveMatrix::User
       client.api.ban_user(id, user_id, reason: reason)
       true
     end
@@ -557,7 +553,7 @@ module MatrixSdk
     # @param user_id [String,User] the MXID of the user
     # @return [Boolean] wether the action succeeded
     def unban_user(user_id)
-      user_id = user_id.id if user_id.is_a? MatrixSdk::User
+      user_id = user_id.id if user_id.is_a? ActiveMatrix::User
       client.api.unban_user(id, user_id)
       true
     end
@@ -572,9 +568,9 @@ module MatrixSdk
     end
 
     def account_data
-      return MatrixSdk::Util::AccountDataCache.new client, room: self if client.cache == :none
+      return ActiveMatrix::Util::AccountDataCache.new client, room: self if client.cache == :none
 
-      @account_data ||= MatrixSdk::Util::AccountDataCache.new client, room: self
+      @account_data ||= ActiveMatrix::Util::AccountDataCache.new client, room: self
     end
 
     # Retrieves a custom entry from the room-specific account data
@@ -640,7 +636,7 @@ module MatrixSdk
     # @return [Boolean,nil] True if the room is a space
     def space?
       room_type == 'm.space'
-    rescue MatrixSdk::MatrixForbiddenError, MatrixSdk::MatrixNotFoundError
+    rescue ActiveMatrix::MatrixForbiddenError, ActiveMatrix::MatrixNotFoundError
       nil
     end
 
@@ -990,10 +986,10 @@ module MatrixSdk
 
     def ensure_room_handlers
       client.instance_variable_get(:@room_handlers)[id] ||= {
-        account_data: MatrixSdk::EventHandlerArray.new,
-        event: MatrixSdk::EventHandlerArray.new,
-        state_event: MatrixSdk::EventHandlerArray.new,
-        ephemeral_event: MatrixSdk::EventHandlerArray.new
+        account_data: ActiveMatrix::EventHandlerArray.new,
+        event: ActiveMatrix::EventHandlerArray.new,
+        state_event: ActiveMatrix::EventHandlerArray.new,
+        ephemeral_event: ActiveMatrix::EventHandlerArray.new
       }
     end
 

data/lib/{matrix_sdk → active_matrix}/rooms/space.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module MatrixSdk::Rooms
-  class Space < MatrixSdk::Room
+module ActiveMatrix::Rooms
+  class Space < ActiveMatrix::Room
     TYPE = 'm.space'
 
     def tree(suggested_only: nil, max_rooms: nil)
@@ -26,7 +26,7 @@ module MatrixSdk::Rooms
 
         # Inject available room information
         r.each do |k, v|
-          if room.respond_to?("#{k}_cached?".to_sym) && send("#{k}_cached?".to_sym)
+          if room.respond_to?(:"#{k}_cached?") && send(:"#{k}_cached?")
             room.send(:tinycache_adapter).write(k, v)
           elsif room.instance_variable_defined? "@#{k}"
             room.instance_variable_set("@#{k}", v)

data/lib/{matrix_sdk → active_matrix}/user.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require 'matrix_sdk'
-
-module MatrixSdk
+module ActiveMatrix
   # A class for tracking information about a user on Matrix
   class User
-    extend MatrixSdk::Extensions
+    extend ActiveMatrix::Extensions
 
     attr_reader :id, :client
     alias user_id :id
@@ -35,13 +33,13 @@ module MatrixSdk
     end
 
     # @return [String] the display name
-    # @see MatrixSdk::Protocols::CS#get_display_name
+    # @see ActiveMatrix::Protocols::CS#get_display_name
     def display_name
       @display_name ||= client.api.get_display_name(id)[:displayname]
     end
 
     # @param name [String] the display name to set
-    # @see MatrixSdk::Protocols::CS#set_display_name
+    # @see ActiveMatrix::Protocols::CS#set_display_name
     def display_name=(name)
       client.api.set_display_name(id, name)
       @display_name = name
@@ -55,7 +53,7 @@ module MatrixSdk
 
     # Gets the avatar for the user
     #
-    # @see MatrixSdk::Protocols::CS#get_avatar_url
+    # @see ActiveMatrix::Protocols::CS#get_avatar_url
     def avatar_url
       @avatar_url ||= client.api.get_avatar_url(id)[:avatar_url]
     end
@@ -67,8 +65,8 @@ module MatrixSdk
     #
     # @param url [String,URI::MXC] the new avatar URL
     # @note Requires a mxc:// URL, check example on
-    #   {MatrixSdk::Protocols::CS#set_avatar_url} for how this can be done
-    # @see MatrixSdk::Protocols::CS#set_avatar_url
+    #   {ActiveMatrix::Protocols::CS#set_avatar_url} for how this can be done
+    # @see ActiveMatrix::Protocols::CS#set_avatar_url
     def avatar_url=(url)
       client.api.set_avatar_url(id, url)
       @avatar_url = url
@@ -93,7 +91,7 @@ module MatrixSdk
     # Get the user's current presence status
     #
     # @return [Symbol] One of :online, :offline, :unavailable
-    # @see MatrixSdk::Protocols::CS#get_presence_status
+    # @see ActiveMatrix::Protocols::CS#get_presence_status
     # @note This information is not cached in the abstraction layer
     def presence
       raw_presence[:presence]&.to_sym
@@ -103,7 +101,7 @@ module MatrixSdk
     # Should be one of :online, :offline, or :unavailable
     #
     # @param new_presence [:online,:offline,:unavailable] The new presence status to set
-    # @see MatrixSdk::Protocols::CS#set_presence_status
+    # @see ActiveMatrix::Protocols::CS#set_presence_status
     def presence=(new_presence)
       raise ArgumentError, 'Presence must be one of :online, :offline, :unavailable' unless %i[online offline unavailable].include?(presence)
 
@@ -118,7 +116,7 @@ module MatrixSdk
 
     # Gets the user-specified status message - if any
     #
-    # @see MatrixSdk::Protocols::CS#get_presence_status
+    # @see ActiveMatrix::Protocols::CS#get_presence_status
     # @note This information is not cached in the abstraction layer
     def status_msg
       raw_presence[:status_msg]
@@ -127,7 +125,7 @@ module MatrixSdk
     # Sets the user-specified status message
     #
     # @param message [String,nil] The message to set, or nil for no message
-    # @see MatrixSdk::Protocols::CS#set_presence_status
+    # @see ActiveMatrix::Protocols::CS#set_presence_status
     def status_msg=(message)
       client.api.set_presence_status(id, presence, message: message)
     end
@@ -135,7 +133,7 @@ module MatrixSdk
     # Gets the last time the user was active at, from the server's side
     #
     # @return [Time] when the user was last active
-    # @see MatrixSdk::Protocols::CS#get_presence_status
+    # @see ActiveMatrix::Protocols::CS#get_presence_status
     # @note This information is not cached in the abstraction layer
     def last_active
       since = raw_presence[:last_active_ago]
@@ -147,7 +145,7 @@ module MatrixSdk
     # Gets a direct message room with the user if one exists
     #
     # @return [Room,nil] A direct message room if one exists
-    # @see MatrixSdk::Client#direct_room
+    # @see ActiveMatrix::Client#direct_room
     def direct_room
       client.direct_room(id)
     end

data/lib/{matrix_sdk → active_matrix}/util/account_data_cache.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-module MatrixSdk::Util
+module ActiveMatrix::Util
   class AccountDataCache
-    extend MatrixSdk::Extensions
-    extend MatrixSdk::Util::Tinycache
+    extend ActiveMatrix::Extensions
+    extend ActiveMatrix::Util::Tinycache
     include Enumerable
 
     attr_reader :client, :room
@@ -13,7 +13,7 @@ module MatrixSdk::Util
     ignore_inspect :client, :room, :tinycache_adapter
 
     def initialize(client, room: nil, cache_time: 1 * 60 * 60, **_params)
-      raise ArgumentError, 'Must be given a Client instance' unless client.is_a? MatrixSdk::Client
+      raise ArgumentError, 'Must be given a Client instance' unless client.is_a? ActiveMatrix::Client
 
       @client = client
       @cache_time = cache_time
@@ -21,7 +21,7 @@ module MatrixSdk::Util
       return unless room
 
       @room = room
-      @room = client.ensure_room room unless @room.is_a? MatrixSdk::Room
+      @room = client.ensure_room room unless @room.is_a? ActiveMatrix::Room
     end
 
     def reload!
@@ -73,7 +73,7 @@ module MatrixSdk::Util
         else
           client.api.get_account_data(client.mxid, key)
         end
-      rescue MatrixSdk::MatrixNotFoundError
+      rescue ActiveMatrix::MatrixNotFoundError
         {}
       end
     end

data/lib/{matrix_sdk → active_matrix}/util/events.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-module MatrixSdk
+module ActiveMatrix
   class EventHandlerArray < Hash
-    include MatrixSdk::Logging
+    include ActiveMatrix::Logging
     attr_accessor :reraise_exceptions
 
-    def initialize(*args)
+    def initialize(*)
       @reraise_exceptions = false
 
-      super(*args)
+      super
     end
 
     def add_handler(filter = nil, id = nil, &block)
@@ -32,7 +32,7 @@ module MatrixSdk
   end
 
   class Event
-    extend MatrixSdk::Extensions
+    extend ActiveMatrix::Extensions
 
     attr_writer :handled
 
@@ -57,7 +57,7 @@ module MatrixSdk
 
     def initialize(error, source)
       @error = error
-      super source
+      super(source)
     end
 
     def source
@@ -74,7 +74,7 @@ module MatrixSdk
     def initialize(sender, event = nil, filter = nil)
       @event = event
       @filter = filter || @event[:type]
-      super sender
+      super(sender)
     end
 
     def matches?(filter, filter_override = nil)
@@ -93,7 +93,7 @@ module MatrixSdk
     end
 
     def to_s
-      "#{event[:type]}: #{event.reject { |k, _v| k == :type }.to_json}"
+      "#{event[:type]}: #{event.except(:type).to_json}"
     end
 
     def method_missing(method, *args)

data/lib/{matrix_sdk → active_matrix}/util/extensions.rb

@@ -8,7 +8,7 @@ unless Object.respond_to? :yield_self
   end
 end
 
-module MatrixSdk
+module ActiveMatrix
   module Extensions
     def events(*symbols)
       module_name = "#{name}Events"
@@ -21,7 +21,7 @@ module MatrixSdk
         name = sym.to_s
 
         initializers << "
-          @on_#{name} = MatrixSdk::EventHandlerArray.new
+          @on_#{name} = ActiveMatrix::EventHandlerArray.new
         "
         readers << ":on_#{name}"
         methods << "
@@ -69,17 +69,4 @@ module MatrixSdk
       *, __FILE__, __LINE__ - 14
     end
   end
-
-  module Logging
-    def logger
-      return MatrixSdk.logger if MatrixSdk.global_logger?
-      return @logger if instance_variable_defined?(:@logger) && @logger
-
-      ::Logging.logger[self]
-    end
-
-    def logger=(logger)
-      @logger = logger
-    end
-  end
 end

data/lib/active_matrix/util/rails_cache_adapter.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ActiveMatrix
+  module Util
+    class RailsCacheAdapter
+      attr_accessor :client
+
+      def initialize
+        @cache = ::Rails.cache
+      end
+
+      def read(key, _options = {})
+        @cache.read(key)
+      end
+
+      def write(key, value, expires_in: nil)
+        @cache.write(key, value, expires_in: expires_in)
+      end
+
+      def exist?(key)
+        @cache.exist?(key)
+      end
+
+      def delete(key)
+        @cache.delete(key)
+      end
+
+      def clear
+        @cache.clear
+      end
+
+      def cleanup
+        # Rails.cache handles its own cleanup
+      end
+    end
+  end
+end

data/lib/{matrix_sdk → active_matrix}/util/state_event_cache.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-module MatrixSdk::Util
+module ActiveMatrix::Util
   class StateEventCache
-    extend MatrixSdk::Extensions
-    extend MatrixSdk::Util::Tinycache
+    extend ActiveMatrix::Extensions
+    extend ActiveMatrix::Util::Tinycache
     include Enumerable
 
     attr_reader :room
@@ -13,7 +13,7 @@ module MatrixSdk::Util
     ignore_inspect :client, :room, :tinycache_adapter
 
     def initialize(room, cache_time: 30 * 60, **_params)
-      raise ArgumentError, 'Must be given a Room instance' unless room.is_a? MatrixSdk::Room
+      raise ArgumentError, 'Must be given a Room instance' unless room.is_a? ActiveMatrix::Room
 
       @room = room
       @cache_time = cache_time
@@ -46,11 +46,11 @@ module MatrixSdk::Util
     end
 
     def key?(type, key = nil)
-      keys.key?("#{type}#{key ? "|#{key}" : ''}")
+      keys.key?("#{type}#{"|#{key}" if key}")
     end
 
     def expire(type, key = nil)
-      tinycache_adapter.expire("#{type}#{key ? "|#{key}" : ''}")
+      tinycache_adapter.expire("#{type}#{"|#{key}" if key}")
     end
 
     def each(live: false)
@@ -71,14 +71,14 @@ module MatrixSdk::Util
     def delete(type, key = nil)
       type = type.to_s unless type.is_a? String
       client.api.set_room_state(room.id, type, {}, **{ state_key: key }.compact)
-      tinycache_adapter.delete("#{type}#{key ? "|#{key}" : ''}")
+      tinycache_adapter.delete("#{type}#{"|#{key}" if key}")
     end
 
     def [](type, key = nil)
       type = type.to_s unless type.is_a? String
-      tinycache_adapter.fetch("#{type}#{key ? "|#{key}" : ''}", expires_in: @cache_time) do
+      tinycache_adapter.fetch("#{type}#{"|#{key}" if key}", expires_in: @cache_time) do
         client.api.get_room_state(room.id, type, **{ key: key }.compact)
-      rescue MatrixSdk::MatrixNotFoundError
+      rescue ActiveMatrix::MatrixNotFoundError
         {}
       end
     end
@@ -86,7 +86,7 @@ module MatrixSdk::Util
     def []=(type, key = nil, value) # rubocop:disable Style/OptionalArguments Not possible to put optional last
       type = type.to_s unless type.is_a? String
       client.api.set_room_state(room.id, type, value, **{ state_key: key }.compact)
-      tinycache_adapter.write("#{type}#{key ? "|#{key}" : ''}", value)
+      tinycache_adapter.write("#{type}#{"|#{key}" if key}", value)
     end
   end
 end