discordrb 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c24aa0e70b78435b64e446ed2994c17bc640657
-  data.tar.gz: 345f9fd977ea9745702bc63db5060f2ee9967584
+  metadata.gz: 0e493737a94960682725acf9687de8219edac74a
+  data.tar.gz: ea16d4b131834bbc0a6c040e6632a0296d5c1b26
 SHA512:
-  metadata.gz: fa3b3a0572b2888a1501fad97229035f10b3eae029e942b58d28a5e769be1806852a0f7fc964666bd2673bb91a4a29babbe28dae87e898effe1d83596d51c192
-  data.tar.gz: 1e8f66d0595dd6064dd0ac211d14fdb835746efed28ace5ee923ec8ca076f010e23ea9bbaf0a0bd1d2d92d2871169fb88d6b4452f256151d0722afb8ffbed9b2
+  metadata.gz: 369259ee5a1536ab978068f4d726d1c2257ab16f1174ec4939e9b67e3268263e8bf20e1ed804745851d0e52cb5bed69e40c42d9e13282334b8006b19d2388b74
+  data.tar.gz: 8e8c09b5f222675d62f8b2126cf1e97168d0c1b0dc0bf384f4162ddd1f90d79c33d54ac13c26498436488b831872def2f2b3aa554bc9aa950a3c1ea450da1d20

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.5.4
+* The `opus-ruby` and `levenshtein` dependencies are now optional - if you don't need them, it won't crash immediately (only when you try to use voice / `find` with a threshold > 0, respectively)
+
+### Bugfixes
+* Voice volume can now be properly set when using avconv (#37, thanks @purintai)
+* `websocket-client-simple`, which is required for voice, is now specified in the dependencies.
+
 ## 1.5.3
 * Voice bot length adjustments are now configurable using `bot.voice.adjust_interval` and `bot.voice.adjust_offset` (make sure the latter is less than the first, or no adjustment will be performed at all)
 * Length adjustments can now be made more smooth using `bot.voice.adjust_average` (true allows for more smooth adjustments, *may* improve stutteriness but might make it worse as well)

data/discordrb.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rest-client'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'opus-ruby'
+  spec.add_dependency 'websocket-client-simple'
 
   spec.required_ruby_version = '>= 2.1.0'
 

data/lib/discordrb/bot.rb

@@ -264,20 +264,30 @@ module Discordrb
     #   the threshold is, the more misspellings will be allowed.
     # @return [Array<Channel>] The array of channels that were found. May be empty if none were found.
     def find(channel_name, server_name = nil, threshold = 0)
-      require 'levenshtein'
+      begin
+        require 'levenshtein' if threshold > 0
+        levenshtein_available = true
+      rescue LoadError; levenshtein_available = false; end
 
       results = []
       @servers.values.each do |server|
         server.channels.each do |channel|
-          distance = Levenshtein.distance(channel.name, channel_name)
-          distance += Levenshtein.distance(server_name || server.name, server.name)
-          next if distance > threshold
+          if threshold > 0
+            fail LoadError, 'Levenshtein distance unavailable! Either set threshold to 0 or install the `levenshtein-ffi` gem' unless levenshtein_available
+            distance = Levenshtein.distance(channel.name, channel_name)
+            distance += Levenshtein.distance(server_name || server.name, server.name)
+            next if distance > threshold
+          else
+            distance = 0
+            next if channel.name != channel_name || (server_name || server.name) != server.name
+          end
 
           # Make a singleton accessor "distance"
           channel.instance_variable_set(:@distance, distance)
           class << channel
             attr_reader :distance
           end
+
           results << channel
         end
       end
@@ -291,12 +301,21 @@ module Discordrb
     #   the threshold is, the more misspellings will be allowed.
     # @return [Array<User>] The array of users that were found. May be empty if none were found.
     def find_user(username, threshold = 0)
-      require 'levenshtein'
+      begin
+        require 'levenshtein' if threshold > 0
+        levenshtein_available = true
+      rescue LoadError; levenshtein_available = false; end
 
       results = []
       @users.values.each do |user|
-        distance = Levenshtein.distance(user.username, username)
-        next if distance > threshold
+        if threshold > 0
+          fail LoadError, 'Levenshtein distance unavailable! Either set threshold to 0 or install the `levenshtein-ffi` gem' unless levenshtein_available
+          distance = Levenshtein.distance(user.username, username)
+          next if distance > threshold
+        else
+          distance = 0
+          next if user.username != username
+        end
 
         # Make a singleton accessor "distance"
         user.instance_variable_set(:@distance, distance)

data/lib/discordrb/data.rb

@@ -19,10 +19,6 @@ module Discordrb
     attr_reader :username, :id, :discriminator, :avatar, :voice_channel, :roles
     attr_accessor :status, :game, :server_mute, :server_deaf, :self_mute, :self_deaf
 
-    # @roles is a hash of user roles:
-    # Key: Server ID
-    # Value: Array of roles.
-
     alias_method :name, :username
 
     def initialize(data, bot)

data/lib/discordrb/version.rb

@@ -1,4 +1,4 @@
 # Discordrb and all its functionality, in this case only the version.
 module Discordrb
-  VERSION = '1.5.3'
+  VERSION = '1.5.4'
 end

data/lib/discordrb/voice/encoder.rb

@@ -1,4 +1,9 @@
-require 'opus-ruby'
+begin
+  require 'opus-ruby'
+  OPUS_AVAILABLE = true
+rescue LoadError
+  OPUS_AVAILABLE = false
+end
 
 # Discord voice chat support
 module Discordrb::Voice
@@ -11,7 +16,12 @@ module Discordrb::Voice
       @frame_size = 960
       @channels = 2
       @volume = 1.0
-      @opus = Opus::Encoder.new(@sample_rate, @frame_size, @channels)
+
+      if OPUS_AVAILABLE
+        @opus = Opus::Encoder.new(@sample_rate, @frame_size, @channels)
+      else
+        fail LoadError, 'Opus unavailable - voice not supported! Please install opus for voice support to work.'
+      end
     end
 
     def encode(buffer)
@@ -23,13 +33,13 @@ module Discordrb::Voice
     end
 
     def encode_file(file)
-      command = "#{ffmpeg_command} -loglevel 0 -i \"#{file}\" -f s16le -ar 48000 -ac 2 -af volume=#{@volume} pipe:1"
+      command = "#{ffmpeg_command} -loglevel 0 -i \"#{file}\" -f s16le -ar 48000 -ac 2 #{ffmpeg_volume} pipe:1"
       IO.popen(command)
     end
 
     def encode_io(io)
       ret_io, writer = IO.pipe
-      command = "#{ffmpeg_command} -loglevel 0 -i - -f s16le -ar 48000 -ac 2 -af volume=#{@volume} pipe:1"
+      command = "#{ffmpeg_command} -loglevel 0 -i - -f s16le -ar 48000 -ac 2 #{ffmpeg_volume} pipe:1"
       spawn(command, in: io, out: writer)
       ret_io
     end
@@ -39,5 +49,9 @@ module Discordrb::Voice
     def ffmpeg_command
       @use_avconv ? 'avconv' : 'ffmpeg'
     end
+
+    def ffmpeg_volume
+      @use_avconv ? "-vol #{(@volume * 256).ceil}" : "-af volume=#{@volume}"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: websocket-client-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement