discordrb 3.2.0.1 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d481e5416bf7291ce7caf55bb4dd569bed5d3c24
-  data.tar.gz: e7b1c76a69dbf8f45ef0f5c5c3ff644064c2c7e7
+  metadata.gz: 4939129e8cf010565fc013b55fe508b4deca321d
+  data.tar.gz: dbd591ca56690a5f84bb9c16e16decc80a2bb04e
 SHA512:
-  metadata.gz: 76539fe4f6a7111c82082c36f00b3db680df5b9b177db85a90f3f08603a7c118a2731008d6167512c9ae8639a50d284c708c814f2955b1ddb23021a7a7f6fa8c
-  data.tar.gz: 85c3eb941d435a1f2b4d10b991659e35c90924d7b7f120bd5c10e792b93e072e76d63c05adaa629b4a09437a53aba458fe7aab68aa14f96326481b9f555204f6
+  metadata.gz: 30a433b6b450baee30a4f49521c88c5cd2888cccbda0a1a1c5bece024e8520cda5f430fc0802c16e1f146e3550e1e00a715b796c569f9d080f19f5bad35c73c4
+  data.tar.gz: 67f13b1e9a5bf1037f531778c9a7c9051f27fafd608e1c02abf3c19c5d1c1390b647cd669851d29c4407cd30ac858de552ab318bd24962c7d9b6374e8e6a2187

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 3.2.1
+
+- `Bot#stop` and `Gateway#stop` now explicitly return `nil`, for more convenient use in commands
+- The API method to query for users has been removed as the endpoint no longer exists
+- Some more methods have been changed to resolve IDs, which means they can be called with integer and string IDs instead of just the objects ([#313](https://github.com/meew0/discordrb/pull/313), thanks @LikeLakers2)
+- Bulk deleting now uses the new non-deprecated URL – this has no immediate effect, but once the old one will be removed bots using it will not be able to bulk delete anymore (see also [#309](https://github.com/meew0/discordrb/issues/309))
+### Bugfixes
+
+- Fixed another bug with resumes that caused issues when resuming a zombie connection 
+- Fixed a bug that caused issues when playing short files ([#326](https://github.com/meew0/discordrb/issues/316))
+
 ## 3.2.0.1
 
 - Attempt to fix an issue that causes a strange problem with dependencies when installing discordrb

data/README.md

@@ -29,7 +29,7 @@ See also: [Documentation](http://www.rubydoc.info/gems/discordrb), [Tutorials](h
 
 This section only applies to you if you want to use voice functionality.
 * [libsodium](https://github.com/meew0/discordrb/wiki/Installing-libsodium)
-* A compiled libopus distribution for your system, anywhere the script can find it (on Windows, make sure it's named `opus.dll`)
+* A compiled libopus distribution for your system, anywhere the script can find it. See [here](https://github.com/meew0/discordrb/wiki/Installing-libopus) for installation instructions.
 * [FFmpeg](https://www.ffmpeg.org/download.html) installed and in your PATH
 
 In addition to this, if you're on Windows and want to use voice functionality, your installed Ruby version **needs to be 32 bit**, as otherwise Opus won't work.

data/lib/discordrb/api/channel.rb

@@ -128,7 +128,7 @@ module Discordrb::API::Channel
       :channels_cid_messages_bulk_delete,
       channel_id,
       :post,
-      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/bulk_delete",
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/bulk-delete",
       { messages: messages }.to_json,
       Authorization: token,
       content_type: :json

data/lib/discordrb/api/user.rb

@@ -2,18 +2,6 @@
 module Discordrb::API::User
   module_function
 
-  # Returns users based on a query
-  # https://discordapp.com/developers/docs/resources/user#query-users
-  def query(token, query, limit = nil)
-    Discordrb::API.request(
-      :users,
-      nil,
-      :get,
-      "#{Discordrb::API.api_base}/users?q=#{query}#{"&limit=#{limit}" if limit}",
-      Authorization: token
-    )
-  end
-
   # Get user data
   # https://discordapp.com/developers/docs/resources/user#get-user
   def resolve(token, user_id)

data/lib/discordrb/data.rb

@@ -2513,10 +2513,10 @@ module Discordrb
     end
 
     # Forcibly moves a user into a different voice channel. Only works if the bot has the permission needed.
-    # @param user [User] The user to move.
-    # @param channel [Channel] The voice channel to move into.
+    # @param user [User, #resolve_id] The user to move.
+    # @param channel [Channel, #resolve_id] The voice channel to move into.
     def move(user, channel)
-      API::Server.update_member(@bot.token, @id, user.id, channel_id: channel.id)
+      API::Server.update_member(@bot.token, @id, user.resolve_id, channel_id: channel.resolve_id)
     end
 
     # Deletes this server. Be aware that this is permanent and impossible to undo, so be careful!
@@ -2530,9 +2530,9 @@ module Discordrb
     end
 
     # Transfers server ownership to another user.
-    # @param user [User] The user who should become the new owner.
+    # @param user [User, #resolve_id] The user who should become the new owner.
     def owner=(user)
-      API::Server.transfer_ownership(@bot.token, @id, user.id)
+      API::Server.transfer_ownership(@bot.token, @id, user.resolve_id)
     end
 
     # Sets the server's name.

data/lib/discordrb/gateway.rb

@@ -184,6 +184,9 @@ module Discordrb
     def stop(no_sync = false)
       @should_reconnect = false
       close(no_sync)
+
+      # Return nil so command bots don't send a message
+      nil
     end
 
     # Kills the websocket thread, stopping all connections to Discord.
@@ -395,9 +398,6 @@ module Discordrb
       # Make sure to reset ACK handling, so we don't keep reconnecting
       @last_heartbeat_acked = true
 
-      # If we suspended the session before because of a reconnection, we need to resume it now
-      @session.resume if @session && @session.suspended?
-
       # We don't want to have redundant heartbeat threads, so if one already exists, don't start a new one
       return if @heartbeat_thread
 
@@ -686,8 +686,13 @@ module Discordrb
       setup_heartbeats(interval)
 
       LOGGER.debug("Trace: #{packet['d']['_trace']}")
+      LOGGER.debug("Session: #{@session.inspect}")
 
       if @session && @session.should_resume?
+        # Make sure we're sending heartbeats again
+        @session.resume
+
+        # Send the actual resume packet to get the missing events
         resume
       else
         identify

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 = '3.2.0.1'.freeze
+  VERSION = '3.2.1'.freeze
 end

data/lib/discordrb/voice/voice_bot.rb

@@ -193,13 +193,13 @@ module Discordrb::Voice
           raise IOError, 'File or stream not found!' if @first_packet
 
           @bot.debug('EOF while reading, breaking immediately')
-          break
+          next :stop
         end
 
         # Check whether the buffer has enough data
         if !buf || buf.length != DATA_LENGTH
           @bot.debug("No data is available! Retrying #{@retry_attempts} more times")
-          break if @retry_attempts.zero?
+          next :stop if @retry_attempts.zero?
 
           @retry_attempts -= 1
           next
@@ -272,7 +272,7 @@ module Discordrb::Voice
 
           unless header_str
             @bot.debug 'Finished DCA parsing (header is nil)'
-            break
+            next :stop
           end
 
           header = header_str.unpack('s<')[0]
@@ -280,7 +280,7 @@ module Discordrb::Voice
           raise 'Negative header in DCA file! Your file is likely corrupted.' if header < 0
         rescue EOFError
           @bot.debug 'Finished DCA parsing (EOFError)'
-          break
+          next :stop
         end
 
         # Read bytes
@@ -323,6 +323,11 @@ module Discordrb::Voice
 
         # Get packet data
         buf = yield
+
+        # Stop doing anything if the stop signal was sent
+        break if buf == :stop
+
+        # Proceed to the next packet if we got nil
         next unless buf
 
         # Track intermediate adjustment so we can measure how much encoding contributes to the total time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 3.2.0.1
+  version: 3.2.1
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client