discordrb 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e85a40f2b3cc06af57ecf04357e35453c6fc48ef
-  data.tar.gz: a5b5ff40e9ae47db4875392e74f6a4ce8d91bf2e
+  metadata.gz: 86b237c8122ce65285f26a72379d063594d64468
+  data.tar.gz: 676f4b7428f7f01a670eff05c85d7a14092affab
 SHA512:
-  metadata.gz: cde28c5fa4b45858fa2646b19a677a8d59659d3abeb6b3b0a33f0808d6e9ec5ef830dc73be77fc05d6bb5392204a0d61742adc1fc7331b564ef38183ac47d96d
-  data.tar.gz: 02f17a29a2ebeec59047a799ce9a3564123dc7fdf8962d2940110738cb0285e8ee51daed9e5130ff5667f2621c588c689ec203c6e6f0fb282f6727b233ecef2a
+  metadata.gz: 0f18865d96e89381d9aad624558331915f90bfe622f9ed0e280d7c04a3702676548e0ab093b38523fb620aef0212c5415dd39e8d14428950d38ce923d706bc10
+  data.tar.gz: 54533279a8439c4dbadefe1bb2e70f6c660565f10dcb544fa6aa389e9ccaf7b0611857a5f8bd1055e771fc11b555b05ab030d11b4ad9c837752e0fd851cfce73

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 2.0.4
+
+- Added a utility method `Invite#url` ([#86](https://github.com/meew0/discordrb/issues/86)/[#101](https://github.com/meew0/discordrb/pull/101), thanks @PoVa)
+
+### Bugfixes
+
+- Fix a caching inconsistency where a server's channels and a bot's channels wouldn't be identical. This caused server channels to not update properly ([#105](https://github.com/meew0/discordrb/issues/105))
+- Setting avatars should now work again on Windows ([#96](https://github.com/meew0/discordrb/issues/96))
+- Message edit events should no longer be raised with nil authors ([#95](https://github.com/meew0/discordrb/issues/95))
+- Invites can now be created again ([#87](https://github.com/meew0/discordrb/issues/87))
+- Voice states are now preserved for chunked members, fixes an issue where a voice channel's users would ignore all voice states that occurred before the call ([#103](https://github.com/meew0/discordrb/issues/103))
+- Fixed some possible problems with heartbeats not being sent with unstable connections
+
 ## 2.0.3
 
 - All examples now fully use v2 ([#92](https://github.com/meew0/discordrb/pull/92), thanks @snapcase)

data/examples/ping.rb

@@ -4,6 +4,11 @@ require 'discordrb'
 
 bot = Discordrb::Bot.new token: 'B0T.T0KEN.here', application_id: 160123456789876543
 
+# Here we output the invite URL to the console so the bot account can be invited to the channel. This only has to be
+# done once, afterwards, you can remove this part if you want
+puts "This bot's invite URL is #{bot.invite_url}."
+puts 'Click on it to invite it to your server.'
+
 bot.message(with_text: 'Ping!') do |event|
   event.respond 'Pong!'
 end

data/lib/discordrb/bot.rb

@@ -228,8 +228,12 @@ module Discordrb
       @heartbeat_thread = Thread.new do
         Thread.current[:discordrb_name] = 'heartbeat'
         loop do
-          sleep @heartbeat_interval
-          send_heartbeat if @heartbeat_active
+          if @heartbeat_active
+            send_heartbeat
+            sleep @heartbeat_interval
+          else
+            sleep 1
+          end
         end
       end
 
@@ -1007,6 +1011,7 @@ module Discordrb
         @heartbeat_interval = data['heartbeat_interval'].to_f / 1000.0
         @heartbeat_active = true
         debug("Desired heartbeat_interval: #{@heartbeat_interval}")
+        send_heartbeat
 
         @profile = Profile.new(data['user'], self, @email, @password)
 
@@ -1089,6 +1094,11 @@ module Discordrb
         message = Message.new(data, self)
         return if message.from_bot? && !should_parse_self
 
+        unless message.author
+          LOGGER.warn("Edited a message with nil author! Content: #{message.content.inspect}, channel: #{message.channel.inspect}")
+          return
+        end
+
         event = MessageEditEvent.new(message, self)
         raise_event(event)
       when :MESSAGE_DELETE
@@ -1340,6 +1350,9 @@ module Discordrb
       }
 
       @ws.send(data.to_json)
+    rescue => e
+      LOGGER.error('Got an error while sending a heartbeat! Carrying on anyway because heartbeats are vital for the connection to stay alive')
+      LOGGER.log_exception(e)
     end
 
     def raise_event(event)

data/lib/discordrb/cache.rb

@@ -129,12 +129,13 @@ module Discordrb
 
     # Ensures a given channel object is cached and if not, cache it from the given data hash.
     # @param data [Hash] A data hash representing a channel.
+    # @param server [Server, nil] The server the channel is on, if known.
     # @return [Channel] the channel represented by the data hash.
-    def ensure_channel(data)
+    def ensure_channel(data, server = nil)
       if @channels.include?(data['id'].to_i)
         @channels[data['id'].to_i]
       else
-        @channels[data['id'].to_i] = Channel.new(data, self)
+        @channels[data['id'].to_i] = Channel.new(data, self, server)
       end
     end
 

data/lib/discordrb/data.rb

@@ -218,6 +218,14 @@ module Discordrb
     attr_reader :deaf
     alias_method :deafened?, :deaf
 
+    # @return [true, false] whether this member has muted themselves.
+    attr_reader :self_mute
+    alias_method :self_muted?, :self_mute
+
+    # @return [true, false] whether this member has deafened themselves.
+    attr_reader :self_deaf
+    alias_method :self_deafened?, :self_deaf
+
     # @return [Time] when this member joined the server.
     attr_reader :joined_at
 
@@ -480,6 +488,9 @@ module Discordrb
     #  something readable (e. g. File) or as a data URL.
     def avatar=(avatar)
       if avatar.respond_to? :read
+        # Set the file to binary mode if supported, so we don't get problems with Windows
+        avatar.binmode if avatar.respond_to?(:binmode)
+
         avatar_string = 'data:image/jpg;base64,'
         avatar_string += Base64.strict_encode64(avatar.read)
         update_profile_data(avatar: avatar_string)
@@ -631,12 +642,53 @@ module Discordrb
     end
   end
 
+  # A channel referenced by an invite. It has less data than regular channels, so it's a separate class
+  class InviteChannel
+    include IDObject
+
+    # @return [String] this channel's name.
+    attr_reader :name
+
+    # @return [String] this channel's type (text or voice)
+    attr_reader :type
+
+    # @!visibility private
+    def initialize(data, bot)
+      @bot = bot
+
+      @id = data['id'].to_i
+      @name = data['name']
+      @type = data['type']
+    end
+  end
+
+  # A server referenced to by an invite
+  class InviteServer
+    include IDObject
+
+    # @return [String] this server's name.
+    attr_reader :name
+
+    # @return [String, nil] the hash of the server's invite splash screen (for partnered servers) or nil if none is
+    #   present
+    attr_reader :splash_hash
+
+    # @!visibility private
+    def initialize(data, bot)
+      @bot = bot
+
+      @id = data['id'].to_i
+      @name = data['name']
+      @splash_hash = data['splash_hash']
+    end
+  end
+
   # A Discord invite to a channel
   class Invite
-    # @return [Channel] the channel this invite references.
+    # @return [InviteChannel] the channel this invite references.
     attr_reader :channel
 
-    # @return [Server] the server this invite references.
+    # @return [InviteServer] the server this invite references.
     attr_reader :server
 
     # @return [Integer] the amount of uses left on this invite.
@@ -668,8 +720,8 @@ module Discordrb
     def initialize(data, bot)
       @bot = bot
 
-      @channel = Channel.new(data['channel'], bot)
-      @server = Server.new(data['guild'], bot)
+      @channel = InviteChannel.new(data['channel'], bot)
+      @server = InviteServer.new(data['guild'], bot)
       @uses = data['uses']
       @inviter = data['inviter'] ? (@bot.user(data['inviter']['id'].to_i) || User.new(data['inviter'], bot)) : nil
       @temporary = data['temporary']
@@ -695,6 +747,11 @@ module Discordrb
     def inspect
       "<Invite code=#{@code} channel=#{@channel} uses=#{@uses} temporary=#{@temporary} revoked=#{@revoked} xkcd=#{@xkcd}>"
     end
+
+    # Creates an invite URL.
+    def url
+      "https://discord.gg/#{@code}"
+    end
   end
 
   # A Discord channel, including data like the topic
@@ -1461,6 +1518,17 @@ module Discordrb
       return unless members
       members.each do |element|
         member = Member.new(element, self, @bot)
+        if @members[member.id] && @members[member.id].voice_channel
+          @bot.debug("Preserving voice state of member #{member.id} while chunking")
+          old_member = @members[member.id]
+          member.update_voice_state(
+            old_member.voice_channel,
+            old_member.mute,
+            old_member.deaf,
+            old_member.self_mute,
+            old_member.self_deaf
+          )
+        end
         @members[member.id] = member
       end
     end
@@ -1485,7 +1553,7 @@ module Discordrb
 
       return unless channels
       channels.each do |element|
-        channel = Channel.new(element, @bot, self)
+        channel = @bot.ensure_channel(element, self)
         @channels << channel
         @channels_by_id[channel.id] = channel
       end

data/lib/discordrb/version.rb

@@ -3,5 +3,5 @@
 # Discordrb and all its functionality, in this case only the version.
 module Discordrb
   # The current version of discordrb.
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client