discordrb 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 444d3ff3a3d9f6ead173e204baff8943bd5e6997
-  data.tar.gz: 28672c3ca7bf371d173f7bb30f08d8e5fcdce310
+  metadata.gz: 0c3fe1d82b773f30ce3cd65fdb933734e0242356
+  data.tar.gz: 0c28cf978735af1868f3bec8a12c1ee2a12b5cac
 SHA512:
-  metadata.gz: f7fee8556f251531d2091a42b2986b5e89008f2eee4f4677fda8e758e221eb310a3735e236ce1ee88dae1923fabc1984c2a229e46bc0b8b7fca28f6904638070
-  data.tar.gz: 9ac7891121c7a7d196ad9a2ef032c642a0e21a5993f9cdbfc7db8ded7a409bcd470a7a7a8729dbcd3ed1458c9c1cd1dc9f0b5533674426f32d35b3dfe681676c
+  metadata.gz: 6f466e2de8b97084a729402eabb301442a27358c20ac362004fb8957ff93444b78a6207176104953f3cfe5d684c549e59801c8b400fbe9229d80e211d903db87
+  data.tar.gz: 667503328f7ccbd4430c0190790c5e07da68304031e7ef8b93c0f39ec51cc28c12f1762f2f8eeb89afd49140cb433becbde22df38cfb52e5642033a0bbd8cbaf

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.7.1
+* A `clear!` method was added to EventContainer that removes all events from it, so you can overwrite modules by defining them again. (It's unnecessary for CommandContainers because commands can never be duplicate.)
+
+### Bugfixes
+* The tokens will now be verified correctly when obtained from the cache. (I messed up last time)
+* Events of the same type in different containers will now be merged correctly when including both containers.
+* Got rid of the annoying `undefined method 'game' for nil:NilClass` error that sometimes occurred on startup. (It was harmless but now it's gone entirely)
+
 ## 1.7.0
 * **`bot.find` and `bot.find_user` have had their fuzzy search feature removed because it only caused problems. If you still need it, you can copy the code from the repo's history.** In addition, `find` was renamed to `find_channel` but still exists as a (deprecated) alias.
 * The in-line documentation using Yard is now complete and can be [accessed at RubyDoc](http://www.rubydoc.info/github/meew0/discordrb/master/). It's not quite polished yet and some things may be confusing, but it should be mostly usable.

data/README.md

@@ -12,6 +12,8 @@ An implementation of the [Discord](https://discordapp.com/) API using Ruby.
 * [Development](https://github.com/meew0/discordrb#development), [Contributing](https://github.com/meew0/discordrb#contributing)
 * [License](https://github.com/meew0/discordrb#license)
 
+See also: [Documentation](https://discord.gg/0SBTUU1wZTWfFQL2), [Tutorials](https://github.com/meew0/discordrb/wiki)
+
 ## Installation
 
 ### Linux

data/lib/discordrb/bot.rb

@@ -866,7 +866,8 @@ module Discordrb
         raise_event(event)
       when 'PRESENCE_UPDATE'
         now_playing = data['game']
-        played_before = user(data['user']['id'].to_i).game
+        presence_user = user(data['user']['id'].to_i)
+        played_before = presence_user.nil? ? nil : presence_user.game
         update_presence(data)
 
         event = if now_playing != played_before

data/lib/discordrb/container.rb

@@ -312,6 +312,11 @@ module Discordrb
       @event_handlers[clazz].delete(handler)
     end
 
+    # Removes all events from this event handler.
+    def clear!
+      @event_handlers.clear if @event_handlers
+    end
+
     # Adds an event handler to this container. Usually, it's more expressive to just use one of the shorthand adder
     # methods like {#message}, but if you want to create one manually you can use this.
     # @param handler [Discordrb::Events::EventHandler] The handler to add.
@@ -327,7 +332,7 @@ module Discordrb
       handlers = container.instance_variable_get '@event_handlers'
       fail "Couldn't include the container #{container} as it doesn't have any event handlers - have you tried to include a commands container into an event-only bot?" unless handlers
       @event_handlers ||= {}
-      @event_handlers.merge! handlers
+      @event_handlers.merge!(handlers) { |_, old, new| old + new }
     end
 
     alias_method :include!, :include_events

data/lib/discordrb/token_cache.rb

@@ -89,7 +89,7 @@ module Discordrb
     # Tests a token by making an API request, throws an error if not successful
     # @param token [String] A plaintext token to test
     def test_token(token)
-      Discordrb::API.validate_token(token + 'a')
+      Discordrb::API.validate_token(token)
     end
 
     # Hashes a password using PBKDF2 with a SHA256 digest

data/lib/discordrb/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - meew0