discorb 0.13.1 → 0.14.0

data/lib/discorb/log.rb

@@ -64,17 +64,18 @@ module Discorb
 
     def write_output(name, color, message, fallback)
       unless @out
-        fallback.puts(message) if fallback
+        fallback&.puts(message)
 
         return
       end
 
       time = Time.now.iso8601
       if @colorize_log
-        @out.puts("\e[90m#{time}\e[0m #{color}#{name.ljust(5)}\e[0m #{message}")
+        @out.write("\e[90m#{time}\e[0m #{color}#{name.ljust(5)}\e[0m #{message}\n")
       else
-        @out.puts("#{time} #{name.ljust(5)} #{message}")
+        @out.write("#{time} #{name.ljust(5)} #{message}\n")
       end
+      @out.flush
     end
   end
 end

data/lib/discorb/member.rb

@@ -105,9 +105,7 @@ module Discorb
     end
 
     def permissions
-      if owner?
-        return Permission.new((1 << 38) - 1)
-      end
+      return Permission.new((1 << 38) - 1) if owner?
       roles.map(&:permissions).sum(Permission.new(0))
     end
 
@@ -152,7 +150,7 @@ module Discorb
     #
     def add_role(role, reason: nil)
       Async do
-        @client.http.put("/guilds/#{@guild_id}/members/#{@id}/roles/#{role.is_a?(Role) ? role.id : role}", nil, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/members/#{@id}/roles/#{role.is_a?(Role) ? role.id : role}", "//guilds/:guild_id/members/:user_id/roles/:role_id", :put), nil, audit_log_reason: reason).wait
       end
     end
 
@@ -167,7 +165,7 @@ module Discorb
     #
     def remove_role(role, reason: nil)
       Async do
-        @client.http.delete("/guilds/#{@guild_id}/members/#{@id}/roles/#{role.is_a?(Role) ? role.id : role}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/members/#{@id}/roles/#{role.is_a?(Role) ? role.id : role}", "//guilds/:guild_id/members/:user_id/roles/:role_id", :delete), audit_log_reason: reason).wait
       end
     end
 
@@ -200,7 +198,7 @@ module Discorb
         communication_disabled_until = timeout_until if timeout_until != Discorb::Unset
         payload[:communication_disabled_until] = communication_disabled_until&.iso8601 if communication_disabled_until != Discorb::Unset
         payload[:channel_id] = channel&.id if channel != Discorb::Unset
-        @client.http.patch("/guilds/#{@guild_id}/members/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/members/#{@id}", "//guilds/:guild_id/members/:user_id", :patch), payload, audit_log_reason: reason).wait
       end
     end
 

data/lib/discorb/message.rb

@@ -1,68 +1,6 @@
 # frozen_string_literal: true
 
 module Discorb
-  #
-  # Represents a allowed mentions in a message.
-  #
-  class AllowedMentions
-    # @return [Boolean] Whether to allow @everyone or @here.
-    attr_accessor :everyone
-    # @return [Boolean, Array<Discorb::Role>] The roles to allow, or false to disable.
-    attr_accessor :roles
-    # @return [Boolean, Array<Discorb::User>] The users to allow, or false to disable.
-    attr_accessor :users
-    # @return [Boolean] Whether to ping the user that sent the message to reply.
-    attr_accessor :replied_user
-
-    #
-    # Initializes a new instance of the AllowedMentions class.
-    #
-    # @param [Boolean] everyone Whether to allow @everyone or @here.
-    # @param [Boolean, Array<Discorb::Role>] roles The roles to allow, or false to disable.
-    # @param [Boolean, Array<Discorb::User>] users The users to allow, or false to disable.
-    # @param [Boolean] replied_user Whether to ping the user that sent the message to reply.
-    #
-    def initialize(everyone: nil, roles: nil, users: nil, replied_user: nil)
-      @everyone = everyone
-      @roles = roles
-      @users = users
-      @replied_user = replied_user
-    end
-
-    def inspect
-      "#<#{self.class} @everyone=#{@everyone} @roles=#{@roles} @users=#{@users} @replied_user=#{@replied_user}>"
-    end
-
-    # @private
-    def to_hash(other = nil)
-      payload = {
-        parse: %w[everyone roles users],
-      }
-      replied_user = nil_merge(@replied_user, other&.replied_user)
-      everyone = nil_merge(@everyone, other&.everyone)
-      roles = nil_merge(@roles, other&.roles)
-      users = nil_merge(@users, other&.users)
-      payload[:replied_user] = replied_user
-      payload[:parse].delete("everyone") if everyone == false
-      if (roles == false) || roles.is_a?(Array)
-        payload[:roles] = roles.map { |u| u.id.to_s } if roles.is_a? Array
-        payload[:parse].delete("roles")
-      end
-      if (users == false) || users.is_a?(Array)
-        payload[:users] = users.map { |u| u.id.to_s } if users.is_a? Array
-        payload[:parse].delete("users")
-      end
-      payload
-    end
-
-    def nil_merge(*args)
-      args.each do |a|
-        return a unless a.nil?
-      end
-      nil
-    end
-  end
-
   #
   # Represents a message.
   #
@@ -257,38 +195,44 @@ module Discorb
     #
     def clean_content(user: true, channel: true, role: true, emoji: true, everyone: true, codeblock: false)
       ret = @content.dup
-      ret.gsub!(/<@!?(\d+)>/) do |match|
-        member = guild&.members&.[]($1)
-        member ||= @client.users[$1]
-        member ? "@#{member.name}" : "@Unknown User"
-      end if user
-      ret.gsub!(/<#(\d+)>/) do |match|
+      if user
+        ret.gsub!(/<@!?(\d+)>/) do |_match|
+          member = guild&.members&.[]($1)
+          member ||= @client.users[$1]
+          member ? "@#{member.name}" : "@Unknown User"
+        end
+      end
+      ret.gsub!(/<#(\d+)>/) do |_match|
         channel = @client.channels[$1]
         channel ? "<##{channel.id}>" : "#Unknown Channel"
       end
-      ret.gsub!(/<@&(\d+)>/) do |match|
-        role = guild&.roles&.[]($1)
-        role ? "@#{role.name}" : "@Unknown Role"
-      end if role
-      ret.gsub!(/<a?:([a-zA-Z0-9_]+):\d+>/) do |match|
-        $1
-      end if emoji
+      if role
+        ret.gsub!(/<@&(\d+)>/) do |_match|
+          role = guild&.roles&.[]($1)
+          role ? "@#{role.name}" : "@Unknown Role"
+        end
+      end
+      if emoji
+        ret.gsub!(/<a?:([a-zA-Z0-9_]+):\d+>/) do |_match|
+          $1
+        end
+      end
       ret.gsub!(/@(everyone|here)/, "@\u200b\\1") if everyone
-      unless codeblock
+      if codeblock
+        ret
+      else
         codeblocks = ret.split("```", -1)
         original_codeblocks = @content.scan(/```(.+?)```/m)
         res = []
         max = codeblocks.length
-        codeblocks.each_with_index do |codeblock, i|
-          if max % 2 == 0 && i == max - 1 or i.even?
-            res << codeblock
+        codeblocks.each_with_index do |single_codeblock, i|
+          res << if max.even? && i == max - 1 || i.even?
+            single_codeblock
           else
-            res << original_codeblocks[i / 2]
+            original_codeblocks[i / 2]
           end
         end
         res.join("```")
-      else
-        ret
       end
     end
 
@@ -379,7 +323,7 @@ module Discorb
     #
     def add_reaction(emoji)
       Async do
-        @client.http.put("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me", nil).wait
+        @client.http.request(Route.new("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me", "//channels/:channel_id/messages/:message_id/reactions/:emoji/@me", :put), nil).wait
       end
     end
 
@@ -395,7 +339,7 @@ module Discorb
     #
     def remove_reaction(emoji)
       Async do
-        @client.http.delete("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me").wait
+        @client.http.request(Route.new("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me", "//channels/:channel_id/messages/:message_id/reactions/:emoji/@me", :delete)).wait
       end
     end
 
@@ -412,7 +356,7 @@ module Discorb
     #
     def remove_reaction_of(emoji, member)
       Async do
-        @client.http.delete("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/#{member.is_a?(Member) ? member.id : member}").wait
+        @client.http.request(Route.new("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/#{member.is_a?(Member) ? member.id : member}", "//channels/:channel_id/messages/:message_id/reactions/:emoji/:user_id", :delete)).wait
       end
     end
 
@@ -434,7 +378,7 @@ module Discorb
           after = 0
           users = []
           loop do
-            _resp, data = @client.http.get("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}?limit=100&after=#{after}").wait
+            _resp, data = @client.http.request(Route.new("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}?limit=100&after=#{after}", "//channels/:channel_id/messages/:message_id/reactions/:emoji", :get)).wait
             break if data.empty?
 
             users += data.map { |r| guild&.members&.[](r[:id]) || @client.users[r[:id]] || User.new(@client, r) }
@@ -445,7 +389,7 @@ module Discorb
           end
           next users
         else
-          _resp, data = @client.http.get("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}?limit=#{limit}&after=#{after}").wait
+          _resp, data = @client.http.request(Route.new("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}?limit=#{limit}&after=#{after}", "//channels/:channel_id/messages/:message_id/reactions/:emoji", :get)).wait
           next data.map { |r| guild&.members&.[](r[:id]) || @client.users[r[:id]] || User.new(@client, r) }
         end
       end
@@ -501,201 +445,6 @@ module Discorb
       "#<#{self.class} #{@content.inspect} id=#{@id}>"
     end
 
-    #
-    # Represents message flag.
-    # ## Flag fields
-    # |Field|Value|
-    # |-|-|
-    # |`1 << 0`|`:crossposted`|
-    # |`1 << 1`|`:crosspost`|
-    # |`1 << 2`|`:supress_embeds`|
-    # |`1 << 3`|`:source_message_deleted`|
-    # |`1 << 4`|`:urgent`|
-    # |`1 << 5`|`:has_thread`|
-    # |`1 << 6`|`:ephemeral`|
-    # |`1 << 7`|`:loading`|
-    #
-    class Flag < Discorb::Flag
-      @bits = {
-        crossposted: 0,
-        crosspost: 1,
-        supress_embeds: 2,
-        source_message_deleted: 3,
-        urgent: 4,
-        has_thread: 5,
-        ephemeral: 6,
-        loading: 7,
-      }.freeze
-    end
-
-    #
-    # Represents reference of message.
-    #
-    class Reference
-      # @return [Discorb::Snowflake] The guild ID.
-      attr_accessor :guild_id
-      # @return [Discorb::Snowflake] The channel ID.
-      attr_accessor :channel_id
-      # @return [Discorb::Snowflake] The message ID.
-      attr_accessor :message_id
-      # @return [Boolean] Whether fail the request if the message is not found.
-      attr_accessor :fail_if_not_exists
-
-      alias fail_if_not_exists? fail_if_not_exists
-
-      #
-      # Initialize a new reference.
-      #
-      # @param [Discorb::Snowflake] guild_id The guild ID.
-      # @param [Discorb::Snowflake] channel_id The channel ID.
-      # @param [Discorb::Snowflake] message_id The message ID.
-      # @param [Boolean] fail_if_not_exists Whether fail the request if the message is not found.
-      #
-      def initialize(guild_id, channel_id, message_id, fail_if_not_exists: true)
-        @guild_id = guild_id
-        @channel_id = channel_id
-        @message_id = message_id
-        @fail_if_not_exists = fail_if_not_exists
-      end
-
-      #
-      # Convert the reference to a hash.
-      #
-      # @return [Hash] The hash.
-      #
-      def to_hash
-        {
-          message_id: @message_id,
-          channel_id: @channel_id,
-          guild_id: @guild_id,
-          fail_if_not_exists: @fail_if_not_exists,
-        }
-      end
-
-      alias to_reference to_hash
-
-      #
-      # Initialize a new reference from a hash.
-      #
-      # @param [Hash] data The hash.
-      #
-      # @return [Discorb::Message::Reference] The reference.
-      # @see https://discord.com/developers/docs/resources/channel#message-reference-object
-      #
-      def self.from_hash(data)
-        new(data[:guild_id], data[:channel_id], data[:message_id], fail_if_not_exists: data[:fail_if_not_exists])
-      end
-    end
-
-    class Sticker
-      attr_reader :id, :name, :format
-
-      def initialize(data)
-        @id = Snowflake.new(data[:id])
-        @name = data[:name]
-        @format = Discorb::Sticker.sticker_format[data[:format]]
-      end
-    end
-
-    private
-
-    def _set_data(data)
-      @id = Snowflake.new(data[:id])
-      @channel_id = data[:channel_id]
-
-      if data[:guild_id]
-        @guild_id = data[:guild_id]
-        @dm = nil
-      else
-        @dm = Discorb::DMChannel.new(@client, data[:channel_id])
-        @guild_id = nil
-      end
-
-      if data[:member].nil? && data[:webhook_id]
-        @webhook_id = Snowflake.new(data[:webhook_id])
-        @author = Webhook::Message::Author.new(data[:author])
-      elsif data[:guild_id].nil? || data[:guild_id].empty? || data[:member].nil?
-        @author = @client.users[data[:author][:id]] || User.new(@client, data[:author])
-      else
-        @author = guild&.members&.get(data[:author][:id]) || Member.new(@client,
-                                                                        @guild_id, data[:author], data[:member])
-      end
-      @content = data[:content]
-      @created_at = Time.iso8601(data[:timestamp])
-      @updated_at = data[:edited_timestamp].nil? ? nil : Time.iso8601(data[:edited_timestamp])
-
-      @tts = data[:tts]
-      @mention_everyone = data[:mention_everyone]
-      @mention_roles = data[:mention_roles].map { |r| guild.roles[r] }
-      @attachments = data[:attachments].map { |a| Attachment.new(a) }
-      @embeds = data[:embeds] ? data[:embeds].map { |e| Embed.new(data: e) } : []
-      @reactions = data[:reactions] ? data[:reactions].map { |r| Reaction.new(self, r) } : []
-      @pinned = data[:pinned]
-      @type = self.class.message_type[data[:type]]
-      @activity = data[:activity] && Activity.new(data[:activity])
-      @application_id = data[:application_id]
-      @message_reference = data[:message_reference] && Reference.from_hash(data[:message_reference])
-      @flag = Flag.new(0b111 - data[:flags])
-      @sticker_items = data[:sticker_items] ? data[:sticker_items].map { |s| Message::Sticker.new(s) } : []
-      # @referenced_message = data[:referenced_message] && Message.new(@client, data[:referenced_message])
-      @interaction = data[:interaction] && Message::Interaction.new(@client, data[:interaction])
-      @thread = data[:thread] && Channel.make_channel(@client, data[:thread])
-      @components = data[:components].map { |c| c[:components].map { |co| Component.from_hash(co) } }
-      @data.update(data)
-      @deleted = false
-    end
-
-    #
-    # Represents a interaction of message.
-    #
-    class Interaction < DiscordModel
-      # @return [Discorb::Snowflake] The user ID.
-      attr_reader :id
-      # @return [String] The name of command.
-      # @return [nil] If the message is not a command.
-      attr_reader :name
-      # @return [Class] The type of interaction.
-      attr_reader :type
-      # @return [Discorb::User] The user.
-      attr_reader :user
-
-      # @private
-      def initialize(client, data)
-        @id = Snowflake.new(data[:id])
-        @name = data[:name]
-        @type = Discorb::Interaction.descendants.find { |c| c.interaction_type == data[:type] }
-        @user = client.users[data[:user][:id]] || User.new(client, data[:user])
-      end
-    end
-
-    #
-    # Represents a activity of message.
-    #
-    class Activity < DiscordModel
-      # @return [String] The name of activity.
-      attr_reader :name
-      # @return [Symbol] The type of activity.
-      attr_reader :type
-
-      @type = {
-        1 => :join,
-        2 => :spectate,
-        3 => :listen,
-        5 => :join_request,
-      }
-
-      # @private
-      def initialize(data)
-        @name = data[:name]
-        @type = self.class.type(data[:type])
-      end
-
-      class << self
-        # @private
-        attr_reader :type
-      end
-    end
-
     class << self
       # @private
       attr_reader :message_type

data/lib/discorb/message_meta.rb

@@ -0,0 +1,205 @@
+# frozen_string_literal: true
+module Discorb
+  #
+  # Represents a message in Discord.
+  #
+  class Message < DiscordModel
+    #
+    # Represents message flag.
+    # ## Flag fields
+    # |Field|Value|
+    # |-|-|
+    # |`1 << 0`|`:crossposted`|
+    # |`1 << 1`|`:crosspost`|
+    # |`1 << 2`|`:supress_embeds`|
+    # |`1 << 3`|`:source_message_deleted`|
+    # |`1 << 4`|`:urgent`|
+    # |`1 << 5`|`:has_thread`|
+    # |`1 << 6`|`:ephemeral`|
+    # |`1 << 7`|`:loading`|
+    #
+    class Flag < Discorb::Flag
+      @bits = {
+        crossposted: 0,
+        crosspost: 1,
+        supress_embeds: 2,
+        source_message_deleted: 3,
+        urgent: 4,
+        has_thread: 5,
+        ephemeral: 6,
+        loading: 7,
+      }.freeze
+    end
+
+    #
+    # Represents reference of message.
+    #
+    class Reference
+      # @return [Discorb::Snowflake] The guild ID.
+      attr_accessor :guild_id
+      # @return [Discorb::Snowflake] The channel ID.
+      attr_accessor :channel_id
+      # @return [Discorb::Snowflake] The message ID.
+      attr_accessor :message_id
+      # @return [Boolean] Whether fail the request if the message is not found.
+      attr_accessor :fail_if_not_exists
+
+      alias fail_if_not_exists? fail_if_not_exists
+
+      #
+      # Initialize a new reference.
+      #
+      # @param [Discorb::Snowflake] guild_id The guild ID.
+      # @param [Discorb::Snowflake] channel_id The channel ID.
+      # @param [Discorb::Snowflake] message_id The message ID.
+      # @param [Boolean] fail_if_not_exists Whether fail the request if the message is not found.
+      #
+      def initialize(guild_id, channel_id, message_id, fail_if_not_exists: true)
+        @guild_id = guild_id
+        @channel_id = channel_id
+        @message_id = message_id
+        @fail_if_not_exists = fail_if_not_exists
+      end
+
+      #
+      # Convert the reference to a hash.
+      #
+      # @return [Hash] The hash.
+      #
+      def to_hash
+        {
+          message_id: @message_id,
+          channel_id: @channel_id,
+          guild_id: @guild_id,
+          fail_if_not_exists: @fail_if_not_exists,
+        }
+      end
+
+      alias to_reference to_hash
+
+      #
+      # Initialize a new reference from a hash.
+      #
+      # @param [Hash] data The hash.
+      #
+      # @return [Discorb::Message::Reference] The reference.
+      # @see https://discord.com/developers/docs/resources/channel#message-reference-object
+      #
+      def self.from_hash(data)
+        new(data[:guild_id], data[:channel_id], data[:message_id], fail_if_not_exists: data[:fail_if_not_exists])
+      end
+    end
+
+    #
+    # Represents a sticker.
+    #
+    class Sticker
+      attr_reader :id, :name, :format
+
+      def initialize(data)
+        @id = Snowflake.new(data[:id])
+        @name = data[:name]
+        @format = Discorb::Sticker.sticker_format[data[:format]]
+      end
+    end
+
+    private
+
+    def _set_data(data)
+      @id = Snowflake.new(data[:id])
+      @channel_id = data[:channel_id]
+
+      if data[:guild_id]
+        @guild_id = data[:guild_id]
+        @dm = nil
+      else
+        @dm = Discorb::DMChannel.new(@client, data[:channel_id])
+        @guild_id = nil
+      end
+
+      if data[:member].nil? && data[:webhook_id]
+        @webhook_id = Snowflake.new(data[:webhook_id])
+        @author = Webhook::Message::Author.new(data[:author])
+      elsif data[:guild_id].nil? || data[:guild_id].empty? || data[:member].nil?
+        @author = @client.users[data[:author][:id]] || User.new(@client, data[:author])
+      else
+        @author = guild&.members&.get(data[:author][:id]) || Member.new(@client,
+                                                                        @guild_id, data[:author], data[:member])
+      end
+      @content = data[:content]
+      @created_at = Time.iso8601(data[:timestamp])
+      @updated_at = data[:edited_timestamp].nil? ? nil : Time.iso8601(data[:edited_timestamp])
+
+      @tts = data[:tts]
+      @mention_everyone = data[:mention_everyone]
+      @mention_roles = data[:mention_roles].map { |r| guild.roles[r] }
+      @attachments = data[:attachments].map { |a| Attachment.new(a) }
+      @embeds = data[:embeds] ? data[:embeds].map { |e| Embed.new(data: e) } : []
+      @reactions = data[:reactions] ? data[:reactions].map { |r| Reaction.new(self, r) } : []
+      @pinned = data[:pinned]
+      @type = self.class.message_type[data[:type]]
+      @activity = data[:activity] && Activity.new(data[:activity])
+      @application_id = data[:application_id]
+      @message_reference = data[:message_reference] && Reference.from_hash(data[:message_reference])
+      @flag = Flag.new(0b111 - data[:flags])
+      @sticker_items = data[:sticker_items] ? data[:sticker_items].map { |s| Message::Sticker.new(s) } : []
+      # @referenced_message = data[:referenced_message] && Message.new(@client, data[:referenced_message])
+      @interaction = data[:interaction] && Message::Interaction.new(@client, data[:interaction])
+      @thread = data[:thread] && Channel.make_channel(@client, data[:thread])
+      @components = data[:components].map { |c| c[:components].map { |co| Component.from_hash(co) } }
+      @data.update(data)
+      @deleted = false
+    end
+
+    #
+    # Represents a interaction of message.
+    #
+    class Interaction < DiscordModel
+      # @return [Discorb::Snowflake] The user ID.
+      attr_reader :id
+      # @return [String] The name of command.
+      # @return [nil] If the message is not a command.
+      attr_reader :name
+      # @return [Class] The type of interaction.
+      attr_reader :type
+      # @return [Discorb::User] The user.
+      attr_reader :user
+
+      # @private
+      def initialize(client, data)
+        @id = Snowflake.new(data[:id])
+        @name = data[:name]
+        @type = Discorb::Interaction.descendants.find { |c| c.interaction_type == data[:type] }
+        @user = client.users[data[:user][:id]] || User.new(client, data[:user])
+      end
+    end
+
+    #
+    # Represents a activity of message.
+    #
+    class Activity < DiscordModel
+      # @return [String] The name of activity.
+      attr_reader :name
+      # @return [Symbol] The type of activity.
+      attr_reader :type
+
+      @type = {
+        1 => :join,
+        2 => :spectate,
+        3 => :listen,
+        5 => :join_request,
+      }
+
+      # @private
+      def initialize(data)
+        @name = data[:name]
+        @type = self.class.type(data[:type])
+      end
+
+      class << self
+        # @private
+        attr_reader :type
+      end
+    end
+  end
+end