mij-discord 1.0.7 → 1.0.8

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

@@ -41,6 +41,10 @@ module MijDiscord::Data
       FLAGS.map {|bit, name| list.include?(name) ? bit : 0 }.reduce(&:|)
     end
 
+    def self.flags(bits)
+      Set.new(FLAGS.map {|bit, name| (bits & bit).zero? ? nil : name }.reject(&:nil?))
+    end
+
     FLAGS.each do |bit, name|
       attr_reader name
       alias_method :"#{name}?", name
@@ -71,6 +75,14 @@ module MijDiscord::Data
     end
 
     alias_method :bits=, :set_bits
+
+    def flags
+      Permissions.flags(@bits)
+    end
+
+    def inspect
+      %(#<Permissions #{flags.to_a}>)
+    end
   end
 
   class Overwrite
@@ -117,5 +129,9 @@ module MijDiscord::Data
     def to_hash
       { id: @id, type: @type, allow: @allow.bits, deny: @deny.bits }
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :id, :type, :allow, :deny)
+    end
   end
 end

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

@@ -93,5 +93,10 @@ module MijDiscord::Data
         name, color&.to_i, hoist, mentionable, permissions&.to_i)
       @server.cache.put_role(JSON.parse(response), update: true)
     end
+
+    def inspect
+      MijDiscord.make_inspect(self,
+        :id, :name, :color, :position, :hoist, :mentionable, :managed, :permissions)
+    end
   end
 end

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

@@ -46,7 +46,7 @@ module MijDiscord::Data
     alias_method :embed_enabled?, :embed_enabled
     alias_method :has_embed?, :embed_enabled
 
-    # attr_reader :member_count
+    attr_reader :member_count
 
     attr_reader :verification_level
 
@@ -101,7 +101,7 @@ module MijDiscord::Data
           id = data['afk_channel_id'].to_i
           @afk_channel = @bot.channel(id, self)
         end
-      rescue MijDiscord::Errors::NoPermission
+      rescue MijDiscord::Errors::Forbidden
         @afk_channel = nil
       end
     end
@@ -239,6 +239,11 @@ module MijDiscord::Data
       JSON.parse(response).map {|x| Invite.new(x, @bot) }
     end
 
+    def webhooks
+      response = MijDiscord::Core::API::Server.webhooks(@bot.auth, @id)
+      JSON.parse(response).map {|x| Webhook.new(x, @bot) }
+    end
+
     def prune_count(days)
       raise ArgumentError, 'Days must be between 1 and 30' unless days.between?(1, 30)
 
@@ -419,10 +424,20 @@ module MijDiscord::Data
       response = MijDiscord::Core::API::Server.search_messages(@bot.auth, @id, options)
       SearchResults.new(JSON.parse(response), @bot)
     end
+
+    def inspect
+      MijDiscord.make_inspect(self,
+      :id, :name, :owner, :member_count, :features, :embed_enabled, :verification_level,
+      :content_filter_level, :default_notifications, :afk_timeout, :afk_channel)
+    end
   end
 
   class SearchResults
-    ResultData = Struct.new(:result, :context)
+    ResultData = Struct.new(:result, :context) do
+      def inspect
+        MijDiscord.make_inspect(self, :result, :context)
+      end
+    end
 
     attr_reader :total_count
 
@@ -437,5 +452,9 @@ module MijDiscord::Data
         ResultData.new(result, context)
       end
     end
+
+    def inspect
+      MijDiscord.make_inspect(self, :total_count, :messages)
+    end
   end
 end

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

@@ -41,6 +41,7 @@ module MijDiscord::Data
       @url = data['url']
       @details = data['details']
       @state = data['state']
+      @application = data['application_id']
 
       if (start_time = data.dig('timestamps', 'start'))
         @start_time = Time.at(start_time).utc
@@ -72,32 +73,40 @@ module MijDiscord::Data
         url: @url,
         details: @details,
         state: @state,
+        application: @application,
       })
     end
 
+    def inspect
+      MijDiscord.make_inspect(self,
+        :type, :name, :url, :details, :state, :start_time, :end_time,
+        :application, :large_image, :large_text, :small_image, :small_text)
+    end
+
     def self.construct(data)
       data = {name: data} if data.is_a?(String)
 
       times = {
-        start: data[:start_time]&.to_i,
-        end: data[:end_time]&.to_i,
+        start: data.try_keys(:start_time, 'start_time')&.to_i,
+        end: data.try_keys(:end_time, 'end_time')&.to_i,
       }.delete_if {|_,v| v.nil? }
 
       assets = {
-        large_image: data[:large_image],
-        large_text: data[:large_text],
-        small_image: data[:small_image],
-        small_text: data[:small_text],
+        large_image: data.try_keys(:large_image, 'large_image'),
+        large_text: data.try_keys(:large_text, 'large_text'),
+        small_image: data.try_keys(:small_image, 'small_image'),
+        small_text: data.try_keys(:small_text, 'small_text'),
       }.delete_if {|_,v| v.nil? }
 
-      type = PLAYING_TYPE.index(data[:type])
+      type = PLAYING_TYPE.index(data.try_keys(:type, 'type'))
 
       game = {
         type: type || 0,
-        name: data[:name],
-        url: data[:url],
-        details: data[:details],
-        state: data[:state],
+        name: data.try_keys(:name, 'name'),
+        url: data.try_keys(:url, 'url'),
+        details: data.try_keys(:details, 'details'),
+        state: data.try_keys(:state, 'state'),
+        application_id: data.try_keys(:application, 'application'),
 
         timestamps: times.empty? ? nil : times,
         assets: assets.empty? ? nil : assets,
@@ -233,6 +242,27 @@ module MijDiscord::Data
     end
 
     alias_method :avatar, :avatar_url
+
+    def inspect
+      MijDiscord.make_inspect(self,
+        :id, :username, :discriminator, :avatar_id, :bot_account)
+    end
+
+    class << self
+      def process_avatar(data, format = :png, empty = false)
+        if data.is_a?(String)
+          "data:image/#{format};base64,#{data}"
+        elsif data.respond_to?(:read)
+          data.binmode if data.respond_to?(:binmode)
+          data = Base64.strict_encode64(data.read)
+          "data:image/#{format};base64,#{data}"
+        elsif empty && %i[none empty].include?(data)
+          nil
+        else
+          raise ArgumentError, 'Invalid avatar data provided'
+        end
+      end
+    end
   end
 
   class Profile < User
@@ -256,17 +286,8 @@ module MijDiscord::Data
     alias_method :name=, :set_username
 
     def set_avatar(data, format = :png)
-      if data.is_a?(String)
-        data = "data:image/#{format};base64,#{data}"
-      elsif data.respond_to?(:read)
-        data.binmode if data.respond_to?(:binmode)
-        data = Base64.strict_encode64(data.read)
-        data = "data:image/#{format};base64,#{data}"
-      else
-        raise ArgumentError, 'Invalid avatar data provided'
-      end
-
-      response = MijDiscord::Core::API::User.update_profile(@bot.auth, @username, data)
+      data = User.process_avatar(data, format, false)
+      response = MijDiscord::Core::API::User.update_profile(@bot.auth, nil, data)
       update_data(JSON.parse(response))
       nil
     end

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

@@ -31,6 +31,11 @@ module MijDiscord::Data
       @self_mute = data.fetch('self_mute', @self_mute)
       @self_deaf = data.fetch('self_deaf', @self_deaf)
     end
+
+    def inspect
+      MijDiscord.make_inspect(self,
+        :user, :mute, :deaf, :self_mute, :self_deaf, :voice_channel)
+    end
   end
 
   class VoiceRegion
@@ -64,5 +69,11 @@ module MijDiscord::Data
       @deprecated = data['deprecated']
       @custom = data['custom']
     end
+
+    def inspect
+      MijDiscord.make_inspect(self,
+        :id, :name, :vip, :optimal, :deprecated, :custom,
+        :sample_hostname, :sample_port)
+    end
   end
 end

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

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module MijDiscord::Data
+  class Webhook
+    include IDObject
+
+    attr_reader :bot
+
+    attr_reader :name
+
+    attr_reader :channel
+
+    attr_reader :token
+
+    attr_reader :avatar_id
+
+    attr_reader :owner
+
+    def initialize(data, bot)
+      @bot = bot
+
+      @id = data['id'].to_id
+      @token = data['token']
+      update_data(data)
+
+      if (user = data['user'])
+        unless (@owner = server.member(user['id']))
+          @owner = @bot.cache.put_user(user)
+        end
+      end
+    end
+
+    def update_data(data)
+      @name = data['name']
+      @channel = @bot.channel(data['channel_id'])
+      @avatar_id = data['avatar']
+    end
+
+    def via_token?
+      @owner.nil?
+    end
+
+    def server
+      @channel.server
+    end
+
+    def avatar_url(format = nil)
+      return MijDiscord::Core::API::User.default_avatar(0) unless @avatar_id
+      MijDiscord::Core::API::User.avatar_url(@id, @avatar_id, format)
+    end
+
+    alias_method :avatar, :avatar_url
+
+    def set_options(reason = nil, name: nil, channel: nil, avatar: nil, format: :png)
+      data = {name: name, channel_id: channel&.to_id}
+      data[:avatar] = User.process_avatar(avatar, format, true) unless avatar.nil?
+      update_webhook(reason, **data.delete_if {|_,v| v.nil? })
+    end
+
+    def set_name(name, reason = nil)
+      update_webhook(reason, name: name)
+    end
+
+    alias_method :name=, :set_name
+
+    def set_channel(channel, reason = nil)
+      update_webhook(reason, channel_id: channel.to_id)
+    end
+
+    alias_method :channel=, :set_channel
+
+    def set_avatar(data, format = :png, reason = nil)
+      data = User.process_avatar(data, format, true)
+      update_webhook(reason, avatar: data)
+    end
+
+    alias_method :avatar=, :set_avatar
+
+    def delete(reason = nil)
+      if via_token?
+        MijDiscord::Core::API::Webhook.token_delete_webhook(@token, @id, reason)
+      else
+        MijDiscord::Core::API::Webhook.delete_webhook(@bot.auth, @id, reason)
+      end
+
+      nil
+    end
+
+    def execute(text: '', name: nil, avatar: nil, tts: false, embeds: [], file: nil, wait: true)
+      raise 'Not yet implemented' unless file.nil? # TODO: Implement
+
+      params = {
+        content: text,
+        username: name,
+        avatar_url: avatar,
+        tts: tts,
+        embeds: embeds.map(&:to_hash),
+      }.delete_if {|_,v| v.nil? }
+
+      response = MijDiscord::Core::API::Webhook.execute_json(@token, @id, params, wait)
+      wait ? Message.new(JSON.parse(response), @bot) : nil
+    end
+
+    def inspect
+      MijDiscord.make_inspect(self, :id, :name, :channel, :owner)
+    end
+
+    private
+
+    def update_webhook(reason, **data)
+      response = if via_token?
+        MijDiscord::Core::API::Webhook.token_update_webhook(@token, @id, data, reason)
+      else
+        MijDiscord::Core::API::Webhook.update_webhook(@bot.auth, @id, data, reason)
+      end
+
+      update_data(JSON.parse(response))
+      nil
+    end
+  end
+end

data/lib/mij-discord/errors.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module MijDiscord::Errors
+  class DiscordError < RuntimeError
+    attr_reader :code
+
+    attr_reader :response
+
+    def initialize(code, message, response)
+      super(message || "(Error #{code})")
+
+      @code, @response = code, response
+    end
+  end
+
+  class MessageTooLong < DiscordError
+    MATCH_PATTERNS = [['2000'], ['long', 'length', 'size'], ['fewer', 'maximum']]
+
+    # This is shitcode
+    def self.match_pattern?(error)
+      return false if error.nil?
+      MATCH_PATTERNS.reduce(true) {|a,x| a && x.reduce(false) {|b,y| b || error.include?(y) } }
+    end
+
+    def initialize(message, response)
+      super(nil, message, response)
+    end
+  end
+
+  class Unauthorized < DiscordError; end
+
+  class Forbidden < DiscordError; end
+
+  class BadRequest < DiscordError; end
+
+  class NotFound < DiscordError; end
+
+  HTTP_ERRORS = {
+    400 => BadRequest,
+    401 => Unauthorized,
+    403 => Forbidden,
+    404 => NotFound,
+  }.freeze
+end

data/lib/mij-discord/events.rb

@@ -53,6 +53,10 @@ module MijDiscord::Events
       result.reduce(true, &:&)
     end
 
+    def inspect
+      MijDiscord.make_inspect(self)
+    end
+
     private
 
     def trigger_match?(match, key)

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

@@ -30,6 +30,8 @@ module MijDiscord::Events
 
   class DeleteChannel < Channel; end
 
+  class UpdateWebhooks < Channel; end
+
   class Recipient < Channel
     attr_reader :recipient
     alias_method :user, :recipient

data/lib/mij-discord/extensions.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class Integer
+  alias_method :to_id, :itself
+end
+
+class String
+  alias_method :to_id, :to_i
+end
+
+class Hash
+  def try_keys(*keys)
+    keys.each {|k| return self[k] if key?(k) }
+    nil
+  end
+end

data/lib/mij-discord/logger.rb

@@ -17,4 +17,13 @@ module MijDiscord
 
     "[#{sev}] [#{time}] #{prg.upcase}: #{text}\n"
   end
+
+  def self.make_inspect(obj, *vars)
+    data = [obj.class.to_s.split('::').last]
+    data += vars.map do |x|
+      value = obj.instance_variable_get(:"@#{x}")
+      "#{x}=#{value.inspect}"
+    end
+    %(#<#{data.join(' ')}>)
+  end
 end