mij-discord 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79f209e5e6420da2007626aae908544d05da9121
-  data.tar.gz: a3ced104cc02f533b5ba05641112685823a9f382
+  metadata.gz: ebc5f61a41aee441ed9a1d69a93f995fc96934d0
+  data.tar.gz: dcfb7ee3f5c9cfc9e82dbe4d2cc45e5ae2816cb1
 SHA512:
-  metadata.gz: ae684e032ccb55100cd23faf439039f7a2c0f8bc352b8b890307c9270e78b0c724fc0f334fcf6579c4a70b232a2ab55a79b45eeb52146fa3211c15fd71a5c19f
-  data.tar.gz: 933eacfede575e90b795bf7b023260f4964e9d0fb08b8d455a68635a7f2324b8f6abb3b498b1ee2748f5ab0c2ec69c44c961b0e00837f5c43760e87d0d61d744
+  metadata.gz: f68e2a58808f9ae6a33fc8b22948796953135f0c7d7820df2c4d033d9c3a00891f39022287aeb39dc69e8654f4e05619731c540fbe4bbf25518417ffd139e619
+  data.tar.gz: 15d6056effdbe7da11d6d8508aadb59cb45113b72635e18fd7574adc4bd1e630f229f0ca1c117d170e5a9addb3b4ebf0085250ba34394d32111b96bd2296724e

data/lib/mij-discord/bot.rb

@@ -270,7 +270,7 @@ module MijDiscord
           end
 
           em_data = { 'id' => $3.to_i, 'name' => $2, 'animated' => !$1.empty? }
-          MijDiscord::Data::Emoji.new(em_data, self, nil)
+          MijDiscord::Data::Emoji.new(em_data, nil)
       end
     end
 
@@ -381,6 +381,9 @@ module MijDiscord
 
           notify_ready if @unavailable_servers.zero?
 
+        when :SESSIONS_REPLACE
+          # Do nothing with session replace because no idea what it does.
+
         when :GUILD_MEMBERS_CHUNK
           server = @cache.get_server(data['guild_id'])
           server.update_members_chunk(data['members'])
@@ -527,6 +530,10 @@ module MijDiscord
           messages.each {|x| trigger_event(:delete_message, self, x) }
 
         when :MESSAGE_REACTION_ADD
+          channel = @cache.get_channel(data['channel_id'], nil)
+          message = channel.cache.get_message(data['message_id'], local: true)
+          message.update_reaction(add: data) if message
+
           # Should add full use ignore support?
           return if ignored_user?(data['user_id'])
 
@@ -534,6 +541,10 @@ module MijDiscord
           trigger_event(:toggle_reaction, self, data)
 
         when :MESSAGE_REACTION_REMOVE
+          channel = @cache.get_channel(data['channel_id'], nil)
+          message = channel.cache.get_message(data['message_id'], local: true)
+          message.update_reaction(remove: data) if message
+
           # Should add full use ignore support?
           return if ignored_user?(data['user_id'])
 
@@ -541,6 +552,10 @@ module MijDiscord
           trigger_event(:toggle_reaction, self, data)
 
         when :MESSAGE_REACTION_REMOVE_ALL
+          channel = @cache.get_channel(data['channel_id'], nil)
+          message = channel.cache.get_message(data['message_id'], local: true)
+          message.update_reaction(clear: true) if message
+
           trigger_event(:clear_reactions, self, data)
 
         when :TYPING_START

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

@@ -12,8 +12,8 @@ module MijDiscord::Data
 
     attr_reader :animated
 
-    def initialize(data, bot, server)
-      @bot, @server = bot, server
+    def initialize(data, server)
+      @server = server
 
       @id = data['id'].to_i
       @name = data['name']
@@ -46,22 +46,26 @@ module MijDiscord::Data
     end
   end
 
-  class Reaction
-    attr_reader :id
-
-    attr_reader :name
+  class Reaction < Emoji
+    attr_reader :message
 
     attr_reader :count
 
     attr_reader :me
     alias_method :me?, :me
 
-    def initialize(data)
+    def initialize(data, message)
+      super(data['emoji'], nil)
+
+      @message = message
+
       @me = !!data['me']
       @count = data['count'] || 1
+    end
 
-      @id = data['emoji']['id']&.to_i
-      @name = data['emoji']['name']
+    def update_data(count: nil, me: nil)
+      @count = count unless count.nil?
+      @me = me unless me.nil?
     end
 
     def inspect

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

@@ -30,7 +30,7 @@ module MijDiscord::Data
 
     attr_reader :embeds
 
-    # attr_reader :reactions
+    attr_reader :reactions
 
     attr_reader :tts
     alias_method :tts?, :tts
@@ -81,10 +81,10 @@ module MijDiscord::Data
 
       @mention_everyone = !!data['mention_everyone']
 
-      # @reactions = []
-      # if (reactions = data['reactions'])
-      #   reactions.each {|x| @reactions << Reaction.new(x) }
-      # end
+      @reactions = []
+      if (reactions = data['reactions'])
+        reactions.each {|x| @reactions << Reaction.new(x, self) }
+      end
 
       @user_mentions = []
       if (mentions = data['mentions'])
@@ -107,6 +107,38 @@ module MijDiscord::Data
       end
     end
 
+    def update_reaction(add: nil, remove: nil, clear: false)
+      @reactions.clear if clear
+
+      unless add.nil?
+        id = add['emoji']['id'].to_i
+        name = add['emoji']['name']
+        userid = add['user_id'].to_i
+
+        if (emoji = @reactions.find {|x| id.zero? ? (x.name == name) : (x.id == id) })
+          emoji.update_data(count: emoji.count + 1, me: @bot.profile == userid ? true : nil)
+        else
+          emoji = Reaction.new(add, self)
+          emoji.update_data(me: @bot.profile == userid)
+          @reactions << emoji
+        end
+      end
+
+      unless remove.nil?
+        id = remove['emoji']['id'].to_i
+        name = remove['emoji']['name']
+        userid = remove['user_id'].to_i
+
+        if (emoji = @reactions.find {|x| id.zero? ? (x.name == name) : (x.id == id) })
+          emoji.update_data(count: emoji.count - 1, me: @bot.profile == userid ? false : nil)
+          @reactions.delete(emoji) if emoji.count < 1
+        else
+          # WTF? How did this happen?
+          MijDiscord::LOGGER.warn('Events') { 'MESSAGE_REACTION_REMOVE triggered on message with no reactions!' }
+        end
+      end
+    end
+
     def reply(text: '', embed: nil, tts: false)
       @channel.send_message(text: text, embed: embed, tts: tts)
     end
@@ -144,9 +176,9 @@ module MijDiscord::Data
       !@webhook_id.nil?
     end
 
-    # def my_reactions
-    #   @reactions.select(&:me)
-    # end
+    def my_reactions
+      @reactions.select(&:me)
+    end
 
     def create_reaction(reaction)
       emoji = reaction.respond_to?(:reaction) ? reaction.reaction : reaction

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

@@ -109,7 +109,7 @@ module MijDiscord::Data
     def update_emojis(data)
       @emojis = {}
       data['emojis'].each do |em|
-        emoji = MijDiscord::Data::Emoji.new(em, @bot, self)
+        emoji = MijDiscord::Data::Emoji.new(em, self)
         @emojis[emoji.id] = emoji
       end
     end
@@ -216,12 +216,20 @@ module MijDiscord::Data
       @voice_states[id&.to_id]
     end
 
-    def default_channel
+    def default_channel(can_send = false)
       text_channels.sort_by {|ch| [ch.position, ch.id] }.find do |ch|
         if (overwrite = ch.permission_overwrites[id])
-          overwrite.allow.read_messages? || !overwrite.deny.read_messages?
+          if can_send
+            overwrite.allow.send_messages? || !overwrite.deny.send_messages?
+          else
+            overwrite.allow.read_messages? || !overwrite.deny.read_messages?
+          end
         else
-          everyone_role.permissions.read_messages
+          if can_send
+            everyone_role.permissions.send_messages
+          else
+            everyone_role.permissions.read_messages
+          end
         end
       end
     end

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

@@ -131,7 +131,7 @@ module MijDiscord::Events
 
       if (emoji = data['emoji'])
         @emoji = server&.emoji(emoji['id'])
-        @emoji ||= MijDiscord::Data::Emoji.new(emoji, @bot, nil)
+        @emoji ||= MijDiscord::Data::Emoji.new(emoji, nil)
       end
     end
 

data/lib/mij-discord/version.rb

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

metadata

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