mij-discord 1.0.5 → 1.0.6

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

@@ -4,37 +4,37 @@ module MijDiscord::Core::API::User
   class << self
     # Get user data
     # https://discordapp.com/developers/docs/resources/user#get-user
-    def resolve(token, user_id)
+    def resolve(auth, user_id)
       MijDiscord::Core::API.request(
         :users_uid,
         nil,
         :get,
         "#{MijDiscord::Core::API::APIBASE_URL}/users/#{user_id}",
-        Authorization: token
+        Authorization: auth
       )
     end
 
     # Get profile data
     # https://discordapp.com/developers/docs/resources/user#get-current-user
-    def profile(token)
+    def profile(auth)
       MijDiscord::Core::API.request(
         :users_me,
         nil,
         :get,
         "#{MijDiscord::Core::API::APIBASE_URL}/users/@me",
-        Authorization: token
+        Authorization: auth
       )
     end
 
     # Change the current bot's nickname on a server
-    def change_own_nickname(token, server_id, nick, reason = nil)
+    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: token,
+        Authorization: auth,
         content_type: :json,
         'X-Audit-Log-Reason': reason
       )
@@ -42,97 +42,96 @@ module MijDiscord::Core::API::User
 
     # Update user data
     # https://discordapp.com/developers/docs/resources/user#modify-current-user
-    def update_profile(token, username, avatar)
+    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: token,
+        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(token)
+    def servers(auth)
       MijDiscord::Core::API.request(
         :users_me_guilds,
         nil,
         :get,
         "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/guilds",
-        Authorization: token
+        Authorization: auth
       )
     end
 
     # Leave a server
     # https://discordapp.com/developers/docs/resources/user#leave-guild
-    def leave_server(token, server_id)
+    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: token
+        Authorization: auth
       )
     end
 
     # Get the DMs for the current user
     # https://discordapp.com/developers/docs/resources/user#get-user-dms
-    def user_dms(token)
+    def user_dms(auth)
       MijDiscord::Core::API.request(
         :users_me_channels,
         nil,
         :get,
         "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/channels",
-        Authorization: token
+        Authorization: auth
       )
     end
 
     # Create a DM to another user
     # https://discordapp.com/developers/docs/resources/user#create-dm
-    def create_pm(token, recipient_id)
+    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: token,
+        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(token)
+    def connections(auth)
       MijDiscord::Core::API.request(
         :users_me_connections,
         nil,
         :get,
         "#{MijDiscord::Core::API::APIBASE_URL}/users/@me/connections",
-        Authorization: token
+        Authorization: auth
       )
     end
 
     # Change user status setting
-    def change_status_setting(token, status)
+    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: token,
+        Authorization: auth,
         content_type: :json
       )
     end
 
     # Returns one of the "default" discord avatars from the CDN given a discriminator
     def default_avatar(discrim = 0)
-      index = discrim.to_i % 5
-      "#{MijDiscord::Core::API::CDN_URL}/embed/avatars/#{index}.png"
+      "#{MijDiscord::Core::API::CDN_URL}/embed/avatars/#{discrim.to_i % 5}.png"
     end
 
     # Make an avatar URL from the user and avatar IDs

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

@@ -106,8 +106,8 @@ module MijDiscord::Core
 
     attr_accessor :check_heartbeat_acks
 
-    def initialize(bot, token, shard_key = nil)
-      @bot, @token, @shard_key = bot, token, shard_key
+    def initialize(bot, auth, shard_key = nil)
+      @bot, @auth, @shard_key = bot, auth, shard_key
 
       @ws_success = false
       @getc_mutex = Mutex.new
@@ -278,11 +278,11 @@ module MijDiscord::Core
           '$referring_domain': '',
       }
 
-      send_identify(@token, props, true, LARGE_THRESHOLD, @shard_key)
+      send_identify(@auth, props, true, LARGE_THRESHOLD, @shard_key)
     end
 
     def send_resume_self
-      send_resume(@token, @session.session_id, @session.sequence)
+      send_resume(@auth, @session.session_id, @session.sequence)
     end
 
     def setup_heartbeat(interval)
@@ -331,7 +331,7 @@ module MijDiscord::Core
     end
 
     def get_gateway_url
-      response = API.gateway(@token)
+      response = API.gateway(@auth)
       raw_url = JSON.parse(response)['url']
       raw_url << '/' unless raw_url.end_with? '/'
       "#{raw_url}?encoding=json&v=#{GATEWAY_VERSION}"

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

@@ -30,9 +30,5 @@ module MijDiscord::Data
       return nil if @icon_id.nil?
       MijDiscord::Core::API.app_icon_url(@id, @icon_id, format)
     end
-
-    def inspect
-      %(<Application id=#{@id} name="#{@name}">)
-    end
   end
 end

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

@@ -152,7 +152,7 @@ module MijDiscord::Data
 
     def set_options(reason = nil, name: nil, topic: nil, nsfw: nil,
     parent: nil, position: nil, bitrate: nil, user_limit: nil, overwrites: nil)
-      response = MijDiscord::Core::API::Channel.update(@bot.token, @id,
+      response = MijDiscord::Core::API::Channel.update(@bot.auth, @id,
         name, topic, nsfw,parent&.to_id, position, bitrate, user_limit, overwrites, reason)
       @server.cache.put_channel(JSON.parse(response), update: true)
     end
@@ -174,7 +174,7 @@ module MijDiscord::Data
         object = Overwrite.new(object, allow: allow_bits, deny: deny_bits)
       end
 
-      MijDiscord::Core::API::Channel.update_permission(@bot.token, @id,
+      MijDiscord::Core::API::Channel.update_permission(@bot.auth, @id,
         object.id, object.allow.bits, object.deny.bits, object.type, reason)
       nil
     end
@@ -185,7 +185,7 @@ module MijDiscord::Data
 
     def delete_overwrite(object, reason = nil)
       raise ArgumentError, 'Invalid overwrite target' unless object.respond_to?(:to_id)
-      MijDiscord::Core::API::Channel.delete_permission(@bot.token, @id,
+      MijDiscord::Core::API::Channel.delete_permission(@bot.auth, @id,
         object.to_id, reason)
       nil
     end
@@ -201,13 +201,9 @@ module MijDiscord::Data
     alias_method :sync_permission_overwrites, :sync_overwrites
 
     def delete(reason = nil)
-      MijDiscord::Core::API::Channel.delete(@bot.token, @id, reason)
+      MijDiscord::Core::API::Channel.delete(@bot.auth, @id, reason)
       @server.cache.remove_channel(@id)
     end
-
-    def inspect
-      %(<Channel id=#{@id} server=#{@server.id} name="#{@name}" type=#{@type}>)
-    end
   end
 
   class TextChannel < Channel
@@ -301,7 +297,7 @@ module MijDiscord::Data
     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.token, @id,
+      response = MijDiscord::Core::API::Channel.create_message(@bot.auth, @id,
         text, tts, embed&.to_h)
       @cache.put_message(JSON.parse(response))
     end
@@ -309,12 +305,12 @@ module MijDiscord::Data
     def send_file(file, caption: '', tts: false)
       raise MijDiscord::Core::Errors::MessageTooLong if caption.length > 2000
 
-      response = MijDiscord::Core::API::Channel.upload_file(@bot.token, @id, file, caption, tts)
+      response = MijDiscord::Core::API::Channel.upload_file(@bot.auth, @id, file, caption, tts)
       @cache.put_message(JSON.parse(response))
     end
 
     def delete_message(message)
-      MijDiscord::Core::API::Channel.delete_message(@bot.token, @id, message.to_id)
+      MijDiscord::Core::API::Channel.delete_message(@bot.auth, @id, message.to_id)
       @cache.remove_message(message)
     end
 
@@ -323,7 +319,7 @@ module MijDiscord::Data
     end
 
     def message_history(amount, before: nil, after: nil, around: nil)
-      response = MijDiscord::Core::API::Channel.messages(@bot.token, @id,
+      response = MijDiscord::Core::API::Channel.messages(@bot.auth, @id,
         amount, before&.to_id, after&.to_id, around&.to_id)
       JSON.parse(response).map {|m| Message.new(m, @bot) }
     end
@@ -331,7 +327,7 @@ module MijDiscord::Data
     alias_method :history, :message_history
 
     def pinned_messages
-      response = MijDiscord::Core::API::Channel.pinned_messages(@bot.token, @id)
+      response = MijDiscord::Core::API::Channel.pinned_messages(@bot.auth, @id)
       JSON.parse(response).map {|m| Message.new(m, @bot) }
     end
 
@@ -342,18 +338,18 @@ module MijDiscord::Data
       min_snowflake = IDObject.synthesize(two_weeks)
       ids = messages.map(&:to_id).delete_if {|m| m < min_snowflake }
 
-      MijDiscord::Core::API::Channel.bulk_delete_messages(@bot.token, @id, ids)
+      MijDiscord::Core::API::Channel.bulk_delete_messages(@bot.auth, @id, ids)
       ids.each {|m| @cache.remove_message(m) }
       nil
     end
 
     def invites
-      response = MijDiscord::Core::API::Channel.invites(@bot.token, @id)
+      response = MijDiscord::Core::API::Channel.invites(@bot.auth, @id)
       JSON.parse(response).map {|x| Invite.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.token, @id,
+      response = MijDiscord::Core::API::Channel.create_invite(@bot.auth, @id,
         max_age, max_uses, temporary, unique, reason)
       Invite.new(JSON.parse(response), @bot)
     end
@@ -361,7 +357,7 @@ module MijDiscord::Data
     alias_method :invite, :make_invite
 
     def start_typing
-      MijDiscord::Core::API::Channel.start_typing(@bot.token, @id)
+      MijDiscord::Core::API::Channel.start_typing(@bot.auth, @id)
       nil
     end
 
@@ -369,7 +365,7 @@ module MijDiscord::Data
       raise 'Attempted to create group channel on a non-pm channel' unless pm?
 
       ids = users.map(&:to_id)
-      response = MijDiscord::Core::API::Channel.create_group(@bot.token, @id, ids.shift)
+      response = MijDiscord::Core::API::Channel.create_group(@bot.auth, @id, ids.shift)
       channel = @bot.cache.put_channel(JSON.parse(response))
       channel.add_group_users(ids)
 
@@ -380,7 +376,7 @@ module MijDiscord::Data
       raise 'Attempted to add a user to a non-group channel' unless group?
 
       users.each do |u|
-        MijDiscord::Core::API::Channel.add_group_user(@bot.token, @id, u.to_id)
+        MijDiscord::Core::API::Channel.add_group_user(@bot.auth, @id, u.to_id)
       end
       nil
     end
@@ -389,7 +385,7 @@ module MijDiscord::Data
       raise 'Attempted to remove a user to a non-group channel' unless group?
 
       users.each do |u|
-        MijDiscord::Core::API::Channel.remove_group_user(@bot.token, @id, u.to_id)
+        MijDiscord::Core::API::Channel.remove_group_user(@bot.auth, @id, u.to_id)
       end
       nil
     end
@@ -397,7 +393,7 @@ module MijDiscord::Data
     def leave_group
       raise 'Attempoted to leave a non-group channel' unless group?
 
-      MijDiscord::Core::API::Channel.leave_group(@bot.token, @id)
+      MijDiscord::Core::API::Channel.leave_group(@bot.auth, @id)
       nil
     end
   end

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

@@ -35,10 +35,6 @@ module MijDiscord::Data
     def icon_url(format = :png)
       MijDiscord::Core::API.emoji_icon_url(@id, format)
     end
-
-    def inspect
-      %(<Emoji id=#{@id} name=#{@name}>)
-    end
   end
 
   class Reaction

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

@@ -71,7 +71,7 @@ module MijDiscord::Data
     alias_method :eql?, :==
 
     def delete(reason = nil)
-      MijDiscord::Core::API::Invite.delete(@bot.token, @code, reason)
+      MijDiscord::Core::API::Invite.delete(@bot.auth, @code, reason)
     end
 
     alias_method :revoke, :delete
@@ -79,9 +79,5 @@ module MijDiscord::Data
     def invite_url
       "https://discord.gg/#{@code}"
     end
-
-    def inspect
-      %(<Invite code=#{@code} uses=#{@max_uses} temporary=#{@temporary} revoked=#{@revoked}>)
-    end
   end
 end

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

@@ -74,7 +74,7 @@ module MijDiscord::Data
 
     def set_roles(roles, reason = nil)
       roles = roles.map(&:to_id)
-      MijDiscord::Core::API::Server.update_member(@bot.token, @server.id, @user.id, reason, roles: roles)
+      MijDiscord::Core::API::Server.update_member(@bot.auth, @server.id, @user.id, reason, roles: roles)
     end
 
     def modify_roles(add, remove, reason = nil)
@@ -88,7 +88,7 @@ module MijDiscord::Data
         modify_roles(role, [], reason)
       else
         role = role.to_id
-        MijDiscord::Core::API::Server.add_member_role(@bot.token, @server.id, @user.id, role, reason)
+        MijDiscord::Core::API::Server.add_member_role(@bot.auth, @server.id, @user.id, role, reason)
       end
     end
 
@@ -97,7 +97,7 @@ module MijDiscord::Data
         modify_roles([], role, reason)
       else
         role = role.to_id
-        MijDiscord::Core::API::Server.remove_member_role(@bot.token, @server.id, @user.id, role, reason)
+        MijDiscord::Core::API::Server.remove_member_role(@bot.auth, @server.id, @user.id, role, reason)
       end
     end
 
@@ -123,9 +123,9 @@ module MijDiscord::Data
       nick ||= ''
 
       if @user.current_bot?
-        MijDiscord::Core::API::User.change_own_nickname(@bot.token, @server.id, nick, reason)
+        MijDiscord::Core::API::User.change_own_nickname(@bot.auth, @server.id, nick, reason)
       else
-        MijDiscord::Core::API::Server.update_member(@bot.token, @server.id, @user.id, reason, nick: nick)
+        MijDiscord::Core::API::Server.update_member(@bot.auth, @server.id, @user.id, reason, nick: nick)
       end
     end
 
@@ -135,10 +135,6 @@ module MijDiscord::Data
       nickname.empty? ? username : nickname
     end
 
-    def inspect
-      %(<Member user=#{@user.inspect} server=#{@server.id}>)
-    end
-
     private
 
     def voice_state_attribute(key)
@@ -166,9 +162,5 @@ module MijDiscord::Data
       @voice_channel, @server, @roles = nil, nil, []
       @nickname, @joined_at = '', @channel.creation_time
     end
-
-    def inspect
-      %(<Recipient user=#{@user.inspect} channel=#{@channel.inspect}>)
-    end
   end
 end

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

@@ -114,18 +114,18 @@ module MijDiscord::Data
     end
 
     def edit(text: '', embed: nil)
-      response = MijDiscord::Core::API::Channel.edit_message(@bot.token, @channel.id, @id,
+      response = MijDiscord::Core::API::Channel.edit_message(@bot.auth, @channel.id, @id,
         text, [], embed&.to_h)
       @channel.cache.put_message(JSON.parse(response), update: true)
     end
 
     def pin
-      MijDiscord::Core::API::Channel.pin_message(@bot.token, @channel.id, @id)
+      MijDiscord::Core::API::Channel.pin_message(@bot.auth, @channel.id, @id)
       nil
     end
 
     def unpin
-      MijDiscord::Core::API::Channel.unpin_message(@bot.token, @channel.id, @id)
+      MijDiscord::Core::API::Channel.unpin_message(@bot.auth, @channel.id, @id)
       nil
     end
 
@@ -139,7 +139,7 @@ module MijDiscord::Data
 
     def create_reaction(reaction)
       emoji = reaction.respond_to?(:reaction) ? reaction.reaction : reaction
-      MijDiscord::Core::API::Channel.create_reaction(@bot.token, @channel.id, @id, emoji)
+      MijDiscord::Core::API::Channel.create_reaction(@bot.auth, @channel.id, @id, emoji)
       nil
     end
 
@@ -147,33 +147,29 @@ module MijDiscord::Data
 
     def reacted_with(reaction)
       emoji = reaction.respond_to?(:reaction) ? reaction.reaction : reaction
-      response = MijDiscord::Core::API::Channel.get_reactions(@bot.token, @channel.id, @id, emoji)
+      response = MijDiscord::Core::API::Channel.get_reactions(@bot.auth, @channel.id, @id, emoji)
       JSON.parse(response).map {|x| @bot.cache.put_user(x) }
     end
 
     def delete_reaction(reaction, user: nil)
       emoji = reaction.respond_to?(:reaction) ? reaction.reaction : reaction
       if user.nil?
-        MijDiscord::Core::API::Channel.delete_own_reaction(@bot.token, @channel.id, @id, emoji)
+        MijDiscord::Core::API::Channel.delete_own_reaction(@bot.auth, @channel.id, @id, emoji)
       else
-        MijDiscord::Core::API::Channel.delete_user_reaction(@bot.token, @channel.id, @id, emoji, user.to_id)
+        MijDiscord::Core::API::Channel.delete_user_reaction(@bot.auth, @channel.id, @id, emoji, user.to_id)
       end
       nil
     end
 
     def clear_reactions
-      MijDiscord::Core::API::Channel.delete_all_reactions(@bot.token, @channel.id, @id)
+      MijDiscord::Core::API::Channel.delete_all_reactions(@bot.auth, @channel.id, @id)
       nil
     end
 
     def delete
-      MijDiscord::Core::API::Channel.delete_message(@bot.token, @channel.id, @id)
+      MijDiscord::Core::API::Channel.delete_message(@bot.auth, @channel.id, @id)
       nil
     end
-
-    def inspect
-      %(<Message id=#{@id} timestamp=#{@timestamp} content="#{@content}" author=#{@author.inspect} channel=#{@channel.inspect}>)
-    end
   end
 
   class Attachment