activematrix 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d14da1f32ce2269f47a0e1124b264a0e2e61c3f19f94ad224b60951200ba55b
-  data.tar.gz: b12caea772bf4d1df1cbad903caaa888eff93c40dbcda081c53c89b598f69475
+  metadata.gz: 143ff7d837b5e8c2da0cc48dac7ec9494b625ec4d1f6dfd3d736648c1cf37951
+  data.tar.gz: 9d4d7c69c17c9d07e36b628a69de1e2d759249ea9310e3158f56323982757979
 SHA512:
-  metadata.gz: 9f62a5e1eb8bd28688e2b9b029c156271f827ace85d6898ba75fb1b2d47c3185a7aaaadf8ed2a18ef1829ab4a1563a498715f1cbc188b2106f590eb8474b0fe3
-  data.tar.gz: fc32226c83adadca7cc70b4be9ca50e302e518185e26bd0dade5e91013ec582aaee9f8f40c601bd299384898686373f54da80868ab0a3ee6b805ee9210262947
+  metadata.gz: 3376d53d35686a0eb5a40a7a8102a1dcd8c5c226a4bb606cf1c8d05f5f568396bd49465b5ca40c7e52dff5fa7569e0e6c39d6cae3b077ce9656bb59f699267db
+  data.tar.gz: c9a3120e5ea6edde56923990609e6ea156c8df500f8cd6955ec98811c622715872bcc3e76bfd740772be491956a5c4b45980d2c9ac8de87bf2f16e301bcad8f9

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

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
-require 'matrix_sdk'
-
 require 'erb'
 require 'net/http'
 require 'openssl'
 require 'uri'
 
-module MatrixSdk
+module ActiveMatrix
   class Api
-    extend MatrixSdk::Extensions
-    include MatrixSdk::Logging
+    extend ActiveMatrix::Extensions
+    include ActiveMatrix::Logging
 
-    USER_AGENT = "Ruby Matrix SDK v#{MatrixSdk::VERSION}"
+    USER_AGENT = "Ruby Matrix SDK v#{ActiveMatrix::VERSION}".freeze
     DEFAULT_HEADERS = {
       'accept' => 'application/json',
       'user-agent' => USER_AGENT
@@ -72,7 +70,7 @@ module MatrixSdk
       self.threadsafe = params.fetch(:threadsafe, :multithread)
 
       ([params.fetch(:protocols, [:CS])].flatten - protocols).each do |proto|
-        self.class.include MatrixSdk::Protocols.const_get(proto)
+        self.class.include ActiveMatrix::Protocols.const_get(proto)
       end
 
       login(user: @homeserver.user, password: @homeserver.password) if @homeserver.user && @homeserver.password && !@access_token && !params[:skip_login] && protocol?(:CS)
@@ -84,7 +82,7 @@ module MatrixSdk
     # This will follow the server discovery spec for client-server and federation
     #
     # @example Opening a Matrix API connection to a homeserver
-    #   hs = MatrixSdk::API.new_for_domain 'example.com'
+    #   hs = ActiveMatrix::API.new_for_domain 'example.com'
     #   hs.connection_address
     #   # => 'matrix.example.com'
     #   hs.connection_port
@@ -97,10 +95,10 @@ module MatrixSdk
     # @return [API] The API connection
     def self.new_for_domain(domain, target: :client, keep_wellknown: false, ssl: true, **params)
       domain, port = domain.split(':')
-      uri = URI("http#{ssl ? 's' : ''}://#{domain}")
+      uri = URI("http#{'s' if ssl}://#{domain}")
       well_known = nil
       target_uri = nil
-      logger = ::Logging.logger[self]
+      logger = ActiveMatrix.logger
       logger.debug "Resolving #{domain}"
 
       if !port.nil? && !port.empty?
@@ -171,17 +169,15 @@ module MatrixSdk
 
       new(
         uri,
-        **params.merge(
-          address: target_uri.host,
-          port: target_uri.port
-        )
+        **params, address: target_uri.host,
+                  port: target_uri.port
       )
     end
 
     # Get a list of enabled protocols on the API client
     #
     # @example
-    #   MatrixSdk::Api.new_for_domain('matrix.org').protocols
+    #   ActiveMatrix::Api.new_for_domain('matrix.org').protocols
     #   # => [:IS, :CS]
     #
     # @return [Symbol[]] An array of enabled APIs
@@ -189,7 +185,7 @@ module MatrixSdk
       self
         .class.included_modules
         .reject { |m| m&.name.nil? }
-        .select { |m| m.name.start_with? 'MatrixSdk::Protocols::' }
+        .select { |m| m.name.start_with? 'ActiveMatrix::Protocols::' }
         .map { |m| m.name.split('::').last.to_sym }
     end
 
@@ -343,7 +339,7 @@ module MatrixSdk
             logger.error "Received non-parsable data in 200 response; #{response.body.inspect}"
             raise MatrixConnectionError, response
           end
-          return MatrixSdk::Response.new self, data
+          return ActiveMatrix::Response.new self, data
         end
         raise MatrixRequestError.new_by_code(data, response.code) if data
 
@@ -394,11 +390,11 @@ module MatrixSdk
       return unless logger.debug?
 
       if http.is_a? Net::HTTPRequest
-        dir = "#{id ? "#{id} : " : nil}>"
+        dir = "#{"#{id} : " if id}>"
         logger.debug "#{dir} Sending a #{http.method} request to `#{http.path}`:"
       else
-        dir = "#{id ? "#{id} : " : nil}<"
-        logger.debug "#{dir} Received a #{http.code} #{http.message} response:#{duration ? " [#{(duration * 1000).to_i}ms]" : nil}"
+        dir = "#{"#{id} : " if id}<"
+        logger.debug "#{dir} Received a #{http.code} #{http.message} response:#{" [#{(duration * 1000).to_i}ms]" if duration}"
       end
       http.to_hash.map { |k, v| "#{k}: #{k == 'authorization' ? '[ REDACTED ]' : v.join(', ')}" }.each do |h|
         logger.debug "#{dir} #{h}"
@@ -424,8 +420,8 @@ module MatrixSdk
     def http
       return @http if @http&.active?
 
-      host = (@connection_address || homeserver.host)
-      port = (@connection_port || homeserver.port)
+      host = @connection_address || homeserver.host
+      port = @connection_port || homeserver.port
 
       connection = @http unless @threadsafe == :multithread
       connection ||= if proxy_uri

data/lib/{matrix_sdk → active_matrix}/bot/base.rb

@@ -2,9 +2,10 @@
 
 require 'shellwords'
 
-module MatrixSdk::Bot
+module ActiveMatrix::Bot
   class Base
-    extend MatrixSdk::Extensions
+    extend ActiveMatrix::Extensions
+    include ActiveMatrix::Logging
 
     RequestHandler = Struct.new('RequestHandler', :command, :type, :proc, :data) do
       def command?
@@ -29,14 +30,14 @@ module MatrixSdk::Bot
 
     def initialize(hs_url, **params)
       @client = case hs_url
-                when MatrixSdk::Api
-                  MatrixSdk::Client.new hs_url
-                when MatrixSdk::Client
+                when ActiveMatrix::Api
+                  ActiveMatrix::Client.new hs_url
+                when ActiveMatrix::Client
                   hs_url
                 when %r{^https?://.*}
-                  MatrixSdk::Client.new hs_url, **params
+                  ActiveMatrix::Client.new hs_url, **params
                 else
-                  MatrixSdk::Client.new_for_domain hs_url, **params
+                  ActiveMatrix::Client.new_for_domain hs_url, **params
                 end
 
       @client.on_event.add_handler { |ev| _handle_event(ev) }
@@ -59,30 +60,23 @@ module MatrixSdk::Bot
     end
 
     def self.logger
-      Logging.logger[self].tap do |l|
-        begin
-          l.level = :debug if MatrixSdk::Bot::PARAMS_CONFIG[:logging]
-        rescue NameError
-          # Not running as instance
-        end
-        l.level = settings.log_level unless settings.logging?
-      end
+      @logger ||= ActiveMatrix.logger
     end
 
     # Register a command during runtime
     #
     # @param command [String] The command to register
     # @see Base.command for full parameter information
-    def register_command(command, **params, &block)
-      self.class.command(command, **params, &block)
+    def register_command(command, **params, &)
+      self.class.command(command, **params, &)
     end
 
     # Register an event during runtime
     #
     # @param event [String] The event to register
     # @see Base.event for full parameter information
-    def register_event(event, **params, &block)
-      self.class.event(event, **params, &block)
+    def register_event(event, **params, &)
+      self.class.event(event, **params, &)
     end
 
     # Removes a registered command during runtime
@@ -149,7 +143,7 @@ module MatrixSdk::Bot
       attr_reader :handlers
 
       CALLERS_TO_IGNORE = [
-        /\/matrix_sdk\/.+\.rb$/,                            # all MatrixSdk code
+        /\/matrix_sdk\/.+\.rb$/,                            # all ActiveMatrix code
         /^\(.*\)$/,                                         # generated code
         /rubygems\/(custom|core_ext\/kernel)_require\.rb$/, # rubygems require hacks
         /bundler(\/(?:runtime|inline))?\.rb/,               # bundler require hacks
@@ -252,16 +246,16 @@ module MatrixSdk::Bot
       # @note Due to the way blocks are handled, required parameters won't block execution.
       #   If your command requires all parameters to be valid, you will need to check for nil yourself.
       #
-      # @note Execution will be performed with a MatrixSdk::Bot::Request object as self.
-      #   To access the bot instance, use MatrixSdk::Bot::Request#bot
+      # @note Execution will be performed with a ActiveMatrix::Bot::Request object as self.
+      #   To access the bot instance, use ActiveMatrix::Bot::Request#bot
       #
       # @param command [String] The command to register, will be routed based on the prefix and bot NameError
       # @param desc [String] A human-readable description for the command
       # @param only [Symbol,Proc,Array[Symbol,Proc]] What limitations does this command have?
       #   Can use :DM, :Admin, :Mod
       # @option params
-      def command(command, desc: nil, notes: nil, only: nil, **params, &block)
-        args = params[:args] || convert_to_lambda(&block).parameters.map do |type, name|
+      def command(command, desc: nil, notes: nil, only: nil, **params, &)
+        args = params[:args] || convert_to_lambda(&).parameters.map do |type, name|
           case type
           when :req
             name.to_s.upcase
@@ -281,7 +275,7 @@ module MatrixSdk::Bot
           desc: desc,
           notes: notes,
           only: [only].flatten.compact,
-          &block
+          &
         )
       end
 
@@ -292,14 +286,14 @@ module MatrixSdk::Bot
       # @param event [String] The ID for the event to register
       # @param only [Symbol,Proc,Array[Symbol,Proc]] The limitations to when the event should be handled
       # @option params
-      def event(event, only: nil, **_params, &block)
+      def event(event, only: nil, **_params, &)
         logger.debug "Registering event #{event}"
 
         add_handler(
           event.to_s,
           type: :event,
           only: [only].flatten.compact,
-          &block
+          &
         )
       end
 
@@ -404,7 +398,7 @@ module MatrixSdk::Bot
       # Starts the bot up
       #
       # @param options [Hash] Settings to apply using Base.set
-      def run!(options = {}, &block)
+      def run!(options = {}, &)
         return if running?
 
         set options
@@ -423,7 +417,7 @@ module MatrixSdk::Bot
                               end
 
         begin
-          start_bot(bot_settings, &block)
+          start_bot(bot_settings, &)
         ensure
           quit!
         end
@@ -442,9 +436,9 @@ module MatrixSdk::Bot
 
       def start_bot(bot_settings, &block)
         cl = if homeserver =~ %r{^https?://}
-               MatrixSdk::Client.new homeserver
+               ActiveMatrix::Client.new homeserver
              else
-               MatrixSdk::Client.new_for_domain homeserver
+               ActiveMatrix::Client.new_for_domain homeserver
              end
 
         auth = bot_settings.delete :auth
@@ -476,7 +470,7 @@ module MatrixSdk::Bot
           begin
             data = bot.client.api.get_account_data(bot.client.mxid, "dev.ananace.ruby-sdk.#{bot_name}")
             bot.client.sync_token = data[:sync_token]
-          rescue MatrixSdk::MatrixNotFoundError
+          rescue ActiveMatrix::MatrixNotFoundError
             # Valid
           rescue StandardError => e
             bot.logger.error "Failed to restore old sync token, #{e.class}: #{e}"
@@ -539,7 +533,7 @@ module MatrixSdk::Bot
       return true if (handler.data[:only] || []).empty?
 
       # Avoid modifying input data for a checking method
-      @event = MatrixSdk::Response.new(client.api, event.dup)
+      @event = ActiveMatrix::Response.new(client.api, event.dup)
       return false if [handler.data[:only]].flatten.compact.any? do |only|
         if only.is_a? Proc
           !instance_exec(&only)
@@ -569,7 +563,7 @@ module MatrixSdk::Bot
       return true if (handler.data[:only] || []).empty?
 
       # Avoid modifying input data for a checking method
-      @event = MatrixSdk::Response.new(client.api, event.dup)
+      @event = ActiveMatrix::Response.new(client.api, event.dup)
       return false if [handler.data[:only]].flatten.compact.any? do |only|
         if only.is_a? Proc
           instance_exec(&only)
@@ -640,7 +634,7 @@ module MatrixSdk::Bot
       return if in_event?
       return if settings.ignore_own? && client.mxid == event[:sender]
 
-      event = event.data if event.is_a? MatrixSdk::MatrixEvent
+      event = event.data if event.is_a? ActiveMatrix::MatrixEvent
 
       logger.debug "Received event #{event}"
       return _handle_message(event) if event[:type] == 'm.room.message'
@@ -651,7 +645,7 @@ module MatrixSdk::Bot
 
       logger.info "Handling event #{event[:sender]}/#{event[:room_id]} => #{event[:type]}"
 
-      @event = MatrixSdk::Response.new(client.api, event)
+      @event = ActiveMatrix::Response.new(client.api, event)
       instance_exec(&handler.proc)
     # Argument errors are likely to be a "friendly" error, so don't direct the user to the log
     rescue ArgumentError => e
@@ -703,7 +697,7 @@ module MatrixSdk::Bot
 
       logger.info "Handling command #{event[:sender]}/#{event[:room_id]}: #{settings.command_prefix}#{command}"
 
-      @event = MatrixSdk::Response.new(client.api, event)
+      @event = ActiveMatrix::Response.new(client.api, event)
       arity = handler.arity
       case arity
       when 0
@@ -826,8 +820,17 @@ module MatrixSdk::Bot
         info += "\n  #{handler.data[:notes].split("\n").join("\n  ")}" if !command.nil? && handler.data[:notes]
         info = nil if info.empty?
 
+        prefix = if handler.command == 'help'
+                   # Help command is always accessible without bot name prefix
+                   "#{settings.command_prefix}#{handler.command}"
+                 elsif room.dm?
+                   "#{settings.command_prefix}#{handler.command}"
+                 else
+                   "#{expanded_prefix}#{handler.command}"
+                 end
+
         [
-          room.dm? ? "#{settings.command_prefix}#{handler.command}" : "#{expanded_prefix}#{handler.command}",
+          prefix,
           info
         ].compact
       end
@@ -840,7 +843,7 @@ module MatrixSdk::Bot
           room.send_notice("Help for #{command};\n#{commands}")
         end
       else
-        room.send_notice("#{settings.help_preamble? ? "#{settings.help_preamble}\n\n" : ''}Usage:\n\n#{commands}")
+        room.send_notice("#{"#{settings.help_preamble}\n\n" if settings.help_preamble?}Usage:\n\n#{commands}")
       end
     end
   end

data/lib/{matrix_sdk → active_matrix}/bot/main.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module MatrixSdk::Bot
+module ActiveMatrix::Bot
   PARAMS_CONFIG = {} # rubocop:disable Style/MutableConstant Intended
 
   require 'optparse'
@@ -21,14 +21,13 @@ module MatrixSdk::Bot
     PARAMS_CONFIG[:optparse_error] = e
   end
 
-  MatrixSdk.logger.appenders.each do |log|
+  ActiveMatrix.logger.appenders.each do |log|
     log.layout = Logging::Layouts.pattern(
       pattern: "%d|%.1l %c : %m\n"
     )
   end
-  MatrixSdk.debug! if ENV['MATRIX_DEBUG'] == '1'
+  ActiveMatrix.debug! if ENV['MATRIX_DEBUG'] == '1'
 
-  require 'matrix_sdk/bot/base'
   class Instance < Base
     set :logging, true
     set :log_level, :info
@@ -76,4 +75,4 @@ module MatrixSdk::Bot
   end
 end
 
-extend MatrixSdk::Bot::Delegator # rubocop:disable Style/MixinUsage Intended
+extend ActiveMatrix::Bot::Delegator # rubocop:disable Style/MixinUsage Intended

data/lib/active_matrix/bot.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module ActiveMatrix
+  # Namespace module for Bot framework
+  module Bot
+  end
+end

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

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
-require 'matrix_sdk'
-require 'matrix_sdk/util/events'
-
 require 'English'
 require 'forwardable'
 
-module MatrixSdk
+module ActiveMatrix
   class Client
-    extend MatrixSdk::Extensions
-    include MatrixSdk::Logging
+    extend ActiveMatrix::Extensions
+    include ActiveMatrix::Logging
     extend Forwardable
 
     # @!attribute api [r] The underlying API connection
@@ -44,11 +41,11 @@ module MatrixSdk
     # @see Api.new_for_domain
     # @see #initialize
     def self.new_for_domain(domain, **params)
-      api = MatrixSdk::Api.new_for_domain(domain, keep_wellknown: true)
+      api = ActiveMatrix::Api.new_for_domain(domain, keep_wellknown: true)
       return new(api, **params) unless api.well_known&.key?('m.identity_server')
 
-      identity_server = MatrixSdk::Api.new(api.well_known['m.identity_server']['base_url'], protocols: %i[IS])
-      new(api, **params.merge(identity_server: identity_server))
+      identity_server = ActiveMatrix::Api.new(api.well_known['m.identity_server']['base_url'], protocols: %i[IS])
+      new(api, **params, identity_server: identity_server)
     end
 
     # @param hs_url [String,URI,Api] The URL to the Matrix homeserver, without the /_matrix/ part, or an existing Api instance
@@ -56,7 +53,7 @@ module MatrixSdk
     # @param params [Hash] Additional parameters on creation
     # @option params [String,MXID] :user_id The user ID of the logged-in user
     # @option params [Integer] :sync_filter_limit (20) Limit of timeline entries in syncs
-    # @see MatrixSdk::Api.new for additional usable params
+    # @see ActiveMatrix::Api.new for additional usable params
     def initialize(hs_url, client_cache: :all, **params)
       event_initialize
 
@@ -168,9 +165,9 @@ module MatrixSdk
 
     # Retrieve an account data helper
     def account_data
-      return MatrixSdk::Util::AccountDataCache.new self if cache == :none
+      return ActiveMatrix::Util::AccountDataCache.new self if cache == :none
 
-      @account_data ||= MatrixSdk::Util::AccountDataCache.new self
+      @account_data ||= ActiveMatrix::Util::AccountDataCache.new self
     end
 
     # Gets a direct message room for the given user if one exists
@@ -178,7 +175,7 @@ module MatrixSdk
     # @note Will return the oldest room if multiple exist
     # @return [Room,nil] A direct message room if one exists
     def direct_room(mxid)
-      mxid = MatrixSdk::MXID.new mxid.to_s unless mxid.is_a? MatrixSdk::MXID
+      mxid = ActiveMatrix::MXID.new mxid.to_s unless mxid.is_a? ActiveMatrix::MXID
       raise ArgumentError, 'Must be a valid user ID' unless mxid.user?
 
       room_id = direct_rooms[mxid.to_s]&.first
@@ -365,7 +362,7 @@ module MatrixSdk
           end
 
           def inspect
-            "#<MatrixSdk::Response 3pid=#{to_s.inspect} added_at=\"#{added_at}\"#{validated? ? " validated_at=\"#{validated_at}\"" : ''}>"
+            "#<ActiveMatrix::Response 3pid=#{to_s.inspect} added_at=\"#{added_at}\"#{" validated_at=\"#{validated_at}\"" if validated?}>"
           end
         end
       end
@@ -376,13 +373,13 @@ module MatrixSdk
     #
     # @example Creating a room with an alias
     #   client.create_room('myroom')
-    #   #<MatrixSdk::Room ... >
+    #   #<ActiveMatrix::Room ... >
     #
     # @param room_alias [String] A default alias to set on the room, should only be the localpart
     # @return [Room] The resulting room
     # @see Protocols::CS#create_room
     def create_room(room_alias = nil, **params)
-      data = api.create_room(**params.merge(room_alias: room_alias))
+      data = api.create_room(**params, room_alias: room_alias)
       ensure_room(data.room_id)
     end
 
@@ -542,7 +539,7 @@ module MatrixSdk
       attempts = 0
       data = loop do
         break api.sync(**extra_params)
-      rescue MatrixSdk::MatrixTimeoutError => e
+      rescue ActiveMatrix::MatrixTimeoutError => e
         raise e if (attempts += 1) >= params.fetch(:allow_sync_retry, 0)
       end
 
@@ -577,7 +574,7 @@ module MatrixSdk
       orig_bad_sync_timeout = bad_sync_timeout + 0
       while @should_listen
         begin
-          sync(**params.merge(timeout: timeout))
+          sync(**params, timeout: timeout)
           return unless @should_listen
 
           bad_sync_timeout = orig_bad_sync_timeout
@@ -588,7 +585,7 @@ module MatrixSdk
           logger.warn("A #{e.class} occurred during sync")
           if e.httpstatus >= 500
             logger.warn("Serverside error, retrying in #{bad_sync_timeout} seconds...")
-            sleep(bad_sync_timeout) if bad_sync_timeout.positive? # rubocop:disable Metrics/BlockNesting
+            sleep(bad_sync_timeout) if bad_sync_timeout.positive?
             bad_sync_timeout = [bad_sync_timeout * 2, @bad_sync_timeout_limit].min
           end
         end
@@ -681,7 +678,7 @@ module MatrixSdk
 
       unless cache == :none
         account_data.tinycache_adapter.cleanup if instance_variable_defined?(:@account_data) && @account_data
-        @rooms.each do |_id, room|
+        @rooms.each_value do |room|
           # Clean up old cache data after every sync
           # TODO Run this in a thread?
           room.tinycache_adapter.cleanup

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module MatrixSdk
-  # A generic error raised for issues in the MatrixSdk
+module ActiveMatrix
+  # A generic error raised for issues in the ActiveMatrix
   class MatrixError < StandardError
   end
 
@@ -30,9 +30,9 @@ module MatrixSdk
       @code = error[:errcode]
       @httpstatus = status
       @message = error[:error]
-      @data = error.reject { |k, _v| %i[errcode error].include? k }
+      @data = error.except(:errcode, :error)
 
-      super error[:error]
+      super(error[:error])
     end
 
     def to_s

data/lib/active_matrix/logging.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module ActiveMatrix
+  module Logging
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def logger
+        @logger ||= ActiveMatrix.logger
+      end
+
+      def logger=(logger)
+        @logger = logger
+      end
+    end
+
+    def logger
+      @logger ||= self.class.logger
+    end
+
+    def logger=(logger)
+      @logger = logger
+    end
+  end
+
+  class << self
+    def logger
+      @logger ||= if defined?(::Rails) && ::Rails.respond_to?(:logger)
+                    ::Rails.logger
+                  else
+                    # Fallback for testing
+                    require 'logger'
+                    ::Logger.new($stdout)
+                  end
+    end
+
+    def logger=(logger)
+      @logger = logger
+      @global_logger = !logger.nil?
+    end
+
+    def debug!
+      logger.level = if defined?(::Rails)
+                       :debug
+                     else
+                       ::Logger::DEBUG
+                     end
+    end
+
+    def global_logger?
+      @global_logger ||= false
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module MatrixSdk
+module ActiveMatrix
   class MXID
     attr_accessor :sigil, :localpart, :domain, :port
 
@@ -82,7 +82,7 @@ module MatrixSdk
     # Check if the ID is of a room
     # @return [Boolean] if the ID is of the room_id or room_alias types
     def room?
-      type == :room_id || type == :room_alias
+      %i[room_id room_alias].include?(type)
     end
 
     # Check if the ID is of a event

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module MatrixSdk::Protocols::AS
+module ActiveMatrix::Protocols::AS
   def self.included(_klass)
     # XXX
   end