mij-discord 1.0.9 → 1.0.10

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

@@ -1,155 +1,143 @@
-# frozen_string_literal: true
-
-module MijDiscord::Core::API::User
-  class << self
-    # Get user data
-    # https://discordapp.com/developers/docs/resources/user#get-user
-    def resolve(auth, user_id)
-      MijDiscord::Core::API.request(
-        :users_uid,
-        nil,
-        :get,
-        "#{MijDiscord::Core::API::APIBASE_URL}/users/#{user_id}",
-        Authorization: auth
-      )
-    end
-
-    # Get profile data (for userbots only)
-    # Not officially documented, reverse engineered from tracking Discord's network activity
-    def resolve2(auth, user_id)
-      MijDiscord::Core::API.request(
-        :users_uid,
-        nil,
-        :get,
-        "#{MijDiscord::Core::API::APIBASE_URL}/users/#{user_id}/profile",
-        Authorization: auth
-      )
-    end
-
-    # Get current user data
-    # https://discordapp.com/developers/docs/resources/user#get-current-user
-    def profile(auth)
-      MijDiscord::Core::API.request(
-        :users_me,
-        nil,
-        :get,
-        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me",
-        Authorization: auth
-      )
-    end
-
-    # Change the current bot's nickname on a server
-    def change_own_nickname(auth, server_id, nick, reason = nil)
-      MijDiscord::Core::API.request(
-        :guilds_sid_members_me_nick,
-        server_id, # This is technically a guild endpoint
-        :patch,
-        "#{MijDiscord::Core::API::APIBASE_URL}/guilds/#{server_id}/members/@me/nick",
-        { nick: nick }.to_json,
-        Authorization: auth,
-        content_type: :json,
-        'X-Audit-Log-Reason': reason
-      )
-    end
-
-    # Update user data
-    # https://discordapp.com/developers/docs/resources/user#modify-current-user
-    def update_profile(auth, username, avatar)
-      MijDiscord::Core::API.request(
-        :users_me,
-        nil,
-        :patch,
-        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me",
-        { avatar: avatar, username: username }.delete_if {|_,v| v.nil? }.to_json,
-        Authorization: auth,
-        content_type: :json
-      )
-    end
-
-    # Get the servers a user is connected to
-    # https://discordapp.com/developers/docs/resources/user#get-current-user-guilds
-    def servers(auth)
-      MijDiscord::Core::API.request(
-        :users_me_guilds,
-        nil,
-        :get,
-        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/guilds",
-        Authorization: auth
-      )
-    end
-
-    # Leave a server
-    # https://discordapp.com/developers/docs/resources/user#leave-guild
-    def leave_server(auth, server_id)
-      MijDiscord::Core::API.request(
-        :users_me_guilds_sid,
-        nil,
-        :delete,
-        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/guilds/#{server_id}",
-        Authorization: auth
-      )
-    end
-
-    # Get the DMs for the current user
-    # https://discordapp.com/developers/docs/resources/user#get-user-dms
-    def user_dms(auth)
-      MijDiscord::Core::API.request(
-        :users_me_channels,
-        nil,
-        :get,
-        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/channels",
-        Authorization: auth
-      )
-    end
-
-    # Create a DM to another user
-    # https://discordapp.com/developers/docs/resources/user#create-dm
-    def create_pm(auth, recipient_id)
-      MijDiscord::Core::API.request(
-        :users_me_channels,
-        nil,
-        :post,
-        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/channels",
-        { recipient_id: recipient_id }.to_json,
-        Authorization: auth,
-        content_type: :json
-      )
-    end
-
-    # Get information about a user's connections
-    # https://discordapp.com/developers/docs/resources/user#get-users-connections
-    def connections(auth)
-      MijDiscord::Core::API.request(
-        :users_me_connections,
-        nil,
-        :get,
-        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/connections",
-        Authorization: auth
-      )
-    end
-
-    # Change user status setting
-    def change_status_setting(auth, status)
-      MijDiscord::Core::API.request(
-        :users_me_settings,
-        nil,
-        :patch,
-        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/settings",
-        { status: status }.to_json,
-        Authorization: auth,
-        content_type: :json
-      )
-    end
-
-    # Returns one of the "default" discord avatars from the CDN given a discriminator
-    def default_avatar(discrim = 0)
-      "#{MijDiscord::Core::API::CDN_URL}/embed/avatars/#{discrim.to_i % 5}.png"
-    end
-
-    # Make an avatar URL from the user and avatar IDs
-    def avatar_url(user_id, avatar_id, format = nil)
-      format ||= avatar_id.start_with?('a_') ? :gif : :webp
-      "#{MijDiscord::Core::API::CDN_URL}/avatars/#{user_id}/#{avatar_id}.#{format}"
-    end
-  end
+# frozen_string_literal: true
+
+module MijDiscord::Core::API::User
+  class << self
+    # Get user data
+    # https://discordapp.com/developers/docs/resources/user#get-user
+    def resolve(auth, user_id)
+      MijDiscord::Core::API.request(
+        :users_uid,
+        nil,
+        :get,
+        "#{MijDiscord::Core::API::APIBASE_URL}/users/#{user_id}",
+        Authorization: auth
+      )
+    end
+
+    # Get current user data
+    # https://discordapp.com/developers/docs/resources/user#get-current-user
+    def profile(auth)
+      MijDiscord::Core::API.request(
+        :users_me,
+        nil,
+        :get,
+        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me",
+        Authorization: auth
+      )
+    end
+
+    # Change the current bot's nickname on a server
+    def change_own_nickname(auth, server_id, nick, reason = nil)
+      MijDiscord::Core::API.request(
+        :guilds_sid_members_me_nick,
+        server_id, # This is technically a guild endpoint
+        :patch,
+        "#{MijDiscord::Core::API::APIBASE_URL}/guilds/#{server_id}/members/@me/nick",
+        { nick: nick }.to_json,
+        Authorization: auth,
+        content_type: :json,
+        'X-Audit-Log-Reason': reason
+      )
+    end
+
+    # Update user data
+    # https://discordapp.com/developers/docs/resources/user#modify-current-user
+    def update_profile(auth, username, avatar)
+      MijDiscord::Core::API.request(
+        :users_me,
+        nil,
+        :patch,
+        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me",
+        { avatar: avatar, username: username }.delete_if {|_,v| v.nil? }.to_json,
+        Authorization: auth,
+        content_type: :json
+      )
+    end
+
+    # Get the servers a user is connected to
+    # https://discordapp.com/developers/docs/resources/user#get-current-user-guilds
+    def servers(auth)
+      MijDiscord::Core::API.request(
+        :users_me_guilds,
+        nil,
+        :get,
+        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/guilds",
+        Authorization: auth
+      )
+    end
+
+    # Leave a server
+    # https://discordapp.com/developers/docs/resources/user#leave-guild
+    def leave_server(auth, server_id)
+      MijDiscord::Core::API.request(
+        :users_me_guilds_sid,
+        nil,
+        :delete,
+        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/guilds/#{server_id}",
+        Authorization: auth
+      )
+    end
+
+    # Get the DMs for the current user
+    # https://discordapp.com/developers/docs/resources/user#get-user-dms
+    def user_dms(auth)
+      MijDiscord::Core::API.request(
+        :users_me_channels,
+        nil,
+        :get,
+        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/channels",
+        Authorization: auth
+      )
+    end
+
+    # Create a DM to another user
+    # https://discordapp.com/developers/docs/resources/user#create-dm
+    def create_pm(auth, recipient_id)
+      MijDiscord::Core::API.request(
+        :users_me_channels,
+        nil,
+        :post,
+        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/channels",
+        { recipient_id: recipient_id }.to_json,
+        Authorization: auth,
+        content_type: :json
+      )
+    end
+
+    # Get information about a user's connections
+    # https://discordapp.com/developers/docs/resources/user#get-users-connections
+    def connections(auth)
+      MijDiscord::Core::API.request(
+        :users_me_connections,
+        nil,
+        :get,
+        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/connections",
+        Authorization: auth
+      )
+    end
+
+    # Change user status setting
+    def change_status_setting(auth, status)
+      MijDiscord::Core::API.request(
+        :users_me_settings,
+        nil,
+        :patch,
+        "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/settings",
+        { status: status }.to_json,
+        Authorization: auth,
+        content_type: :json
+      )
+    end
+
+    # Returns one of the "default" discord avatars from the CDN given a discriminator
+    def default_avatar(discrim = 0)
+      "#{MijDiscord::Core::API::CDN_URL}/embed/avatars/#{discrim.to_i % 5}.png"
+    end
+
+    # Make an avatar URL from the user and avatar IDs
+    def avatar_url(user_id, avatar_id, format = nil)
+      format ||= avatar_id.start_with?('a_') ? :gif : :png
+      "#{MijDiscord::Core::API::CDN_URL}/avatars/#{user_id}/#{avatar_id}.#{format}"
+    end
+  end
 end

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

@@ -1,227 +1,227 @@
-# frozen_string_literal: true
-
-module MijDiscord::Data
-  class Embed
-    attr_reader :type
-
-    attr_reader :title
-
-    attr_reader :description
-
-    attr_reader :url
-
-    attr_reader :timestamp
-
-    attr_reader :color
-
-    attr_reader :footer
-
-    attr_reader :thumbnail
-
-    attr_reader :image
-
-    attr_reader :video
-
-    attr_reader :provider
-
-    attr_reader :author
-
-    attr_reader :fields
-
-    def initialize(data)
-      @type, @url = data['type'], data['url']
-      @title, @description = data['title'], data['description']
-
-      @color = ColorRGB.new(data['color']) if data['color']
-      @timestamp = Time.parse(data['timestamp']).utc if data['timestamp']
-
-      @footer = EmbedFooter.new(data['footer']) if data['footer']
-      @thumbnail = EmbedMedia.new(data['thumbnail']) if data['thumbnail']
-
-      @image = EmbedMedia.new(data['image']) if data['image']
-      @video = EmbedMedia.new(data['video']) if data['video']
-
-      @author = EmbedAuthor.new(data['author']) if data['author']
-      @provider = EmbedProvider.new(data['provider']) if data['provider']
-
-      @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
-    attr_reader :text
-
-    attr_reader :icon_url
-
-    attr_reader :proxy_icon_url
-
-    def initialize(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
-    attr_reader :url
-
-    attr_reader :proxy_url
-
-    attr_reader :width
-
-    attr_reader :height
-
-    def initialize(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
-    attr_reader :name
-
-    attr_reader :url
-
-    attr_reader :icon_url
-
-    attr_reader :proxy_icon_url
-
-    def initialize(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
-    attr_reader :name
-
-    attr_reader :url
-
-    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
-    attr_reader :name
-
-    attr_reader :value
-
-    attr_reader :inline
-
-    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
+# frozen_string_literal: true
+
+module MijDiscord::Data
+  class Embed
+    attr_reader :type
+
+    attr_reader :title
+
+    attr_reader :description
+
+    attr_reader :url
+
+    attr_reader :timestamp
+
+    attr_reader :color
+
+    attr_reader :footer
+
+    attr_reader :thumbnail
+
+    attr_reader :image
+
+    attr_reader :video
+
+    attr_reader :provider
+
+    attr_reader :author
+
+    attr_reader :fields
+
+    def initialize(data)
+      @type, @url = data['type'], data['url']
+      @title, @description = data['title'], data['description']
+
+      @color = ColorRGB.new(data['color']) if data['color']
+      @timestamp = Time.parse(data['timestamp']).utc if data['timestamp']
+
+      @footer = EmbedFooter.new(data['footer']) if data['footer']
+      @thumbnail = EmbedMedia.new(data['thumbnail']) if data['thumbnail']
+
+      @image = EmbedMedia.new(data['image']) if data['image']
+      @video = EmbedMedia.new(data['video']) if data['video']
+
+      @author = EmbedAuthor.new(data['author']) if data['author']
+      @provider = EmbedProvider.new(data['provider']) if data['provider']
+
+      @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
+    attr_reader :text
+
+    attr_reader :icon_url
+
+    attr_reader :proxy_icon_url
+
+    def initialize(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
+    attr_reader :url
+
+    attr_reader :proxy_url
+
+    attr_reader :width
+
+    attr_reader :height
+
+    def initialize(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
+    attr_reader :name
+
+    attr_reader :url
+
+    attr_reader :icon_url
+
+    attr_reader :proxy_icon_url
+
+    def initialize(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
+    attr_reader :name
+
+    attr_reader :url
+
+    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
+    attr_reader :name
+
+    attr_reader :value
+
+    attr_reader :inline
+
+    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