From 1a669e7834e227f28e8b51aadec2ac6941bd55f2 Mon Sep 17 00:00:00 2001
From: Graham <marrub.xz@gmail.com>
Date: Mon, 25 Jun 2018 13:00:51 -0400
Subject: [PATCH] Fix various Discord-related things.

---
 source/modules/mod_audio.rb   | 18 ++++++++++--------
 source/modules/mod_discord.rb |  1 -
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/source/modules/mod_audio.rb b/source/modules/mod_audio.rb
index 8a8845d..3a815ef 100644
--- a/source/modules/mod_audio.rb
+++ b/source/modules/mod_audio.rb
@@ -7,7 +7,7 @@ require 'streamio-ffmpeg'
 # @!visibility private
 class QueueItem
    attr_accessor :next, :prev
-   attr_reader :time, :ptime, :size, :fname, :descr, :is_stream
+   attr_reader :time, :ptime, :size, :fname, :url, :descr, :is_stream
 
    def initialize uri, stream = false
       @is_stream = stream
@@ -19,7 +19,7 @@ class QueueItem
          @fname = uri.to_s
       end
 
-      @descr = uri.to_s
+      @url = uri.to_s
 
       unless @is_stream
          if (mov = FFMPEG::Movie.new(@fname)) and mov.valid?
@@ -29,6 +29,8 @@ class QueueItem
          else
             throw ArgumentError, "File is invalid or is a stream."
          end
+      else
+         @descr = @url
       end
    end
 
@@ -71,12 +73,12 @@ class Mod_Audio < Vrobot4::Module::Module
       super
       register :c_join,   "voicejoin", "Brings the bot to your voice channel."
       register :c_quit,   "voicequit", "Kicks the bot from voice.", roles: "h"
-      register :c_queue,  "queue",  "Adds an item to the queue or lists it."
-      register :c_volume, "volume", "Sets the bot's volume."
-      register :c_skip,   "skip",   "Skips to the next song."
-      register :c_pause,  "pause",  "Pauses the current song."
-      register :c_play,   "play",   "Resumes the current song."
-      register :c_rmqueue, "rmqueue", "Removes an item from the queue."
+      register :c_queue,  "queue",     "Adds an item to the queue or lists it."
+      register :c_volume, "volume",    "Sets the bot's volume."
+      register :c_skip,   "skip",      "Skips to the next song."
+      register :c_pause,  "pause",     "Pauses the current song."
+      register :c_play,   "play",      "Resumes the current song."
+      register :c_rmqueue, "rmqueue",  "Removes an item from the queue."
       # TODO: add stream playing command
       @queue     = []
       @queue_mtx = Mutex.new
diff --git a/source/modules/mod_discord.rb b/source/modules/mod_discord.rb
index df24349..d9e62a7 100644
--- a/source/modules/mod_discord.rb
+++ b/source/modules/mod_discord.rb
@@ -15,7 +15,6 @@ class Mod_Discord < Vrobot4::Module::Module
    end
 
    def c_purge m, argv
-      check_args argv, "N"
       n = argv.to_i
       n = 2   if n < 2
       n = 100 if n > 100