discordrb 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62c28a349c8f96a8a2774df678a355ea648ffada
-  data.tar.gz: fa5f7258abac813c417549a9a9a56aaa76c42de0
+  metadata.gz: 572e630200bd7bf1c7d6909b544cf8f69fc1b86e
+  data.tar.gz: fb27acb8b8261dad408b43255eb2a4d526eab7ed
 SHA512:
-  metadata.gz: 8ccbce3f46ad696ed1e285c7fc6625eb06c7855d21afe41768093e82d126557b68b8acc27b530ff6864745077d27879d95c7119b043de9d117a4cce41e0a2c89
-  data.tar.gz: a308092e8dba4c4d7e491b921576c39ea5b40a2c362fe2df8a98c946f8f8cd0bb6e7a3c6f68e2189c8734041282c654d8353b0989dbedffad8a828b25d336882
+  metadata.gz: 44451c1101cf93c8eabfc3017cca46ca9c236a3dd3be88d6203f1463756558701f5edb94854be88fca2e6d9870ad9a6a09ee41962520fdd4a39636921fbe53df
+  data.tar.gz: c7e73b58ef30d7f783541d0a3799f759db38f2bdef8409cc82ed889afd44bcda77f93acaf567bb6dfb0d453202ea2cd7186f6066af29afbd89a4b182ace266c3

data/CHANGELOG.md

@@ -1,12 +1,27 @@
 # Changelog
 
+## 2.0.2
+
+- Added `Server#text_channels` and `#voice_channels` ([#79](https://github.com/meew0/discordrb/issues/79))
+- Added `Server#online_users` ([#80](https://github.com/meew0/discordrb/issues/80))
+- Added `Member#role?` ([#83](https://github.com/meew0/discordrb/issues/83))
+- Added three utility methods `User#online?`, `#offline?`, and `#idle?`
+- `Bot#send_message` can now take channel objects as well as the ID
+
+### Bugfixes
+
+- Removing the bot from a server will no longer result in a gateway message error
+- Fixed an exception raised if a previously unavailable guild goes online after the stream timeout
+- `server_create` will no longer be raised for newly available guilds
+- Fixed the annoying message about constant reassignment at startup
+- Fixed an error where rarely a server's owner wouldn't be initialized correctly
+
 ## 2.0.1
 
 - Added some more examples ([#75](https://github.com/meew0/discordrb/pull/75), thanks @greenbigfrog)
 - Users can now be ignored from messages at gateway level (`Bot#ignore_user`, `Bot#unignore_user`)
 - `Member#add_role` and `Member#remove_role` were re-added from User - they were missing before
 
-
 ### Bugfixes
 
 - Fixed some typos in the documentation

data/lib/discordrb/bot.rb

@@ -390,6 +390,7 @@ module Discordrb
     # @param tts [true, false] Whether or not this message should be sent using Discord text-to-speech.
     # @return [Message] The message that was sent.
     def send_message(channel_id, content, tts = false)
+      channel_id = channel_id.resolve_id
       debug("Sending message to #{channel_id} with content '#{content}'")
 
       response = API.send_message(token, channel_id, content, [], tts)
@@ -739,11 +740,6 @@ module Discordrb
     # Internal handler for GUILD_DELETE
     def delete_guild(data)
       id = data['id'].to_i
-
-      @users.each do |_, user|
-        user.delete_roles(id)
-      end
-
       @servers.delete(id)
     end
 
@@ -1190,9 +1186,12 @@ module Discordrb
 
         # Check for false specifically (no data means the server has never been unavailable)
         if data['unavailable'].is_a? FalseClass
-          @unavailable_servers -= 1
+          @unavailable_servers -= 1 if @unavailable_servers
 
           notify_ready if @unavailable_servers == 0
+
+          # Return here so the event doesn't get triggered
+          return
         end
 
         event = ServerCreateEvent.new(data, self)

data/lib/discordrb/data.rb

@@ -196,6 +196,12 @@ module Discordrb
       @bot.profile.id == @id
     end
 
+    [:offline, :idle, :online].each do |e|
+      define_method(e.to_s + '?') do
+        @status.to_sym == e
+      end
+    end
+
     # The inspect method is overwritten to give more useful output
     def inspect
       "<User username=#{@username} id=#{@id} discriminator=#{@discriminator}>"
@@ -338,6 +344,13 @@ module Discordrb
       @server.owner == self
     end
 
+    # @param role [Role, Integer, #resolve_id] the role to check or its ID.
+    # @return [true, false] whether this member has the specified role.
+    def role?(role)
+      role = role.resolve_id
+      @roles.any? { |e| e.id == role }
+    end
+
     # Adds one or more roles to this member.
     # @param role [Role, Array<Role>] The role(s) to add.
     def add_role(role)
@@ -1147,7 +1160,7 @@ module Discordrb
     attr_reader :afk_channel
 
     # @!visibility private
-    def initialize(data, bot)
+    def initialize(data, bot, exists = true)
       @bot = bot
       @owner_id = data['owner_id'].to_i
       @id = data['id'].to_i
@@ -1167,7 +1180,8 @@ module Discordrb
       @chunked = false
       @processed_chunk_members = 0
 
-      @owner = member(@owner_id)
+      # Only get the owner of the server actually exists (i. e. not for ServerDeleteEvent)
+      @owner = member(@owner_id) if exists
     end
 
     # @return [Channel] The default channel on this server (usually called #general)
@@ -1189,7 +1203,7 @@ module Discordrb
       id = id.resolve_id
       return @members[id] if member_cached?(id)
 
-      member = bot.member(@id, id)
+      member = @bot.member(@id, id)
       @members[id] = member
     end
 
@@ -1205,6 +1219,27 @@ module Discordrb
 
     alias_method :users, :members
 
+    # @param include_idle [true, false] Whether to count idle members as online.
+    # @param include_bots [true, false] Whether to include bot accounts in the count.
+    # @return [Array<Member>] an array of online members on this server.
+    def online_members(include_idle: false, include_bots: true)
+      @members.values.select do |e|
+        ((include_idle ? e.idle? : false) || e.online?) && (include_bots ? true : !e.bot_account?)
+      end
+    end
+
+    alias_method :online_users, :online_members
+
+    # @return [Array<Channel>] an array of text channels on this server
+    def text_channels
+      @channels.select(&:text?)
+    end
+
+    # @return [Array<Channel>] an array of voice channels on this server
+    def voice_channels
+      @channels.select(&:voice?)
+    end
+
     # Adds a role to the role cache
     # @note For internal use only
     # @!visibility private

data/lib/discordrb/events/guilds.rb

@@ -61,7 +61,7 @@ module Discordrb::Events
   class ServerDeleteEvent < ServerEvent
     # Overide init_server to account for the deleted server
     def init_server(data, bot)
-      @server = Discordrb::Server.new(data, bot)
+      @server = Discordrb::Server.new(data, bot, false)
     end
   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.1'.freeze
+  VERSION = '2.0.2'.freeze
 end

data/lib/discordrb/voice/network.rb

@@ -8,14 +8,16 @@ require 'json'
 require 'discordrb/websocket'
 
 begin
-  RBNACL_AVAILABLE = false
-  unless ENV.key?('DISCORDRB_NONACL')
-    require 'rbnacl'
-    RBNACL_AVAILABLE = true
-  end
+  RBNACL_AVAILABLE = if ENV['DISCORDRB_NONACL']
+                       false
+                     else
+                       require 'rbnacl'
+                       true
+                     end
 rescue LoadError
   puts "libsodium not available! You can continue to use discordrb as normal but voice support won't work.
         Read https://github.com/meew0/discordrb/wiki/Installing-libsodium for more details."
+  RBNACL_AVAILABLE = false
 end
 
 module Discordrb::Voice

metadata

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