Merge pull request #15 from danmason/add-clear-command

Add `clear` command to the bot.

java-src/cljukebox/AudioTrackScheduler.java

@@ -52,6 +52,11 @@ public boolean setLoop(boolean shouldLoop) {
     return loop;
   }
 
+  public boolean clear() {
+    queue.clear();
+    return skip();
+  }
+
   @Override
   public void onTrackEnd(final AudioPlayer player, final AudioTrack track, final AudioTrackEndReason endReason) {
     if(loop && endReason == AudioTrackEndReason.FINISHED) {

src/cljukebox/handlers.clj

@@ -7,15 +7,17 @@
              [queue :as queue]
              [leave :as leave]
              [skip :as skip]
-             [loop :as loop]]))
+             [loop :as loop]
+             [clear :as clear]]))
 
 (def base-handlers
   {"prefix" prefix/handler-data
    "play" play/handler-data
    "queue" queue/handler-data
    "leave" leave/handler-data
    "skip" skip/handler-data
-   "loop" loop/handler-data})
+   "loop" loop/handler-data
+   "clear" clear/handler-data})
 
 (defn help-handler [{:keys [message-channel guild-id content] :as data}]
   (let [prefix (util/get-prefix guild-id)

src/cljukebox/handlers/clear.clj

@@ -0,0 +1,13 @@
+(ns cljukebox.handlers.clear
+  (:require [cljukebox.player :as player]
+            [cljukebox.util :as util]))
+
+(defn clear-bot [{:keys [message-channel guild-id] :as data}]
+  (let [{:keys [scheduler] :as guild-manager} (player/get-guild-audio-manager guild-id)]
+    (.clear scheduler)
+    (util/send-message message-channel ":wastebasket: **Bot queue cleared!**")))
+
+(def handler-data
+  {:doc "Will skip the currently playing track and remove all songs from the queue."
+   :usage-str "clear"
+   :handler-fn clear-bot})

src/cljukebox/handlers/loop.clj

@@ -1,6 +1,5 @@
 (ns cljukebox.handlers.loop
- (:require [clojure.string :as string]
-            [cljukebox.player :as player]
+  (:require [cljukebox.player :as player]
             [cljukebox.util :as util]))
 
 (def !loop (atom false))