mij-discord 1.0.10 → 1.0.11

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 MijDiscord::Errors::NotFound
         return nil
       end
@@ -275,7 +278,10 @@ module MijDiscord::Cache
       return nil if local
 
       begin
-        response = MijDiscord::Core::API::Channel.message(@bot.auth, @channel.id, key)
+        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

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

@@ -12,6 +12,9 @@ module MijDiscord::Core::API
           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}"
+
+        when :user
+          'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:54.0) Gecko/20100101 Firefox/54.0.1'
       end
     end
 

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

@@ -461,5 +461,18 @@ module MijDiscord::Core::API::Server
         Authorization: auth
       )
     end
+
+    # Search messages (for userbots only)
+    # Not officially documented, reverse engineered from tracking Discord's network activity
+    def search_messages(auth, server_id, options)
+      options = URI.encode_www_form(options)
+      MijDiscord::Core::API.request(
+        :guilds_guild_messages_search,
+        server_id,
+        :get,
+        "#{MijDiscord::Core::API::APIBASE_URL}/guilds/#{server_id}/messages/search?#{options}",
+        Authorization: auth
+      )
+    end
   end
 end

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

@@ -14,6 +14,18 @@ module MijDiscord::Core::API::User
       )
     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)

data/lib/mij-discord/data.rb

@@ -20,14 +20,18 @@ module MijDiscord::Data
     alias_method :eql?, :==
 
     def creation_time
-      ms = (@id >> 22) + DISCORD_EPOCH
-      Time.at(ms / 1000.0).utc
+      IDObject.timestamp(@id)
     end
 
     def self.synthesize(time)
       ms = (time.to_f * 1000).to_i
       (ms - DISCORD_EPOCH) << 22
     end
+
+    def self.timestamp(id)
+      ms = (id >> 22) + DISCORD_EPOCH
+      Time.at(ms / 1000.0).utc
+    end
   end
 
   module PermissionObject

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

@@ -63,13 +63,11 @@ module MijDiscord::Data
       @parent_id = data.fetch('parent_id', @parent_id).to_i
 
       if (perms = data['permission_overwrites'])
-        @permission_overwrites = {}
-
-        perms.each do |elem|
-          id = elem['id'].to_i
-          @permission_overwrites[id] = Overwrite.from_hash(elem)
+        @permission_overwrites = perms.each_with_object({}) do |el, p|
+          p[el['id'].to_i] = Overwrite.from_hash(el)
         end
       end
+      @permission_overwrites ||= {}
     end
 
     def mention

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

@@ -81,30 +81,30 @@ module MijDiscord::Data
 
       @mention_everyone = !!data['mention_everyone']
 
-      @reactions = []
       if (reactions = data['reactions'])
-        reactions.each {|x| @reactions << Reaction.new(x, self) }
+        @reactions = reactions.map {|x| Reaction.new(x, self) }
       end
+      @reactions ||= []
 
-      @user_mentions = []
       if (mentions = data['mentions'])
-        mentions.each {|x| @user_mentions << @bot.cache.put_user(x) }
+        @user_mentions = mentions.map {|x| @bot.cache.put_user(x) }
       end
+      @user_mentions ||= []
 
-      @role_mentions = []
       if @channel.text? && (mentions = data['mention_roles'])
-        mentions.each {|x| @role_mentions << @channel.server.role(x) }
+        @role_mentions = mentions.map {|x| @channel.server.role(x) }
       end
+      @role_mentions ||= []
 
-      @attachments = []
       if (attachments = data['attachments'])
-        attachments.each {|x| @attachments << Attachment.new(x, self) }
+        @attachments = attachments.map {|x| Attachment.new(x, self) }
       end
+      @attachments ||= []
 
-      @embeds = []
       if (embeds = data['embeds'])
-        embeds.each {|x| @embeds << Embed.new(x) }
+        @embeds = embeds.map {|x| Embed.new(x) }
       end
+      @embeds ||= []
     end
 
     def update_reaction(add: nil, remove: nil, clear: false)

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

@@ -67,7 +67,6 @@ module MijDiscord::Data
       @id = data['id'].to_i
       @large = data['large']
       @member_count = data['member_count']
-      @members_chunked = 0
 
       @cache = MijDiscord::Cache::ServerCache.new(self, @bot)
 
@@ -107,11 +106,12 @@ module MijDiscord::Data
     end
 
     def update_emojis(data)
-      @emojis = {}
-      data['emojis'].each do |em|
-        emoji = MijDiscord::Data::Emoji.new(em, self)
-        @emojis[emoji.id] = emoji
+      if (emojis = data['emojis'])
+        @emojis = emojis.each_with_object({}) do |el, p|
+          p[el['id'].to_i] = Emoji.new(el, self)
+        end
       end
+      @emojis ||= {}
     end
 
     def update_voice_state(data)
@@ -136,7 +136,7 @@ module MijDiscord::Data
       return if @members_chunked.nil?
 
       @members_chunked += data.length
-      data.each {|mb| @cache.put_member(mb) }
+      data.each {|mb| @cache.put_member(mb, update: true) }
 
       @members_chunked = nil if @members_chunked == @member_count
     end
@@ -183,12 +183,14 @@ module MijDiscord::Data
       @cache.get_role(id)
     end
 
-    def members
-      unless @members_chunked.nil?
+    def members(full = false)
+      if full && !@members_chunk_sent
+        @members_chunked, @members_chunk_sent = 0, true
         @bot.gateway.send_request_members(@id, '', 0)
-        sleep(0.05) while @members_chunked
       end
 
+      sleep(0.05) while @members_chunked
+
       @cache.list_members
     end
 
@@ -396,10 +398,73 @@ module MijDiscord::Data
       MijDiscord::Core::API.widget_url(@id, style)
     end
 
+    def search_messages(limit: 25, offset: 0, sort_by: nil, sort_asc: false,
+    nsfw: true, around: 2, content: nil, author: nil, channel: nil, mentions: nil,
+    author_is: nil, author_not: nil, has: nil, has_not: nil, before: nil, after: nil)
+      author = author ? [*author].map(&:to_id) : nil
+      channel = channel ? [*channel].map(&:to_id) : nil
+      mentions = mentions ? [*mentions].map(&:to_id) : nil
+
+      has_not = has_not ? [*has_not].map {|x| "-#{x}" } : []
+      author_not = author_not ? [*author_not].map {|x| "-#{x}" } : []
+
+      has = has_not | (has ? [*has].map(&:to_s) : [])
+      author_is = author_not | (author_is ? [*author_is].map(&:to_s) : [])
+
+      before = before ? IDObject.synthesize(before) : nil
+      after = after ? IDObject.synthesize(after) : nil
+
+      options = {
+        limit: limit,
+        offset: offset,
+        sort_by: sort_by,
+        sort_order: sort_asc ? 'asc' : 'desc',
+        context_size: around,
+        include_nsfw: nsfw,
+        author_id: author,
+        author_type: author_is,
+        channel_id: channel,
+        mentions: mentions,
+        max_id: before,
+        min_id: after,
+        content: content,
+        has: has,
+      }.delete_if {|_,v| v.nil? }
+
+      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) do
+      def inspect
+        MijDiscord.make_inspect(self, :result, :context)
+      end
+    end
+
+    attr_reader :total_count
+
+    attr_reader :messages
+
+    def initialize(data, bot)
+      @total_count = data['total_results']
+
+      @messages = data['messages'].map do |group|
+        context = group.map {|x| Message.new(x, bot) }
+        result = context.delete_at(context.length / 2)
+        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

@@ -44,10 +44,10 @@ module MijDiscord::Data
       @application = data['application_id']
 
       if (start_time = data.dig('timestamps', 'start'))
-        @start_time = Time.at(start_time).utc
+        @start_time = Time.at(start_time.to_i).utc
       end
       if (end_time = data.dig('timestamps', 'end'))
-        @end_time = Time.at(end_time).utc
+        @end_time = Time.at(end_time.to_i).utc
       end
 
       if (assets = data['assets'])

data/lib/mij-discord/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mij-discord
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Mijyuoon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client