mij-discord 1.0.5 → 1.0.6

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

@@ -85,19 +85,13 @@ module MijDiscord::Data
     alias_method :color=, :set_color
 
     def delete(reason = nil)
-      MijDiscord::Core::API::Server.delete_role(@bot.token, @server.id, @id, reason)
+      MijDiscord::Core::API::Server.delete_role(@bot.auth, @server.id, @id, reason)
     end
 
     def set_options(name: nil, color: nil, hoist: nil, mentionable: nil, permissions: nil)
-      response = MijDiscord::Core::API::Server.update_role(@bot.token, @server.id, @id,
+      response = MijDiscord::Core::API::Server.update_role(@bot.auth, @server.id, @id,
         name, color&.to_i, hoist, mentionable, permissions&.to_i)
       @server.cache.put_role(JSON.parse(response), update: true)
     end
-
-    def inspect
-      %(<Role id=#{@id} name=#{@name} server=#{@server.inspect}>)
-    end
-
-    private
   end
 end

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

@@ -217,21 +217,21 @@ module MijDiscord::Data
     end
 
     def invites
-      response = MijDiscord::Core::API::Server.invites(@bot.token, @id)
+      response = MijDiscord::Core::API::Server.invites(@bot.auth, @id)
       JSON.parse(response).map {|x| Invite.new(x, @bot) }
     end
 
     def prune_count(days)
       raise ArgumentError, 'Days must be between 1 and 30' unless days.between?(1, 30)
 
-      response = MijDiscord::Core::API::Server.prune_count(@bot.token, @id, days)
+      response = MijDiscord::Core::API::Server.prune_count(@bot.auth, @id, days)
       JSON.parse(response)['pruned']
     end
 
     def prune(days, reason = nil)
       raise ArgumentError, 'Days must be between 1 and 30' unless days.between?(1, 30)
 
-      response = MijDiscord::Core::API::Server.begin_prune(@bot.token, @id, days, reason)
+      response = MijDiscord::Core::API::Server.begin_prune(@bot.auth, @id, days, reason)
       JSON.parse(response)['pruned']
     end
 
@@ -247,55 +247,55 @@ module MijDiscord::Data
       raise ArgumentError, 'Invalid channel type specified' unless CHANNEL_TYPES.has_key?(type)
 
       permissions = permissions.map {|x| x.is_a(Overwrite) ? x.to_hash : x }
-      response = MijDiscord::Core::API::Server.create_channel(@bot.token, @id,
+      response = MijDiscord::Core::API::Server.create_channel(@bot.auth, @id,
         name, CHANNEL_TYPES[type], bitrate, user_limit, permissions, nsfw, reason)
       @cache.put_channel(JSON.parse(response))
     end
 
     def create_role(name, reason = nil, color: 0, hoist: false, mentionable: false, permissions: 104_324_161)
-      response = MijDiscord::Core::API::Server.create_role(@bot.token, @id,
+      response = MijDiscord::Core::API::Server.create_role(@bot.auth, @id,
         name, color.to_i, hoist, mentionable, permissions.to_i, reason)
       @cache.put_role(JSON.parse(response))
     end
 
     def bans
-      response = MijDiscord::Core::API::Server.bans(@bot.token, @id)
+      response = MijDiscord::Core::API::Server.bans(@bot.auth, @id)
       JSON.parse(response).map {|x| @bot.cache.put_user(x['user']) }
     end
 
     def ban(user, message_days = 0, reason = nil)
-      MijDiscord::Core::API::Server.ban_user(@bot.token, @id, user.to_id, message_days, reason)
+      MijDiscord::Core::API::Server.ban_user(@bot.auth, @id, user.to_id, message_days, reason)
       nil
     end
 
     def unban(user, reason = nil)
-      MijDiscord::Core::API::Server.unban_user(@bot.token, @id, user.to_id, reason)
+      MijDiscord::Core::API::Server.unban_user(@bot.auth, @id, user.to_id, reason)
       nil
     end
 
     def kick(user, reason = nil)
-      MijDiscord::Core::API::Server.remove_member(@bot.token, @id, user.to_id, reason)
+      MijDiscord::Core::API::Server.remove_member(@bot.auth, @id, user.to_id, reason)
       nil
     end
 
     def leave
-      MijDiscord::Core::API::User.leave_server(@bot.token, @id)
+      MijDiscord::Core::API::User.leave_server(@bot.auth, @id)
       nil
     end
 
     def delete
-      MijDiscord::Core::API::Server.delete(@bot.token, @id)
+      MijDiscord::Core::API::Server.delete(@bot.auth, @id)
       nil
     end
 
     def set_owner(user, reason = nil)
-      MijDiscord::Core::API::Server.transfer_ownership(@bot.token, @id, user.to_id, reason)
+      MijDiscord::Core::API::Server.transfer_ownership(@bot.auth, @id, user.to_id, reason)
     end
 
     alias_method :owner=, :set_owner
 
     def set_options(reason = nil, name: nil, region: nil, icon: nil, afk_channel: nil, afk_timeout: nil)
-      response = MijDiscord::Core::API::Server.update(@bot.token, @id,
+      response = MijDiscord::Core::API::Server.update(@bot.auth, @id,
         name, region, icon, afk_channel&.to_id, afk_timeout, reason)
       @bot.cache.put_server(JSON.parse(response), update: true)
     end
@@ -310,7 +310,7 @@ module MijDiscord::Data
     def available_regions
       return @voice_regions if @voice_regions
 
-      response = MijDiscord::Core::API::Server.regions(@bot.token, @id)
+      response = MijDiscord::Core::API::Server.regions(@bot.auth, @id)
       @voice_regions = JSON.parse(response).map {|x| VoiceRegion.new(x) }
     end
 
@@ -365,8 +365,59 @@ module MijDiscord::Data
       MijDiscord::Core::API.widget_url(@id, style)
     end
 
-    def inspect
-      %(<Server id=#{@id} name="#{@name}" large=#{@large} region=#{@region_id} owner=#{@owner.id}>)
+    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
+  end
+
+  class SearchResults
+    ResultData = Struct.new(:result, :context)
+
+    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
   end
 end

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

@@ -126,10 +126,6 @@ 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
-
-    def inspect
-      %(<User id=#{@id} name="#{@username}" tag=#{@discriminator}>)
-    end
   end
 
   class Profile < User
@@ -143,7 +139,7 @@ module MijDiscord::Data
     end
 
     def set_username(name)
-      response = MijDiscord::Core::API::User.update_profile(@bot.token, name, nil)
+      response = MijDiscord::Core::API::User.update_profile(@bot.auth, name, nil)
       update_data(JSON.parse(response))
       nil
     end
@@ -163,7 +159,7 @@ module MijDiscord::Data
         raise ArgumentError, 'Invalid avatar data provided'
       end
 
-      response = MijDiscord::Core::API::User.update_profile(@bot.token, @username, data)
+      response = MijDiscord::Core::API::User.update_profile(@bot.auth, @username, data)
       update_data(JSON.parse(response))
       nil
     end

data/lib/mij-discord/version.rb

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

metadata

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