mij-discord 1.0.9 → 1.0.10

data/lib/mij-discord/events/basic.rb

@@ -33,6 +33,20 @@ module MijDiscord::Events
     end
   end
 
+  class Unhandled < Generic
+    attr_reader :name
+
+    attr_reader :data
+
+    filter_match(:name, on: Symbol, cmp: :eql?)
+
+    def initialize(bot, name, data)
+      super(bot)
+
+      @name, @data = name, data
+    end
+  end
+
   class UpdateUser < Generic
     attr_reader :user
 

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

@@ -32,6 +32,8 @@ module MijDiscord::Events
 
   class UpdateWebhooks < Channel; end
 
+  class UpdatePins < Channel; end
+
   class Recipient < Channel
     attr_reader :recipient
     alias_method :user, :recipient

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

@@ -1,102 +1,92 @@
-# frozen_string_literal: true
-
-module MijDiscord::Events
-  class Server < Generic
-    attr_reader :server
-
-    filter_match(:server, field: [:server, :name], on: [String, Regexp], cmp: :case)
-    filter_match(:server, on: :id_obj, cmp: :eql?)
-
-    def initialize(bot, server)
-      super(bot)
-
-      @server = server
-    end
-  end
-
-  class CreateServer < Server; end
-
-  class UpdateServer < Server; end
-
-  class DeleteServer < Server; end
-
-  # class DeleteServer < Generic
-  #   attr_reader :id
-  #
-  #   filter_match(:server, field: :id, on: :id_obj) {|x,k| x == k.to_id }
-  #
-  #   def initialize(bot, data)
-  #     super(bot)
-  #
-  #     @id = data['id'].to_i
-  #   end
-  # end
-
-  class UpdateEmoji < Server
-    attr_reader :added
-
-    attr_reader :removed
-
-    delegate_method :emojis, to: :server
-
-    def initialize(bot, server, old_emoji, new_emoji)
-      super(bot, server)
-
-      @added = new_emoji - old_emoji
-      @removed = old_emoji - new_emoji
-    end
-  end
-
-  class BanUser < Server
-    attr_reader :user
-
-    filter_match(:user, field: [:user, :name], on: [String, Regexp], cmp: :case)
-    filter_match(:user, on: :id_obj, cmp: :eql?)
-
-    def initialize(bot, server, user)
-      super(bot, server)
-
-      @user = user
-    end
-  end
-
-  class UnbanUser < BanUser; end
-
-  class UpdatePresence < Server
-    attr_reader :user
-
-    attr_reader :status
-
-    filter_match(:user, on: :id_obj, cmp: :eql?)
-    filter_match(:status, on: Symbol, cmp: :eql?)
-
-    def initialize(bot, data)
-      server = @bot.server(data['guild_id'])
-      super(bot, server)
-
-      @status = data['status'].to_sym
-      @user = @bot.user(data['user']['id'])
-    end
-  end
-
-  class UpdatePlaying < UpdatePresence
-    attr_reader :game
-
-    attr_reader :stream_type
-
-    attr_reader :stream_url
-
-    filter_match(:game, on: [String, Regexp], cmp: :case)
-    filter_match(:stream_type, on: Integer, cmp: :eql?)
-
-    def initialize(bot, data)
-      super(bot, data)
-
-      if (game = data['game'])
-        @game = game['name']
-        @stream_type = game['type']
-        @stream_url = game['url']
-      end
-    end
-  end
+# frozen_string_literal: true
+
+module MijDiscord::Events
+  class Server < Generic
+    attr_reader :server
+
+    filter_match(:server, field: [:server, :name], on: [String, Regexp], cmp: :case)
+    filter_match(:server, on: :id_obj, cmp: :eql?)
+
+    def initialize(bot, server)
+      super(bot)
+
+      @server = server
+    end
+  end
+
+  class CreateServer < Server; end
+
+  class UpdateServer < Server; end
+
+  class DeleteServer < Server; end
+
+  # class DeleteServer < Generic
+  #   attr_reader :id
+  #
+  #   filter_match(:server, field: :id, on: :id_obj) {|x,k| x == k.to_id }
+  #
+  #   def initialize(bot, data)
+  #     super(bot)
+  #
+  #     @id = data['id'].to_i
+  #   end
+  # end
+
+  class UpdateEmoji < Server
+    attr_reader :added
+
+    attr_reader :removed
+
+    delegate_method :emojis, to: :server
+
+    def initialize(bot, server, old_emoji, new_emoji)
+      super(bot, server)
+
+      @added = new_emoji - old_emoji
+      @removed = old_emoji - new_emoji
+    end
+  end
+
+  class BanUser < Server
+    attr_reader :user
+
+    filter_match(:user, field: [:user, :name], on: [String, Regexp], cmp: :case)
+    filter_match(:user, on: :id_obj, cmp: :eql?)
+
+    def initialize(bot, server, user)
+      super(bot, server)
+
+      @user = user
+    end
+  end
+
+  class UnbanUser < BanUser; end
+
+  class UpdatePresence < Server
+    attr_reader :user
+
+    attr_reader :status
+
+    attr_reader :game
+
+    filter_match(:user, on: :id_obj, cmp: :eql?)
+    filter_match(:status, on: Symbol, cmp: :eql?)
+
+    filter_match(:game, field: [:game, :name], on: [String, Regexp], cmp: :case)
+
+    def initialize(bot, data)
+      super(bot, bot.server(data['guild_id']))
+
+      @user = @bot.user(data['user']['id'])
+      @status = data['status'].to_sym
+
+      if (game = data['game'])
+        @game = MijDiscord::Data::Game.new(game)
+      end
+    end
+
+    def member
+      @server&.member(@user.id)
+    end
+  end
 end

data/lib/mij-discord/version.rb

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

metadata

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