mij-discord 1.0.7 → 1.0.8

data/lib/mij-discord/data.rb

@@ -31,7 +31,7 @@ module MijDiscord::Data
   end
 
   module PermissionObject
-
+    # TODO: Figure out what this was for
   end
 
   class ColorRGB
@@ -61,5 +61,9 @@ module MijDiscord::Data
     def to_hex
       '%06x' % @value
     end
+
+    def inspect
+      %(#<ColorRGB ##{to_hex}>)
+    end
   end
 end

data/lib/mij-discord/data/application.rb

@@ -30,5 +30,9 @@ module MijDiscord::Data
       return nil if @icon_id.nil?
       MijDiscord::Core::API.app_icon_url(@id, @icon_id, format)
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :id, :name, :description, :flags)
+    end
   end
 end

data/lib/mij-discord/data/channel.rb

@@ -204,6 +204,10 @@ module MijDiscord::Data
       MijDiscord::Core::API::Channel.delete(@bot.auth, @id, reason)
       @server.cache.remove_channel(@id)
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :id, :name, :type, :position)
+    end
   end
 
   class TextChannel < Channel
@@ -295,16 +299,19 @@ module MijDiscord::Data
     alias_method :nsfw=, :set_nsfw
 
     def send_message(text: '', embed: nil, tts: false)
-      raise MijDiscord::Core::Errors::MessageTooLong if text.length > 2000
-
-      response = MijDiscord::Core::API::Channel.create_message(@bot.auth, @id,
-        text, tts, embed&.to_h)
+      embed = case embed
+        when nil then nil
+        when Hash
+          Embed.construct(embed)
+        when Embed then embed
+        else raise ArgumentError, 'Invalid embed'
+      end&.to_hash
+
+      response = MijDiscord::Core::API::Channel.create_message(@bot.auth, @id, text, tts, embed)
       @cache.put_message(JSON.parse(response))
     end
 
     def send_file(file, caption: '', tts: false)
-      raise MijDiscord::Core::Errors::MessageTooLong if caption.length > 2000
-
       response = MijDiscord::Core::API::Channel.upload_file(@bot.auth, @id, file, caption, tts)
       @cache.put_message(JSON.parse(response))
     end
@@ -348,6 +355,11 @@ module MijDiscord::Data
       JSON.parse(response).map {|x| Invite.new(x, @bot) }
     end
 
+    def webhooks
+      response = MijDiscord::Core::API::Channel.webhooks(@bot.auth, @id)
+      JSON.parse(response).map {|x| Webhook.new(x, @bot) }
+    end
+
     def make_invite(reason = nil, max_age: 0, max_uses: 0, temporary: false, unique: false)
       response = MijDiscord::Core::API::Channel.create_invite(@bot.auth, @id,
         max_age, max_uses, temporary, unique, reason)
@@ -356,6 +368,14 @@ module MijDiscord::Data
 
     alias_method :invite, :make_invite
 
+    def make_webhook(reason = nil, name:, avatar: :empty, format: :png)
+      avatar = User.process_avatar(avatar, format, true)
+      response = MijDiscord::Core::API::Channel.create_webhook(@bot.auth, @id, name, avatar, reason)
+      Webhook.new(JSON.parse(response), @bot)
+    end
+
+    alias_method :webhook, :make_webhook
+
     def start_typing
       MijDiscord::Core::API::Channel.start_typing(@bot.auth, @id)
       nil
@@ -396,6 +416,10 @@ module MijDiscord::Data
       MijDiscord::Core::API::Channel.leave_group(@bot.auth, @id)
       nil
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :id, :name, :type, :position, :topic, :nsfw)
+    end
   end
 
   class VoiceChannel < Channel
@@ -430,6 +454,10 @@ module MijDiscord::Data
     alias_method :user_limit=, :set_user_limit
     alias_method :set_limit, :set_user_limit
     alias_method :limit=, :set_user_limit
+
+    def inspect
+      MijDiscord.make_inspect(self, :id, :name, :type, :position, :bitrate, :user_limit)
+    end
   end
 
   class ChannelCategory < Channel

data/lib/mij-discord/data/embed.rb

@@ -46,6 +46,60 @@ module MijDiscord::Data
 
       @fields = data['fields']&.map {|x| EmbedField.new(x) }
     end
+
+    def inspect
+      MijDiscord.make_inspect(self,
+        :type, :title, :description, :url, :color, :timestamp, :image,
+        :video, :thumbnail, :footer, :author, :provider, :fields)
+    end
+
+    def to_hash
+      self.class.construct({
+        type: @type,
+        title: @title,
+        description: @description,
+        url: @url,
+
+        color: @color,
+        timestamp: @timestamp,
+
+        footer: @footer,
+        thumbnail: @thumbnail,
+
+        image: @image,
+        video: @video,
+
+        author: @author,
+        provider: @provider,
+
+        fields: @fields,
+      })
+    end
+
+    def self.construct(data)
+      embed = {
+        type: data.try_keys(:type, 'type') || :rich,
+        title: data.try_keys(:title, 'title'),
+        description: data.try_keys(:description, 'description'),
+        url: data.try_keys(:url, 'url'),
+
+        color: data.try_keys(:color, 'color')&.to_i,
+        timestamp: data.try_keys(:timestamp, 'timestamp')&.iso8601,
+
+        footer: data.try_keys(:footer, 'footer')&.to_hash,
+        thumbnail: data.try_keys(:thumbnail, 'thumbnail')&.to_hash,
+
+        image: data.try_keys(:image, 'image')&.to_hash,
+        video: data.try_keys(:video, 'video')&.to_hash,
+
+        author: data.try_keys(:author, 'author')&.to_hash,
+        provider: data.try_keys(:provider, 'provider')&.to_hash,
+
+        fields: data.try_keys(:fields, 'fields')&.map(&:to_hash),
+      }.delete_if {|_,v| v.nil? }
+
+      embed
+    end
   end
 
   class EmbedFooter
@@ -59,6 +113,17 @@ module MijDiscord::Data
       @text, @icon_url = data['text'], data['icon_url']
       @proxy_icon_url =  data['proxy_icon_url']
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :text, :icon_url)
+    end
+
+    def to_hash
+      {
+        text: @text,
+        icon_url: @icon_url,
+      }.delete_if {|_,v| v.nil? }
+    end
   end
 
   class EmbedMedia
@@ -74,6 +139,18 @@ module MijDiscord::Data
       @url, @width, @height = data['url'], data['width'], data['height']
       @proxy_url = data['proxy_url']
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :url, :width, :height)
+    end
+
+    def to_hash
+      {
+        url: @url,
+        width: @width,
+        height: @height,
+      }.delete_if {|_,v| v.nil? }
+    end
   end
 
   class EmbedAuthor
@@ -89,6 +166,18 @@ module MijDiscord::Data
       @name, @url, @icon_url = data['name'], data['url'], data['icon_url']
       @proxy_icon_url = data['proxy_icon_url']
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :name, :url, :icon_url)
+    end
+
+    def to_hash
+      {
+        name: @name,
+        url: @url,
+        icon_url: @icon_url,
+      }.delete_if {|_,v| v.nil? }
+    end
   end
 
   class EmbedProvider
@@ -99,6 +188,17 @@ module MijDiscord::Data
     def initialize(data)
       @name, @url = data['name'], data['url']
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :name, :url)
+    end
+
+    def to_hash
+      {
+        name: @name,
+        url: @url,
+      }.delete_if {|_,v| v.nil? }
+    end
   end
 
   class EmbedField
@@ -111,5 +211,17 @@ module MijDiscord::Data
     def initialize(data)
       @name, @value, @inline = data['name'], data['value'], data['inline']
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :name, :value, :inline)
+    end
+
+    def to_hash
+      {
+        name: @name,
+        value: @value,
+        inline: @inline,
+      }.delete_if {|_,v| v.nil? }
+    end
   end
 end

data/lib/mij-discord/data/emoji.rb

@@ -10,11 +10,14 @@ module MijDiscord::Data
 
     attr_reader :roles
 
+    attr_reader :animated
+
     def initialize(data, bot, server)
       @bot, @server = bot, server
 
       @id = data['id'].to_i
       @name = data['name']
+      @animated = !!data['animated']
 
       @roles = []
       if @server && (roles = data['roles'])
@@ -23,7 +26,8 @@ module MijDiscord::Data
     end
 
     def mention
-      "<:#{@name}:#{@id}>"
+      a = @animated ? 'a' : ''
+      "<#{a}:#{@name}:#{@id}>"
     end
 
     alias_method :to_s, :mention
@@ -32,9 +36,14 @@ module MijDiscord::Data
       @id.zero? ? @name : "#{@name}:#{@id}"
     end
 
-    def icon_url(format = :png)
+    def icon_url(format = nil)
+      format = @animated ? :gif : :png if format.nil?
       MijDiscord::Core::API.emoji_icon_url(@id, format)
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :id, :name, :animated)
+    end
   end
 
   class Reaction
@@ -54,5 +63,9 @@ module MijDiscord::Data
       @id = data['emoji']['id']&.to_i
       @name = data['emoji']['name']
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :id, :name, :count, :me)
+    end
   end
 end

data/lib/mij-discord/data/invite.rb

@@ -15,6 +15,10 @@ module MijDiscord::Data
       @name = data['name']
       @type = data['type']
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :id, :name, :type)
+    end
   end
 
   class InviteServer
@@ -31,6 +35,10 @@ module MijDiscord::Data
       @name = data['name']
       @splash_hash = data['splash_hash']
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :id, :name)
+    end
   end
 
   class Invite
@@ -52,6 +60,10 @@ module MijDiscord::Data
     attr_reader :revoked
     alias_method :revoked?, :revoked
 
+    attr_reader :online_members
+
+    attr_reader :total_members
+
     def initialize(data, bot)
       @bot = bot
 
@@ -61,6 +73,9 @@ module MijDiscord::Data
       @code, @max_uses = data['code'], data['uses']
       @temporary, @revoked = data['temporary'], data['revoked']
 
+      @online_members = data['approximate_presence_count']
+      @total_members = data['approximate_member_count']
+
       @inviter = data['inviter'] ? @bot.cache.put_user(data['inviter']) : nil
     end
 
@@ -79,5 +94,10 @@ module MijDiscord::Data
     def invite_url
       "https://discord.gg/#{@code}"
     end
+
+    def inspect
+      MijDiscord.make_inspect(self,
+        :code, :channel, :server, :max_uses, :temporary, :revoked, :inviter)
+    end
   end
 end

data/lib/mij-discord/data/member.rb

@@ -135,6 +135,11 @@ module MijDiscord::Data
       nickname.empty? ? username : nickname
     end
 
+    def inspect
+      MijDiscord.make_inspect(self,
+        :id, :username, :discriminator, :avatar_id, :bot_account, :joined_at, :nickname, :roles)
+    end
+
     private
 
     def voice_state_attribute(key)
@@ -162,5 +167,10 @@ module MijDiscord::Data
       @voice_channel, @server, @roles = nil, nil, []
       @nickname, @joined_at = '', @channel.creation_time
     end
+
+    def inspect
+      MijDiscord.make_inspect(self,
+        :id, :username, :discriminator, :avatar_id, :bot_account, :joined_at)
+    end
   end
 end

data/lib/mij-discord/data/message.rb

@@ -35,7 +35,7 @@ module MijDiscord::Data
     attr_reader :tts
     alias_method :tts?, :tts
 
-    # attr_reader :nonce
+    attr_reader :nonce
 
     attr_reader :edited
     alias_method :edited?, :edited
@@ -48,10 +48,12 @@ module MijDiscord::Data
     def initialize(data, bot)
       @bot = bot
 
+      data = data.first if data.is_a?(Array)
+
       @id = data['id'].to_i
       @channel = @bot.channel(data['channel_id'])
 
-      # @nonce = data['nonce']
+      @nonce = data['nonce']
       @webhook_id = data['webhook_id']&.to_i
 
       if (author = data['author'])
@@ -114,8 +116,17 @@ module MijDiscord::Data
     end
 
     def edit(text: '', embed: nil)
-      response = MijDiscord::Core::API::Channel.edit_message(@bot.auth, @channel.id, @id,
-        text, [], embed&.to_h)
+      raise MijDiscord::Errors::MessageTooLong if text.length > 2000
+
+      embed = case embed
+        when nil then nil
+        when Hash
+          MijDiscord::Data::Embed.construct(embed)
+        when MijDiscord::Data::Embed then embed
+        else raise ArgumentError, 'Invalid embed'
+      end&.to_hash
+
+      response = MijDiscord::Core::API::Channel.edit_message(@bot.auth, @channel.id, @id, text, [], embed)
       @channel.cache.put_message(JSON.parse(response), update: true)
     end
 
@@ -170,6 +181,12 @@ module MijDiscord::Data
       MijDiscord::Core::API::Channel.delete_message(@bot.auth, @channel.id, @id)
       nil
     end
+
+    def inspect
+      MijDiscord.make_inspect(self,
+        :id, :content, :author, :channel, :timestamp, :edited, :pinned, :edited_timestamp,
+        :user_mentions, :role_mentions, :attachments, :embeds, :tts, :webhook_id)
+    end
   end
 
   class Attachment
@@ -198,5 +215,9 @@ module MijDiscord::Data
     def image?
       !@width.nil? && !@height.nil?
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :url, :filename, :size, :width, :height)
+    end
   end
 end