discordrb 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fcd66819ff42b5adefb4ae22114f8cbbdf34cb5
-  data.tar.gz: 250ae03f67f90638b5280049f5fbbfdca800b742
+  metadata.gz: 8edaf61a0d0837db5dd14c5c276d222586752ebe
+  data.tar.gz: ffe050f90456b21d9ca960e540c2206b60cf8bd1
 SHA512:
-  metadata.gz: a2ea0ef9e288ecb2d4809a217de9fcfc1ba0fab772ca9b215b8bc8810f5cf85103552257f27289deb974904cfd2534e3a599830f589d2465e02b7374985cc287
-  data.tar.gz: 1fc4b0eeca3006817d6d5abd08cbcd22eba4e93f3fca1f6abb53b15bc5eec6865d79d5ef1042a2456c306ccbf7a9330b013892c0f827a89d463f0d33a0c97911
+  metadata.gz: 3ff12cfbf0756c5f2d41c807cda2c0c6b27e8835a00b109af02a4bb7f2daf70be5f89774e7bdebf53f1c602749181ae2c1ff6efedf6cb4462d553ad2ab9436dc
+  data.tar.gz: ad825713c559a666b95c352ae0d3ce23ee77aeacf83b22d100d3d51238a631994e69535f544026102c5aebc9774939dd6ccec709b0a3795595be22125ffbc3fe

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.5.2
+* `bot.voice_connect` can now use a channel ID directly.
+* A reader `bot.volume` now exists for the corresponding writer.
+* The attribute `bot.encoder.use_avconv` was added that makes the bot use avconv instead of ffmpeg (for those on Ubuntu 14.x)
+* The PBKDF2 iteration count for token caching was increased to 300,000 for extra security.
+
+### Bugfixes
+* Fix a bug where `play_file` wouldn't properly accept string file paths (#36, thanks @purintai)
+* Fix a concurrency issue where `VoiceBot` would try to read from nil
+
+
 ## 1.5.1
 * The connection to voice was made more reliable. I haven't experienced any issues with it myself but I got reports where `recv` worked better than `recvmsg`.
 

data/lib/discordrb/bot.rb

@@ -200,14 +200,15 @@ module Discordrb
 
     attr_reader :voice
 
-    def voice_connect(channel)
+    def voice_connect(chan)
       if @voice
         debug('Voice bot exists already! Destroying it')
         @voice.destroy
         @voice = nil
       end
 
-      @voice_channel = channel
+      chan = channel(chan) if chan.is_a? Integer
+      @voice_channel = chan
       debug("Got voice channel: #{@voice_channel}")
 
       data = {

data/lib/discordrb/token_cache.rb

@@ -41,7 +41,7 @@ module Discordrb
     end
 
     def obtain_key(password)
-      @key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(password, @encrypt_salt, 20_000, KEYLEN)
+      @key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(password, @encrypt_salt, 300_000, KEYLEN)
     end
 
     def generate_salts
@@ -76,7 +76,7 @@ module Discordrb
 
     def hash_password(password)
       digest = OpenSSL::Digest::SHA256.new
-      OpenSSL::PKCS5.pbkdf2_hmac(password, @verify_salt, 20_000, digest.digest_length, digest)
+      OpenSSL::PKCS5.pbkdf2_hmac(password, @verify_salt, 300_000, digest.digest_length, digest)
     end
   end
 

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

data/lib/discordrb/voice/encoder.rb

@@ -4,7 +4,7 @@ require 'opus-ruby'
 module Discordrb::Voice
   # Wrapper class around opus-ruby
   class Encoder
-    attr_accessor :volume
+    attr_accessor :volume, :use_avconv
 
     def initialize
       @sample_rate = 48_000
@@ -23,15 +23,21 @@ module Discordrb::Voice
     end
 
     def encode_file(file)
-      command = "ffmpeg -loglevel 0 -i #{file.path} -f s16le -ar 48000 -ac 2 -af volume=#{@volume} pipe:1"
+      command = "#{ffmpeg_command} -loglevel 0 -i \"#{file}\" -f s16le -ar 48000 -ac 2 -af volume=#{@volume} pipe:1"
       IO.popen(command)
     end
 
     def encode_io(io)
       ret_io, writer = IO.pipe
-      command = "ffmpeg -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 -af volume=#{@volume} pipe:1"
       spawn(command, in: io, out: writer)
       ret_io
     end
+
+    private
+
+    def ffmpeg_command
+      @use_avconv ? 'avconv' : 'ffmpeg'
+    end
   end
 end

data/lib/discordrb/voice/voice_bot.rb

@@ -11,7 +11,7 @@ module Discordrb::Voice
 
   # A voice connection consisting of a UDP socket and a websocket client
   class VoiceBot
-    attr_reader :stream_time
+    attr_reader :stream_time, :encoder
 
     def initialize(channel, bot, token, session, endpoint)
       @bot = bot
@@ -29,6 +29,10 @@ module Discordrb::Voice
       @encoder.volume = value
     end
 
+    def volume
+      @encoder.volume
+    end
+
     # Pause playback
     def pause
       @paused = true
@@ -88,6 +92,7 @@ module Discordrb::Voice
       self.speaking = true
       loop do
         break unless @playing
+        break unless @io
 
         if count % 100 == 10
           # Starting from the tenth packet, perform length adjustment every 100 packets (2 seconds)
@@ -97,7 +102,7 @@ module Discordrb::Voice
         # Read some data from the buffer
         buf = nil
         begin
-          buf = @io.readpartial(DATA_LENGTH)
+          buf = @io.readpartial(DATA_LENGTH) if @io
         rescue EOFError
           @bot.debug('EOF while reading, breaking immediately')
           break

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket