mij-discord 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca2803ee72c1ab5229d6767b809ee5a3a1aa605
-  data.tar.gz: 037b4495e988f6c7c70e83801920fda475b9a262
+  metadata.gz: 79f209e5e6420da2007626aae908544d05da9121
+  data.tar.gz: a3ced104cc02f533b5ba05641112685823a9f382
 SHA512:
-  metadata.gz: 2ff78a29820234b6ff79a848ccb0fb9b77019d645ec18bb6040a3566923f3e775462f01224a8df803ac07d31f29d55d4f7eb50c7de3ae5e464eac19b05c7fb0d
-  data.tar.gz: 641bcc97f7a0039e655eb7ad4800a1dfcf0d62c9a5ff9333243204dc2eb9fbec24e897a4b54b40bf0288bece09cff9f740bc3a5308ade781647adb8b908fd0ac
+  metadata.gz: ae684e032ccb55100cd23faf439039f7a2c0f8bc352b8b890307c9270e78b0c724fc0f334fcf6579c4a70b232a2ab55a79b45eeb52146fa3211c15fd71a5c19f
+  data.tar.gz: 933eacfede575e90b795bf7b023260f4964e9d0fb08b8d455a68635a7f2324b8f6abb3b498b1ee2748f5ab0c2ec69c44c961b0e00837f5c43760e87d0d61d744

data/lib/mij-discord.rb

@@ -13,17 +13,19 @@ require 'websocket-client-simple'
 require 'rest-client'
 
 require_relative 'mij-discord/version'
+require_relative 'mij-discord/extensions'
 require_relative 'mij-discord/logger'
 require_relative 'mij-discord/cache'
 require_relative 'mij-discord/events'
+require_relative 'mij-discord/errors'
 
 require_relative 'mij-discord/core/gateway'
-require_relative 'mij-discord/core/errors'
 require_relative 'mij-discord/core/api'
 require_relative 'mij-discord/core/api/channel'
 require_relative 'mij-discord/core/api/invite'
 require_relative 'mij-discord/core/api/server'
 require_relative 'mij-discord/core/api/user'
+require_relative 'mij-discord/core/api/webhook'
 
 require_relative 'mij-discord/data'
 require_relative 'mij-discord/data/invite'
@@ -38,6 +40,7 @@ require_relative 'mij-discord/data/server'
 require_relative 'mij-discord/data/embed'
 require_relative 'mij-discord/data/emoji'
 require_relative 'mij-discord/data/message'
+require_relative 'mij-discord/data/webhook'
 
 require_relative 'mij-discord/events/basic'
 require_relative 'mij-discord/events/server'
@@ -45,12 +48,4 @@ require_relative 'mij-discord/events/member'
 require_relative 'mij-discord/events/channel'
 require_relative 'mij-discord/events/message'
 
-require_relative 'mij-discord/bot'
-
-class Integer
-  alias_method :to_id, :itself
-end
-
-class String
-  alias_method :to_id, :to_i
-end
+require_relative 'mij-discord/bot'

data/lib/mij-discord/bot.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
 module MijDiscord
-      class Bot
-        class AuthInfo
-          attr_reader :token
+  class Bot
+    class AuthInfo
+      attr_reader :id
+
+      attr_reader :token
 
       attr_reader :type
 
       attr_reader :name
 
-      def initialize(token, type, name)
-        @type, @name = type, name
+      def initialize(id, token, type, name)
+        @id, @type, @name = id.to_id, type, name
 
         @token = case type
           when :bot then "Bot #{token}"
@@ -28,6 +30,10 @@ module MijDiscord
       end
 
       alias_method :to_s, :token
+
+      def inspect
+        MijDiscord.make_inspect(self, :id, :type, :name)
+      end
     end
 
     EVENTS = {
@@ -55,6 +61,7 @@ module MijDiscord
       create_channel: MijDiscord::Events::CreateChannel,
       update_channel: MijDiscord::Events::UpdateChannel,
       delete_channel: MijDiscord::Events::DeleteChannel,
+      update_webhooks: MijDiscord::Events::UpdateWebhooks,
       add_recipient: MijDiscord::Events::AddRecipient,
       remove_recipient: MijDiscord::Events::RemoveRecipient,
 
@@ -76,10 +83,6 @@ module MijDiscord
 
     UNAVAILABLE_SERVER_TIMEOUT = 10
 
-    attr_reader :name
-
-    attr_reader :client_id
-
     attr_reader :auth
 
     attr_reader :shard_key
@@ -92,8 +95,7 @@ module MijDiscord
 
     def initialize(client_id:, token:, type: :bot, name: nil,
     shard_id: nil, num_shards: nil, ignore_bots: false, ignore_self: true)
-      @client_id = client_id.to_id
-      @auth = AuthInfo.new(token, type, name)
+      @auth = AuthInfo.new(client_id, token, type, name)
 
       @cache = MijDiscord::Cache::BotCache.new(self)
 
@@ -197,7 +199,7 @@ module MijDiscord
     end
 
     def application
-      raise 'Cannot get OAuth application for non-bot user' if @type != :bot
+      raise 'Cannot get OAuth application for non-bot user' unless @auth.bot?
 
       response = MijDiscord::Core::API.oauth_application(@auth)
       MijDiscord::Data::Application.new(JSON.parse(response), self)
@@ -205,7 +207,7 @@ module MijDiscord
 
     def invite(invite)
       code = parse_invite_code(invite)
-      response = MijDiscord::Core::API::Invite.resolve(@auth, code)
+      response = MijDiscord::Core::API::Invite.resolve(@auth, code, true)
       MijDiscord::Data::Invite.new(JSON.parse(response), self)
     end
 
@@ -216,7 +218,7 @@ module MijDiscord
     end
 
     def make_invite_url(server: nil, permissions: nil)
-      url = "https://discordapp.com/oauth2/authorize?scope=bot&client_id=#{@client_id}".dup
+      url = "https://discordapp.com/oauth2/authorize?scope=bot&client_id=#{@auth.id}".dup
       url << "&permissions=#{permissions.to_i}" if permissions.respond_to?(:to_i)
       url << "&guild_id=#{server.to_id}" if server.respond_to?(:to_id)
       url
@@ -258,14 +260,17 @@ module MijDiscord
             role = sv.role($1)
             return role if role
           end
-        when /^<:\w+:(\d+)>$/
-          emoji = emoji(server_id, $1)
+        when /^<(a?):(\w+):(\d+)>$/
+          emoji = emoji(server_id, $3)
           return emoji if emoji
 
           servers.each do |sv|
-            emoji = sv.emoji($1)
+            emoji = sv.emoji($3)
             return emoji if emoji
           end
+
+          em_data = { 'id' => $3.to_i, 'name' => $2, 'animated' => !$1.empty? }
+          MijDiscord::Data::Emoji.new(em_data, self, nil)
       end
     end
 
@@ -300,7 +305,7 @@ module MijDiscord
     end
 
     def ignored_user?(user)
-      @ignore_self && user.to_id == @client_id || @ignored_ids.include?(user.to_id)
+      @ignore_self && user.to_id == @auth.id || @ignored_ids.include?(user.to_id)
     end
 
     def update_presence(status: nil, game: nil)
@@ -379,7 +384,6 @@ module MijDiscord
         when :GUILD_MEMBERS_CHUNK
           server = @cache.get_server(data['guild_id'])
           server.update_members_chunk(data['members'])
-          puts "Chunk(#{server.id}+#{data['members'].length})"
 
         when :GUILD_CREATE
           server = @cache.put_server(data)
@@ -424,6 +428,10 @@ module MijDiscord
           channel = @cache.remove_channel(data['id'])
           trigger_event(:delete_channel, self, channel)
 
+        when :WEBHOOKS_UPDATE
+          channel = @cache.get_channel(data['channel_id'], nil)
+          trigger_event(:update_webhooks, self, channel)
+
         when :CHANNEL_RECIPIENT_ADD
           channel = @cache.get_channel(data['channel_id'], nil)
           recipient = channel.update_recipient(add: data['user'])
@@ -538,7 +546,7 @@ module MijDiscord
         when :TYPING_START
           begin
             trigger_event(:start_typing, self, data)
-          rescue MijDiscord::Core::Errors::NoPermission
+          rescue MijDiscord::Errors::Forbidden
             # Ignoring the channel we can't access
             # Why is this even sent? :S
           end
@@ -575,6 +583,10 @@ module MijDiscord
       MijDiscord::LOGGER.error('Dispatch') { exc }
     end
 
+    def inspect
+      MijDiscord.make_inspect(self, :auth)
+    end
+
     private
 
     def gateway_check

data/lib/mij-discord/cache.rb

@@ -32,7 +32,7 @@ module MijDiscord::Cache
 
       begin
         response = MijDiscord::Core::API::Server.resolve(@bot.auth, id)
-      rescue RestClient::ResourceNotFound
+      rescue MijDiscord::Errors::NotFound
         return nil
       end
 
@@ -42,14 +42,14 @@ module MijDiscord::Cache
     def get_channel(key, server, local: false)
       id = key&.to_id
       return @channels[id] if @channels.has_key?(id)
-      raise MijDiscord::Errors::NoPermission if @restricted_channels[id]
+      raise MijDiscord::Errors::Forbidden if @restricted_channels[id]
       return nil if local
 
       begin
         response = MijDiscord::Core::API::Channel.resolve(@bot.auth, id)
-      rescue RestClient::ResourceNotFound
+      rescue MijDiscord::Errors::NotFound
         return nil
-      rescue MijDiscord::Errors::NoPermission
+      rescue MijDiscord::Errors::Forbidden
         @restricted_channels[id] = true
         raise
       end
@@ -85,7 +85,7 @@ module MijDiscord::Cache
           when :bot then MijDiscord::Core::API::User.resolve(@bot.auth, id)
           when :user then MijDiscord::Core::API::User.resolve2(@bot.auth, id)
         end
-      rescue RestClient::ResourceNotFound
+      rescue MijDiscord::Errors::NotFound
         return nil
       end
 
@@ -147,6 +147,10 @@ module MijDiscord::Cache
     def remove_user(key)
       @users.delete(key&.to_id)
     end
+
+    def inspect
+      MijDiscord.make_inspect(self)
+    end
   end
 
   class ServerCache
@@ -179,7 +183,7 @@ module MijDiscord::Cache
 
       begin
         response = MijDiscord::Core::API::Server.resolve_member(@bot.auth, @server.id, id)
-      rescue RestClient::ResourceNotFound
+      rescue MijDiscord::Errors::NotFound
         return nil
       end
 
@@ -248,6 +252,10 @@ module MijDiscord::Cache
 
       channel
     end
+
+    def inspect
+      MijDiscord.make_inspect(self)
+    end
   end
 
   class ChannelCache
@@ -270,8 +278,11 @@ module MijDiscord::Cache
       return nil if local
 
       begin
-        response = MijDiscord::Core::API::Channel.message(@bot.auth, @channel.id, key)
-      rescue RestClient::ResourceNotFound
+        response = case @bot.auth.type
+          when :bot then MijDiscord::Core::API::Channel.message(@bot.auth, @channel.id, key)
+          when :user then MijDiscord::Core::API::Channel.messages(@bot.auth, @channel.id, 1, nil, nil, key)
+        end
+      rescue MijDiscord::Errors::NotFound
         return nil
       end
 
@@ -297,5 +308,9 @@ module MijDiscord::Cache
     def remove_message(key)
       @messages.delete(key&.to_id)
     end
+
+    def inspect
+      MijDiscord.make_inspect(self)
+    end
   end
 end

data/lib/mij-discord/core/api.rb

@@ -154,10 +154,21 @@ module MijDiscord::Core::API
       )
     end
 
-    def raw_request(type, attributes)
+    def raw_request(type, *attributes)
       RestClient.send(type, *attributes)
-    rescue RestClient::Forbidden
-      raise MijDiscord::Core::Errors::NoPermission
+    rescue RestClient::RequestFailed => e
+      # Holy fuck, Discord…
+      if (klazz = MijDiscord::Errors::HTTP_ERRORS[e.http_code])
+        data = JSON.parse(e.response)
+        if data['message'] || data['code']
+          raise klazz.new(data['code'], data['message'], e.response)
+        elsif (error = (data['content'] || data['embed']).join)
+          if MijDiscord::Errors::MessageTooLong.match_pattern?(error)
+            raise MijDiscord::Errors::MessageTooLong.new(error, e.response)
+          end
+        end
+      end
+      raise
     rescue RestClient::BadGateway
       MijDiscord::LOGGER.warn('HTTP') { 'Received 502 Bad Gateway during API request' }
       retry
@@ -179,7 +190,7 @@ module MijDiscord::Core::API
         mutex_wait(key_mutex)
         mutex_wait(global_mutex) if global_mutex.locked?
 
-        response = raw_request(type, attributes)
+        response = raw_request(type, *attributes)
       rescue RestClient::TooManyRequests => e
         response = e.response
 

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

@@ -83,12 +83,6 @@ module MijDiscord::Core::API::Channel
         Authorization: auth,
         content_type: :json
       )
-    rescue RestClient::BadRequest => e
-      parsed = JSON.parse(e.response.body)
-      if (content = parsed['content']).is_a?(Array) && content.first == 'Must be 2000 or fewer characters long.'
-        raise MijDiscord::Core::Errors::MessageTooLong, "Message over the character limit (#{message.length} > 2000)"
-      end
-      raise
     end
 
     # Send a file as a message to a channel

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

@@ -4,12 +4,13 @@ module MijDiscord::Core::API::Invite
   class << self
     # Resolve an invite
     # https://discordapp.com/developers/docs/resources/invite#get-invite
-    def resolve(auth, invite_code)
+    def resolve(auth, invite_code, with_counts = false)
+      counts = with_counts ? '?with_counts=true' : ''
       MijDiscord::Core::API.request(
         :invite_code,
         nil,
         :get,
-        "#{MijDiscord::Core::API::APIBASE_URL}/invites/#{invite_code}",
+        "#{MijDiscord::Core::API::APIBASE_URL}/invites/#{invite_code}#{counts}",
         Authorization: auth
       )
     end

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

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+module MijDiscord::Core::API::Webhook
+  class << self
+    # Get a webhook
+    # https://discordapp.com/developers/docs/resources/webhook#get-webhook
+    def webhook(auth, webhook_id)
+      MijDiscord::Core::API.request(
+        :webhooks_wid,
+        nil,
+        :get,
+        "#{MijDiscord::Core::API::APIBASE_URL}/webhooks/#{webhook_id}",
+        Authorization: auth
+      )
+    end
+
+    # Get a webhook via webhook token
+    # https://discordapp.com/developers/docs/resources/webhook#get-webhook-with-token
+    def token_webhook(webhook_token, webhook_id)
+      MijDiscord::Core::API.request(
+        :webhooks_wid,
+        nil,
+        :get,
+        "#{MijDiscord::Core::API::APIBASE_URL}/webhooks/#{webhook_id}/#{webhook_token}",
+      )
+    end
+
+    # Update a webhook
+    # https://discordapp.com/developers/docs/resources/webhook#modify-webhook
+    def update_webhook(auth, webhook_id, data, reason = nil)
+      MijDiscord::Core::API.request(
+        :webhooks_wid,
+        webhook_id,
+        :patch,
+        "#{MijDiscord::Core::API::APIBASE_URL}/webhooks/#{webhook_id}",
+        data.to_json,
+        Authorization: auth,
+        content_type: :json,
+        'X-Audit-Log-Reason': reason,
+      )
+    end
+
+    # Update a webhook via webhook token
+    # https://discordapp.com/developers/docs/resources/webhook#modify-webhook-with-token
+    def token_update_webhook(webhook_token, webhook_id, data, reason = nil)
+      MijDiscord::Core::API.request(
+        :webhooks_wid,
+        webhook_id,
+        :patch,
+        "#{MijDiscord::Core::API::APIBASE_URL}/webhooks/#{webhook_id}/#{webhook_token}",
+        data.to_json,
+        content_type: :json,
+        'X-Audit-Log-Reason': reason,
+      )
+    end
+
+    # Deletes a webhook
+    # https://discordapp.com/developers/docs/resources/webhook#delete-webhook
+    def delete_webhook(auth, webhook_id, reason = nil)
+      MijDiscord::Core::API.request(
+        :webhooks_wid,
+        webhook_id,
+        :delete,
+        "#{MijDiscord::Core::API::APIBASE_URL}/webhooks/#{webhook_id}",
+        Authorization: auth,
+        'X-Audit-Log-Reason': reason,
+      )
+    end
+
+    # Deletes a webhook via webhook token
+    # https://discordapp.com/developers/docs/resources/webhook#delete-webhook-with-token
+    def token_delete_webhook(webhook_token, webhook_id, reason = nil)
+      MijDiscord::Core::API.request(
+        :webhooks_wid,
+        webhook_id,
+        :delete,
+        "#{MijDiscord::Core::API::APIBASE_URL}/webhooks/#{webhook_id}/#{webhook_token}",
+        'X-Audit-Log-Reason': reason,
+      )
+    end
+
+    # Executes a webhook with JSON body
+    # https://discordapp.com/developers/docs/resources/webhook#execute-webhook
+    def execute_json(webhook_token, webhook_id, data, wait)
+      wait = wait ? '?wait=true' : ''
+      MijDiscord::Core::API.raw_request(
+        :post,
+        "#{MijDiscord::Core::API::APIBASE_URL}/webhooks/#{webhook_id}/#{webhook_token}#{wait}",
+        data.to_json,
+        content_type: :json,
+      )
+    end
+  end
+end