mij-discord 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a986d989e1c82e40f9c1c5346b3496a402491f3e
-  data.tar.gz: 8db9cd45703269a7c40e03beccc2c4dcf272b0d3
+  metadata.gz: aca2803ee72c1ab5229d6767b809ee5a3a1aa605
+  data.tar.gz: 037b4495e988f6c7c70e83801920fda475b9a262
 SHA512:
-  metadata.gz: 31147c15e9b63573c41bba6b700b9be15002be8b7262ca42c2fc50a7fc0ed7486ca08e6833a98ee53f58a4cbbdc151d05b6a43ee0da399698f291b7925100e9c
-  data.tar.gz: e5d0c9e7383b825b8bb513177361cb9dbd56650fd8f3563ca18c878ac3a9269f816f2b3d84e43c5d18b97ac15b41f43316e5831d69f920cf828781cb5c31686a
+  metadata.gz: 2ff78a29820234b6ff79a848ccb0fb9b77019d645ec18bb6040a3566923f3e775462f01224a8df803ac07d31f29d55d4f7eb50c7de3ae5e464eac19b05c7fb0d
+  data.tar.gz: 641bcc97f7a0039e655eb7ad4800a1dfcf0d62c9a5ff9333243204dc2eb9fbec24e897a4b54b40bf0288bece09cff9f740bc3a5308ade781647adb8b908fd0ac

data/lib/mij-discord/bot.rb

@@ -1,14 +1,30 @@
 # frozen_string_literal: true
 
 module MijDiscord
-  class Bot
-    class AuthInfo
-      attr_reader :token
+      class Bot
+        class AuthInfo
+          attr_reader :token
 
       attr_reader :type
 
-      def initialize(token, type)
-        @token, @type = token, type
+      attr_reader :name
+
+      def initialize(token, type, name)
+        @type, @name = type, name
+
+        @token = case type
+          when :bot then "Bot #{token}"
+          when :user then "#{token}"
+          else raise ArgumentError, 'Invalid token type'
+        end
+      end
+
+      def bot?
+        @type == :bot
+      end
+
+      def user?
+        @type == :user
       end
 
       alias_method :to_s, :token
@@ -60,8 +76,6 @@ module MijDiscord
 
     UNAVAILABLE_SERVER_TIMEOUT = 10
 
-    USER_STATUS = [:online, :idle, :dnd, :invisible, :offline].freeze
-
     attr_reader :name
 
     attr_reader :client_id
@@ -78,15 +92,8 @@ 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, @name = client_id.to_id, name || ''
-
-      token = case type
-        when :bot then "Bot #{token}"
-        when :user then "#{token}"
-        else raise ArgumentError, 'Invalid bot type'
-      end
-
-      @auth = AuthInfo.new(token, type)
+      @client_id = client_id.to_id
+      @auth = AuthInfo.new(token, type, name)
 
       @cache = MijDiscord::Cache::BotCache.new(self)
 
@@ -296,26 +303,26 @@ module MijDiscord
       @ignore_self && user.to_id == @client_id || @ignored_ids.include?(user.to_id)
     end
 
-    def change_status(status: nil, game: nil, url: nil)
+    def update_presence(status: nil, game: nil)
       gateway_check
 
-      status = status.nil? ? @profile.status : USER_STATUS.find(status)
-      raise ArgumentError, "Status '#{status}' is not valid" unless status
-
-      game_obj = case game
-        when false
-          nil
-        when nil
-          {'name' => @profile.game, 'url' => @profile.stream_url, 'type' => @profile.stream_type}
-        else
-          {'name' => game, 'url' => url, 'type' => url ? 1 : 0}
+      status = case status
+        when nil then @profile.status
+        when :online, :idle, :dnd, :online then status
+        else raise ArgumentError, 'Invalid status'
       end
 
-      game_obj&.reject! {|_,v| v.nil? }
-      game_obj = nil if game_obj&.empty?
-
-      @gateway.send_status_update(status, nil, game_obj, false)
-      @profile.update_presence('status' => status, 'game' => game_obj)
+      game = case game
+        when nil then @profile.game
+        when false then nil
+        when String, Hash
+          MijDiscord::Data::Game.construct(game)
+        when MijDiscord::Data::Game then game
+        else raise ArgumentError, 'Invalid game'
+      end&.to_hash
+
+      @gateway.send_status_update(status, nil, game, false)
+      @profile.update_presence('status' => status, 'game' => game)
       nil
     end
 
@@ -372,6 +379,7 @@ 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)
@@ -386,6 +394,10 @@ module MijDiscord
 
           trigger_event(:create_server, self, server)
 
+        when :GUILD_SYNC
+          server = @cache.get_server(data['id'])
+          server.update_synced_data(data)
+
         when :GUILD_UPDATE
           server = @cache.put_server(data, update: true)
           trigger_event(:update_server, self, server)
@@ -424,17 +436,17 @@ module MijDiscord
 
         when :GUILD_MEMBER_ADD
           server = @cache.get_server(data['guild_id'])
-          member = server.cache.put_member(data)
+          member = server.update_member(data, :add)
           trigger_event(:create_member, self, member, server)
 
         when :GUILD_MEMBER_UPDATE
           server = @cache.get_server(data['guild_id'])
-          member = server.cache.put_member(data, update: true)
+          member = server.update_member(data, :update)
           trigger_event(:update_member, self, member, server)
 
         when :GUILD_MEMBER_REMOVE
           server = @cache.get_server(data['guild_id'])
-          member = server.cache.remove_member(data['user']['id'])
+          member = server.update_member(data, :remove)
           trigger_event(:delete_member, self, member, server)
 
         when :GUILD_ROLE_CREATE
@@ -573,6 +585,11 @@ module MijDiscord
       @gateway.notify_ready
 
       trigger_event(:ready, self)
+
+      if @auth.user?
+        guilds = @cache.list_servers.map(&:id)
+        @gateway.send_request_guild_sync(guilds)
+      end
     end
 
     def trigger_event(name, *args)

data/lib/mij-discord/cache.rb

@@ -81,7 +81,10 @@ module MijDiscord::Cache
       return nil if local
 
       begin
-        response = MijDiscord::Core::API::User.resolve(@bot.auth, id)
+        response = case @bot.auth.type
+          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
         return nil
       end

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

@@ -6,12 +6,10 @@ module MijDiscord::Core::API
   CDN_URL = 'https://cdn.discordapp.com'
 
   class << self
-    attr_accessor :bot_name
-
     def user_agent(auth)
       case auth&.type
         when :bot
-          bot_name = @bot_name || 'generic'
+          bot_name = auth.name || 'generic'
           ua_base = "DiscordBot (https://github.com/Mijyuoon/mij-discord, v#{MijDiscord::VERSION})"
           "#{ua_base} mij-discord/#{MijDiscord::VERSION} #{bot_name}"
 

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

@@ -14,7 +14,19 @@ module MijDiscord::Core::API::User
       )
     end
 
-    # Get profile data
+    # 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(

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

@@ -60,6 +60,10 @@ module MijDiscord::Core
     # **Received**: Returned after a heartbeat was sent to the server. This allows clients to identify and deal with
     # zombie connections that don't dispatch any events anymore.
     HEARTBEAT_ACK = 11
+
+    # **Sent**: [Undocumented] This opcode makes the gateway to send current state of a server. This includes a list
+    # of members and their presences, which mirror the format of GUILD_CREATE event.
+    GUILD_SYNC = 12
   end
 
   # @!visibility private
@@ -238,7 +242,7 @@ module MijDiscord::Core
       send_packet(Opcodes::RESUME, data)
     end
 
-    def send_request_members(server_id, query, limit)
+    def send_request_members(server_id, query = '', limit = 0)
       data = {
         guild_id: server_id,
         query: query,
@@ -248,6 +252,10 @@ module MijDiscord::Core
       send_packet(Opcodes::REQUEST_MEMBERS, data)
     end
 
+    def send_request_guild_sync(guilds)
+      send_packet(Opcodes::GUILD_SYNC, guilds)
+    end
+
     def send_packet(opcode, packet)
       data = {
         op: opcode,

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

@@ -66,7 +66,7 @@ module MijDiscord::Data
 
       @id = data['id'].to_i
       @large = data['large']
-      @members_init = data['member_count']
+      @member_count = data['member_count']
       @members_chunked = 0
 
       @cache = MijDiscord::Cache::ServerCache.new(self, @bot)
@@ -75,15 +75,7 @@ module MijDiscord::Data
 
       data['roles']&.each {|ro| @cache.put_role(ro) }
 
-      data['members']&.each {|mb| @cache.put_member(mb) }
-
-      data['presences']&.each do |pr|
-        next unless pr['user']
-
-        user_id = pr['user']['id'].to_i
-        user = @cache.get_member(user_id, local: true)
-        user.update_presence(pr) if user
-      end
+      update_synced_data(data)
 
       @voice_states = {}
       data['voice_states']&.each {|vs| update_voice_state(vs) }
@@ -146,7 +138,33 @@ module MijDiscord::Data
       @members_chunked += data.length
       data.each {|mb| @cache.put_member(mb) }
 
-      @members_chunked = nil if @members_chunked == @members_init
+      @members_chunked = nil if @members_chunked == @member_count
+    end
+
+    def update_synced_data(data)
+      data['members']&.each {|mb| @cache.put_member(mb, update: true) }
+
+      data['presences']&.each do |pr|
+        next unless pr['user']
+
+        user_id = pr['user']['id'].to_i
+        user = @cache.get_member(user_id, local: true)
+        user.update_presence(pr) if user
+      end
+    end
+
+    def update_member(data, mode)
+      case mode
+        when :add
+          @member_count += 1
+          @cache.put_member(data)
+        when :remove
+          @member_count -= 1
+          key = data['user']['id']
+          @cache.remove_member(key)
+        when :update
+          @cache.put_member(data, update: true)
+      end
     end
 
     def channels

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

@@ -1,6 +1,112 @@
 # frozen_string_literal: true
 
 module MijDiscord::Data
+  class Game
+    PLAYING_TYPE = [
+      :playing,
+      :streaming,
+      :listening,
+      :watching,
+    ].freeze
+
+    attr_reader :name
+
+    attr_reader :url
+
+    attr_reader :details
+
+    attr_reader :state
+
+    attr_reader :start_time
+
+    attr_reader :end_time
+
+    attr_reader :application
+
+    attr_reader :large_image
+
+    attr_reader :large_text
+
+    attr_reader :small_image
+
+    attr_reader :small_text
+
+    def type
+      PLAYING_TYPE[@type]
+    end
+
+    def initialize(data)
+      @type = data['type']
+      @name = data['name']
+      @url = data['url']
+      @details = data['details']
+      @state = data['state']
+
+      if (start_time = data.dig('timestamps', 'start'))
+        @start_time = Time.at(start_time).utc
+      end
+      if (end_time = data.dig('timestamps', 'end'))
+        @end_time = Time.at(end_time).utc
+      end
+
+      if (assets = data['assets'])
+        @large_image = assets['large_image']
+        @large_text = assets['large_text']
+        @small_image = assets['small_image']
+        @small_text = assets['small_text']
+      end
+    end
+
+    def to_hash
+      self.class.construct({
+        start_time: @start_time,
+        end_time: @end_time,
+
+        large_image: @large_image,
+        large_text: @large_text,
+        small_image: @small_image,
+        small_text: @small_text,
+
+        type: @type,
+        name: @name,
+        url: @url,
+        details: @details,
+        state: @state,
+      })
+    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,
+      }.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],
+      }.delete_if {|_,v| v.nil? }
+
+      type = PLAYING_TYPE.index(data[:type])
+
+      game = {
+        type: type || 0,
+        name: data[:name],
+        url: data[:url],
+        details: data[:details],
+        state: data[:state],
+
+        timestamps: times.empty? ? nil : times,
+        assets: assets.empty? ? nil : assets,
+      }.delete_if {|_,v| v.nil? }
+
+      game
+    end
+  end
+
   class User
     include IDObject
 
@@ -21,18 +127,19 @@ module MijDiscord::Data
 
     attr_reader :game
 
-    attr_reader :stream_url
-
-    attr_reader :stream_type
+    attr_reader :extra
 
     def initialize(data, bot)
       @bot = bot
 
+      # Kludge for User::resolve2 API call
+      data = data['user'] if data['user'].is_a?(Hash)
+
       @id = data['id'].to_i
       @bot_account = !!data['bot']
       update_data(data)
 
-      @status = :offline
+      @status, @game = :offline, nil
 
       @roles = {}
     end
@@ -47,11 +154,9 @@ module MijDiscord::Data
       @status = presence['status'].to_sym
 
       if (game = presence['game'])
-        @game = game['name']
-        @stream_url = game['url']
-        @stream_type = game['type']
+        @game = Game.new(game)
       else
-        @game = @stream_url = @stream_type = nil
+        @game = nil
       end
     end
 
@@ -126,6 +231,8 @@ module MijDiscord::Data
       return MijDiscord::Core::API::User.default_avatar(@discriminator) unless @avatar_id
       MijDiscord::Core::API::User.avatar_url(@id, @avatar_id, format)
     end
+
+    alias_method :avatar, :avatar_url
   end
 
   class Profile < User

data/lib/mij-discord/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MijDiscord
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mij-discord
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Mijyuoon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client