discordrb 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c3fe1d82b773f30ce3cd65fdb933734e0242356
-  data.tar.gz: 0c28cf978735af1868f3bec8a12c1ee2a12b5cac
+  metadata.gz: f91839616b4ad8e792ebfbd149f2ecfcdc50e614
+  data.tar.gz: 45afd38f057ffb4d9366eac1bf404bfca064363e
 SHA512:
-  metadata.gz: 6f466e2de8b97084a729402eabb301442a27358c20ac362004fb8957ff93444b78a6207176104953f3cfe5d684c549e59801c8b400fbe9229d80e211d903db87
-  data.tar.gz: 667503328f7ccbd4430c0190790c5e07da68304031e7ef8b93c0f39ec51cc28c12f1762f2f8eeb89afd49140cb433becbde22df38cfb52e5642033a0bbd8cbaf
+  metadata.gz: cf7c6250b3fc4bb927d76d7696d9f980559c1018e15a063306bba71d5c172dbd4c00ea01e26d85732fc2d056a1315ecaf672fc6e141d69d669b316d72c61efd6
+  data.tar.gz: 786ff878add75d25bdd5f49169f0ecd21515da2371e826dde0b5356d19bdcd293aab6bb842fb3b74109e03a72ee36f518b28fed85deca435e9b8b9bf5a3bb314

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.7.2
+* The `bot` object can now be read from all events, not just from command ones.
+* You can now set the `filter_volume` on VoiceBot, which corresponds to the old way of doing volume handling, in case the new way is too slow for you.
+
 ## 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.)
 

data/lib/discordrb/events/await.rb

@@ -3,7 +3,7 @@ require 'discordrb/await'
 
 module Discordrb::Events
   # @see Bot#await
-  class AwaitEvent
+  class AwaitEvent < Event
     # The await that was triggered.
     # @return [Await] The await
     attr_reader :await

data/lib/discordrb/events/bans.rb

@@ -2,7 +2,7 @@ require 'discordrb/events/generic'
 
 module Discordrb::Events
   # Raised when a user is banned
-  class UserBanEvent
+  class UserBanEvent < Event
     # @return [User] the user that was banned
     attr_reader :user
 

data/lib/discordrb/events/channel_create.rb

@@ -3,7 +3,7 @@ require 'discordrb/data'
 
 module Discordrb::Events
   # Raised when a channel is created
-  class ChannelCreateEvent
+  class ChannelCreateEvent < Event
     attr_reader :type, :topic, :position, :name, :is_private, :id, :server
 
     def initialize(data, bot)

data/lib/discordrb/events/channel_delete.rb

@@ -3,7 +3,7 @@ require 'discordrb/data'
 
 module Discordrb::Events
   # Raised when a channel is deleted
-  class ChannelDeleteEvent
+  class ChannelDeleteEvent < Event
     attr_reader :type, :topic, :position, :name, :is_private, :id, :server
 
     def initialize(data, bot)

data/lib/discordrb/events/channel_update.rb

@@ -3,7 +3,7 @@ require 'discordrb/data'
 
 module Discordrb::Events
   # Raised when a channel is updated (e.g. topic changes)
-  class ChannelUpdateEvent
+  class ChannelUpdateEvent < Event
     attr_reader :type, :topic, :position, :name, :is_private, :channel, :server
 
     def initialize(data, bot)

data/lib/discordrb/events/generic.rb

@@ -49,6 +49,11 @@ module Discordrb::Events
     end
   end
 
+  # Generic event class that can be extended
+  class Event
+    attr_reader :bot
+  end
+
   # Generic event handler that can be extended
   class EventHandler
     def initialize(attributes, block)

data/lib/discordrb/events/guild_role_create.rb

@@ -3,7 +3,7 @@ require 'discordrb/data'
 
 module Discordrb::Events
   # Raised when a role is created on a server
-  class GuildRoleCreateEvent
+  class GuildRoleCreateEvent < Event
     attr_reader :role, :server
 
     def initialize(data, bot)

data/lib/discordrb/events/guild_role_delete.rb

@@ -3,7 +3,7 @@ require 'discordrb/data'
 
 module Discordrb::Events
   # Raised when a role is deleted from a server
-  class GuildRoleDeleteEvent
+  class GuildRoleDeleteEvent < Event
     attr_reader :id, :server
 
     def initialize(data, bot)

data/lib/discordrb/events/guild_role_update.rb

@@ -3,7 +3,7 @@ require 'discordrb/data'
 
 module Discordrb::Events
   # Event raised when a role updates on a server
-  class GuildRoleUpdateEvent
+  class GuildRoleUpdateEvent < Event
     attr_reader :role, :server
 
     def initialize(data, bot)

data/lib/discordrb/events/guilds.rb

@@ -3,7 +3,7 @@ require 'discordrb/data'
 
 module Discordrb::Events
   # Generic subclass for server events (create/update/delete)
-  class GuildEvent
+  class GuildEvent < Event
     attr_reader :server
 
     def initialize(data, bot)

data/lib/discordrb/events/lifetime.rb

@@ -2,13 +2,13 @@ require 'discordrb/events/generic'
 
 module Discordrb::Events
   # @see Discordrb::EventContainer#ready
-  class ReadyEvent; end
+  class ReadyEvent < Event; end
 
   # Event handler for {ReadyEvent}
   class ReadyEventHandler < TrueEventHandler; end
 
   # @see Discordrb::EventContainer#disconnected
-  class DisconnectEvent; end
+  class DisconnectEvent < Event; end
 
   # Event handler for {DisconnectEvent}
   class DisconnectEventHandler < TrueEventHandler; end

data/lib/discordrb/events/members.rb

@@ -3,7 +3,7 @@ require 'discordrb/data'
 
 module Discordrb::Events
   # Generic subclass for server member events (add/update/delete)
-  class GuildMemberEvent
+  class GuildMemberEvent < Event
     attr_reader :user, :roles, :server
 
     def initialize(data, bot)

data/lib/discordrb/events/message.rb

@@ -2,7 +2,7 @@ require 'discordrb/events/generic'
 
 module Discordrb::Events
   # Event raised when a text message is sent to a channel
-  class MessageEvent
+  class MessageEvent < Event
     attr_reader :message, :saved_message
 
     delegate :author, :channel, :content, :timestamp, to: :message
@@ -123,7 +123,7 @@ module Discordrb::Events
   class PrivateMessageEventHandler < MessageEventHandler; end
 
   # A subset of MessageEvent that only contains a message ID and a channel
-  class MessageIDEvent
+  class MessageIDEvent < Event
     # @return [Integer] the ID associated with this event
     attr_reader :id
 

data/lib/discordrb/events/presence.rb

@@ -3,7 +3,7 @@ require 'discordrb/data'
 
 module Discordrb::Events
   # Event raised when a user's presence state updates (idle or online)
-  class PresenceEvent
+  class PresenceEvent < Event
     attr_reader :server, :user, :status
 
     def initialize(data, bot)
@@ -41,7 +41,7 @@ module Discordrb::Events
   end
 
   # Event raised when a user starts or stops playing a game
-  class PlayingEvent
+  class PlayingEvent < Event
     attr_reader :server, :user, :game
 
     def initialize(data, bot)

data/lib/discordrb/events/typing.rb

@@ -2,7 +2,7 @@ require 'discordrb/events/generic'
 
 module Discordrb::Events
   # Event raised when a user starts typing
-  class TypingEvent
+  class TypingEvent < Event
     attr_reader :channel, :user, :timestamp
 
     def initialize(data, bot)

data/lib/discordrb/events/voice_state_update.rb

@@ -3,7 +3,7 @@ require 'discordrb/data'
 
 module Discordrb::Events
   # Event raised when a user's voice state updates
-  class VoiceStateUpdateEvent
+  class VoiceStateUpdateEvent < Event
     attr_reader :user, :token, :suppress, :session_id, :self_mute, :self_deaf, :mute, :deaf, :server, :channel
 
     def initialize(data, bot)

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.1'.freeze
+  VERSION = '1.7.2'.freeze
 end

data/lib/discordrb/voice/encoder.rb

@@ -16,11 +16,16 @@ module Discordrb::Voice
     # @return [true, false] whether avconv should be used instead of ffmpeg.
     attr_accessor :use_avconv
 
+    # @see VoiceBot#filter_volume=
+    # @return [Integer] the volume used as a filter to ffmpeg/avconv.
+    attr_accessor :filter_volume
+
     # Create a new encoder
     def initialize
       @sample_rate = 48_000
       @frame_size = 960
       @channels = 2
+      @filter_volume = 1
 
       if OPUS_AVAILABLE
         @opus = Opus::Encoder.new(@sample_rate, @frame_size, @channels)
@@ -73,7 +78,7 @@ module Discordrb::Voice
     # @param file [String] The path or URL to encode.
     # @return [IO] the audio, encoded as s16le PCM
     def encode_file(file)
-      command = "#{ffmpeg_command} -loglevel 0 -i \"#{file}\" -f s16le -ar 48000 -ac 2 pipe:1"
+      command = "#{ffmpeg_command} -loglevel 0 -i \"#{file}\" -f s16le -ar 48000 -ac 2 #{filter_volume_argument} pipe:1"
       IO.popen(command)
     end
 
@@ -83,7 +88,7 @@ module Discordrb::Voice
     # @return [IO] the audio, encoded as s16le PCM
     def encode_io(io)
       ret_io, writer = IO.pipe
-      command = "#{ffmpeg_command} -loglevel 0 -i - -f s16le -ar 48000 -ac 2 pipe:1"
+      command = "#{ffmpeg_command} -loglevel 0 -i - -f s16le -ar 48000 -ac 2 #{filter_volume_argument} pipe:1"
       spawn(command, in: io, out: writer)
       ret_io
     end
@@ -93,5 +98,10 @@ module Discordrb::Voice
     def ffmpeg_command
       @use_avconv ? 'avconv' : 'ffmpeg'
     end
+
+    def filter_volume_argument
+      return '' if @filter_volume == 1
+      @use_avconv ? "-vol #{(@filter_volume * 256).ceil}" : "-af volume=#{@filter_volume}"
+    end
   end
 end

data/lib/discordrb/voice/voice_bot.rb

@@ -92,6 +92,19 @@ module Discordrb::Voice
       @udp.encrypted?
     end
 
+    # Set the filter volume. This volume is applied as a filter for decoded audio data. It has the advantage that using
+    # it is much faster than regular volume, but it can only be changed before starting to play something.
+    # @param value [Integer] The value to set the volume to. For possible values, see {#volume}
+    def filter_volume=(value)
+      @encoder.filter_volume = value
+    end
+
+    # @see #filter_volume=
+    # @return [Integer] the volume used as a filter for ffmpeg/avconv.
+    def filter_volume
+      @encoder.filter_volume
+    end
+
     # Pause playback. This is not instant; it may take up to 20 ms for this change to take effect. (This is usually
     # negligible.)
     def pause

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket