initial rewrite commit

src/main/java/me/jagrosh/jmusicbot/commands/ForceskipCmd.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.audio.AudioHandler;
+import net.dv8tion.jda.core.entities.User;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class ForceskipCmd extends MusicCommand {
+
+    public ForceskipCmd(Bot bot)
+    {
+        super(bot);
+        this.name = "forceskip";
+        this.help = "skips the current song";
+        this.aliases = new String[]{"modskip"};
+        this.bePlaying = true;
+        this.category = bot.DJ;
+    }
+
+    @Override
+    public void doCommand(CommandEvent event) {
+        AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
+        User u = event.getJDA().getUserById(handler.getCurrentTrack().getIdentifier());
+        event.reply(event.getClient().getSuccess()+" Skipped **"+handler.getCurrentTrack().getTrack().getInfo().title
+                +"** (requested by "+(u==null ? "someone" : "**"+u.getName()+"**")+")");
+        handler.getPlayer().stopTrack();
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/MusicCommand.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import me.jagrosh.jdautilities.commandclient.Command;
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.Settings;
+import me.jagrosh.jmusicbot.audio.AudioHandler;
+import net.dv8tion.jda.core.entities.GuildVoiceState;
+import net.dv8tion.jda.core.entities.TextChannel;
+import net.dv8tion.jda.core.entities.VoiceChannel;
+import net.dv8tion.jda.core.exceptions.PermissionException;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public abstract class MusicCommand extends Command {
+
+    protected final Bot bot;
+    protected boolean bePlaying;
+    protected boolean beListening;
+    
+    public MusicCommand(Bot bot)
+    {
+        this.bot = bot;
+        this.guildOnly = true;
+        this.category = bot.MUSIC;
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) {
+        Settings settings = bot.getSettings(event.getGuild());
+        TextChannel tchannel = event.getGuild().getTextChannelById(settings.getTextId());
+        if(tchannel!=null && !event.getTextChannel().equals(tchannel))
+        {
+            try {
+                event.getMessage().deleteMessage().queue();
+            } catch(PermissionException e){}
+            event.replyInDM(event.getClient().getError()+" You can only use that command in <#"+settings.getTextId()+">!");
+            return;
+        }
+        if(bePlaying
+                && (event.getGuild().getAudioManager().getSendingHandler()==null
+                || ((AudioHandler)event.getGuild().getAudioManager().getSendingHandler()).getCurrentTrack()==null))
+        {
+            event.reply(event.getClient().getError()+" There must be music playing to use that!");
+            return;
+        }
+        if(beListening)
+        {
+            VoiceChannel current = event.getGuild().getSelfMember().getVoiceState().getChannel();
+            if(current==null)
+                current = event.getGuild().getVoiceChannelById(settings.getVoiceId());
+            GuildVoiceState userState = event.getMember().getVoiceState();
+            if(!userState.inVoiceChannel() || userState.isDeafened() || (current!=null && !userState.getChannel().equals(current)))
+            {
+                event.reply(event.getClient().getError()
+                        +" You must be listening in "+(current==null ? "a voice channel" : "**"+current.getName()+"**")
+                        +" to use that!");
+                return;
+            }
+            if(current==null)
+                event.getGuild().getAudioManager().openAudioConnection(userState.getChannel());
+        }
+        doCommand(event);
+    }
+    
+    public abstract void doCommand(CommandEvent event);
+}

src/main/java/me/jagrosh/jmusicbot/commands/NowplayingCmd.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.audio.AudioHandler;
+import me.jagrosh.jmusicbot.utils.FormatUtil;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class NowplayingCmd extends MusicCommand {
+
+    public NowplayingCmd(Bot bot)
+    {
+        super(bot);
+        this.name = "nowplaying";
+        this.help = "shows the song that is currently playing";
+        this.aliases = new String[]{"np","current"};
+    }
+
+    @Override
+    public void doCommand(CommandEvent event) {
+        event.reply(FormatUtil.formattedAudio((AudioHandler)event.getGuild().getAudioManager().getSendingHandler(), event.getJDA(), false));
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/PlayCmd.java

@@ -0,0 +1,115 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
+import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.utils.FormatUtil;
+import net.dv8tion.jda.core.entities.Message;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class PlayCmd extends MusicCommand {
+
+    public PlayCmd(Bot bot)
+    {
+        super(bot);
+        this.name = "play";
+        this.arguments = "<title|URL>";
+        this.help = "plays the provided song";
+        this.beListening = true;
+        this.bePlaying = false;
+    }
+
+    @Override
+    public void doCommand(CommandEvent event) {
+        if(event.getArgs().isEmpty())
+        {
+            event.reply(event.getClient().getError()+" Please include a url or song title.");
+            return;
+        }
+        String args = event.getArgs().startsWith("<") && event.getArgs().endsWith(">") 
+                ? event.getArgs().substring(1,event.getArgs().length()-1) 
+                : event.getArgs();
+        event.getChannel().sendMessage("\u231A Loading... `["+args+"]`").queue(m -> {
+            bot.getAudioManager().loadItemOrdered(event.getGuild(), args, new ResultHandler(m,event,false));
+        });
+    }
+    
+    private class ResultHandler implements AudioLoadResultHandler {
+        final Message m;
+        final CommandEvent event;
+        final boolean ytsearch;
+        private ResultHandler(Message m, CommandEvent event, boolean ytsearch)
+        {
+            this.m = m;
+            this.event = event;
+            this.ytsearch = ytsearch;
+        }
+        
+        @Override
+        public void trackLoaded(AudioTrack track) {
+            int pos = bot.queueTrack(event, track)+1;
+            m.editMessage(event.getClient().getSuccess()+" Added **"+track.getInfo().title
+                    +"** (`"+FormatUtil.formatTime(track.getDuration())+"`) "+(pos==0 ? "to begin playing" 
+                        : " to the queue at position "+pos)).queue();
+        }
+
+        @Override
+        public void playlistLoaded(AudioPlaylist playlist) {
+            if(playlist.getTracks().size()==1 || playlist.isSearchResult() || playlist.getSelectedTrack()!=null)
+            {
+                AudioTrack single = playlist.getSelectedTrack()==null?playlist.getTracks().get(0):playlist.getSelectedTrack();
+                int pos = bot.queueTrack(event, single)+1;
+                m.editMessage(event.getClient().getSuccess()+" Added **"+single.getInfo().title
+                    +"** (`"+FormatUtil.formatTime(single.getDuration())+"`) "+(pos==0 ? "to begin playing" 
+                        : " to the queue at position "+pos)).queue();
+            }
+            else
+            {
+                m.editMessage(event.getClient().getSuccess()+" Found "
+                        +(playlist.getName()==null?"a playlist":"playlist **"+playlist.getName()+"**")+" with `"
+                        +playlist.getTracks().size()+"` entries; adding to the queue.").queue();
+                playlist.getTracks().stream().forEach((track) -> {
+                    bot.queueTrack(event, track);
+                });
+            }
+        }
+
+        @Override
+        public void noMatches() {
+            if(ytsearch)
+                m.editMessage(event.getClient().getWarning()+" No results found for `"+event.getArgs()+"`.").queue();
+            else
+                bot.getAudioManager().loadItemOrdered(event.getGuild(), "ytsearch:"+event.getArgs(), new ResultHandler(m,event,true));
+        }
+
+        @Override
+        public void loadFailed(FriendlyException throwable) {
+            if(throwable.severity==Severity.COMMON)
+                m.editMessage(event.getClient().getError()+" Error loading: "+throwable.getMessage()).queue();
+            else
+                m.editMessage(event.getClient().getError()+" Error loading track.").queue();
+        }
+    }
+}

src/main/java/me/jagrosh/jmusicbot/commands/QueueCmd.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jdautilities.menu.pagination.PaginatorBuilder;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.audio.AudioHandler;
+import me.jagrosh.jmusicbot.audio.QueuedTrack;
+import me.jagrosh.jmusicbot.utils.FormatUtil;
+import net.dv8tion.jda.core.Permission;
+import net.dv8tion.jda.core.exceptions.PermissionException;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class QueueCmd extends MusicCommand {
+
+    private final PaginatorBuilder builder;
+    public QueueCmd(Bot bot)
+    {
+        super(bot);
+        this.name = "queue";
+        this.help = "shows the current queue";
+        this.arguments = "[pagenum]";
+        this.aliases = new String[]{"list"};
+        this.bePlaying = true;
+        this.botPermissions = new Permission[]{Permission.MESSAGE_ADD_REACTION,Permission.MESSAGE_EMBED_LINKS};
+        builder = new PaginatorBuilder()
+                .setColumns(1)
+                .setFinalAction(m -> {try{m.clearReactions().queue();}catch(PermissionException e){}})
+                .setItemsPerPage(10)
+                .waitOnSinglePage(false)
+                .useNumberedItems(true)
+                .showPageNumbers(true)
+                .setEventWaiter(bot.getWaiter())
+                .setTimeout(1, TimeUnit.MINUTES)
+                ;
+    }
+
+    @Override
+    public void doCommand(CommandEvent event) {
+        int pagenum = 1;
+        try{
+            pagenum = Integer.parseInt(event.getArgs());
+        }catch(NumberFormatException e){}
+        List<QueuedTrack> list = ((AudioHandler)event.getGuild().getAudioManager().getSendingHandler()).getQueue().getList();
+        if(list.isEmpty())
+        {
+            event.reply(event.getClient().getWarning()+" There is no music in the queue!");
+            return;
+        }
+        String[] songs = new String[list.size()];
+        long total = 0;
+        for(int i=0; i<list.size(); i++)
+        {
+            total += list.get(i).getTrack().getDuration();
+            songs[i] = list.get(i).toString();
+        }
+        builder.setText(event.getClient().getSuccess()+" Current Queue | "+songs.length+" entries | `"+FormatUtil.formatTime(total)+"` ~ ")
+                .setItems(songs)
+                .setUsers(event.getAuthor())
+                .setColor(event.getSelfMember().getColor())
+                ;
+        builder.build().paginate(event.getChannel(), pagenum);
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/RemoveCmd.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.audio.AudioHandler;
+import me.jagrosh.jmusicbot.audio.QueuedTrack;
+import net.dv8tion.jda.core.Permission;
+import net.dv8tion.jda.core.entities.Role;
+import net.dv8tion.jda.core.entities.User;
+import net.dv8tion.jda.core.utils.PermissionUtil;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class RemoveCmd extends MusicCommand {
+
+    public RemoveCmd(Bot bot)
+    {
+        super(bot);
+        this.name = "remove";
+        this.help = "removes a song from the queue";
+        this.arguments = "<position>";
+        this.aliases = new String[]{"delete"};
+        this.beListening = true;
+        this.bePlaying = true;
+    }
+
+    @Override
+    public void doCommand(CommandEvent event) {
+        AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
+        if(handler.getQueue().isEmpty())
+        {
+            event.reply(event.getClient().getError()+" There is nothing in the queue!");
+            return;
+        }
+        int pos;
+        try {
+            pos = Integer.parseInt(event.getArgs());
+        } catch(NumberFormatException e) {
+            pos = 0;
+        }
+        if(pos<1 || pos>handler.getQueue().size())
+        {
+            event.reply(event.getClient().getError()+" Position must be a valid integer between 1 and "+handler.getQueue().size()+"!");
+            return;
+        }
+        boolean isDJ = PermissionUtil.checkPermission(event.getGuild(), event.getMember(), Permission.MANAGE_SERVER);
+        if(!isDJ)
+            isDJ = event.getMember().getRoles().contains(event.getGuild().getRoleById(bot.getSettings(event.getGuild()).getRoleId()));
+        QueuedTrack qt = handler.getQueue().get(pos-1);
+        if(qt.getIdentifier().equals(event.getAuthor().getId()))
+        {
+            handler.getQueue().remove(pos-1);
+            event.reply(event.getClient().getSuccess()+" Removed **"+qt.getTrack().getInfo().title+"** from the queue");
+        }
+        else if(isDJ)
+        {
+            handler.getQueue().remove(pos-1);
+            User u = event.getJDA().getUserById(qt.getIdentifier());
+            event.reply(event.getClient().getSuccess()+" Removed **"+qt.getTrack().getInfo().title
+                    +"** from the queue (requested by "+(u==null ? "someone" : "**"+u.getName()+"**")+")");
+        }
+        else
+        {
+            event.reply(event.getClient().getError()+" You cannot remove **"+qt.getTrack().getInfo().title+"** because you didn't add it!");
+        }
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/SearchCmd.java

@@ -0,0 +1,119 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
+import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import java.util.concurrent.TimeUnit;
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jdautilities.menu.orderedmenu.OrderedMenuBuilder;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.utils.FormatUtil;
+import net.dv8tion.jda.core.entities.Message;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class SearchCmd extends MusicCommand {
+
+    private final OrderedMenuBuilder builder;
+    public SearchCmd(Bot bot)
+    {
+        super(bot);
+        this.name = "search";
+        this.arguments = "<query>";
+        this.help = "searches Youtube for a provided query";
+        this.beListening = true;
+        this.bePlaying = false;
+        builder = new OrderedMenuBuilder()
+                .allowTextInput(true)
+                .useNumbers()
+                .useCancelButton(true)
+                .setEventWaiter(bot.getWaiter())
+                .setTimeout(1, TimeUnit.MINUTES)
+                ;
+    }
+
+    @Override
+    public void doCommand(CommandEvent event) {
+        if(event.getArgs().isEmpty())
+        {
+            event.reply(event.getClient().getError()+" Please include a query.");
+            return;
+        }
+        event.getChannel().sendMessage("\uD83D\uDD0E Searching... `["+event.getArgs()+"]`").queue(m -> {
+            bot.getAudioManager().loadItemOrdered(event.getGuild(), "ytsearch:"+event.getArgs(), new ResultHandler(m,event));
+        });
+    }
+    
+    private class ResultHandler implements AudioLoadResultHandler {
+        final Message m;
+        final CommandEvent event;
+        private ResultHandler(Message m, CommandEvent event)
+        {
+            this.m = m;
+            this.event = event;
+        }
+        
+        @Override
+        public void trackLoaded(AudioTrack track) {
+            int pos = bot.queueTrack(event, track)+1;
+            m.editMessage(event.getClient().getSuccess()+" Added **"+track.getInfo().title
+                    +"** (`"+FormatUtil.formatTime(track.getDuration())+"`) "+(pos==0 ? "to begin playing" 
+                        : " to the queue at position "+pos)).queue();
+        }
+
+        @Override
+        public void playlistLoaded(AudioPlaylist playlist) {
+            builder.setColor(event.getSelfMember().getColor())
+                    .setText(event.getClient().getSuccess()+" Search results for `"+event.getArgs()+"`:")
+                    .setChoices(new String[0])
+                    .setAction(i -> {
+                        AudioTrack track = playlist.getTracks().get(i-1);
+                        int pos = bot.queueTrack(event, track)+1;
+                        event.getChannel().sendMessage(event.getClient().getSuccess()+" Added **"+track.getInfo().title
+                                +"** (`"+FormatUtil.formatTime(track.getDuration())+"`) "+(pos==0 ? "to begin playing" 
+                                    : " to the queue at position "+pos)).queue();
+                    })
+                    .setUsers(event.getAuthor())
+                    ;
+            for(int i=0; i<4&&i<playlist.getTracks().size(); i++)
+            {
+                AudioTrack track = playlist.getTracks().get(i);
+                builder.addChoices("`["+FormatUtil.formatTime(track.getDuration())+"]` [**"
+                        +track.getInfo().title+"**](https://youtu.be/"+track.getIdentifier()+")");
+            }
+            builder.build().display(m);
+        }
+
+        @Override
+        public void noMatches() {
+            m.editMessage(event.getClient().getWarning()+" No results found for `"+event.getArgs()+"`.").queue();
+        }
+
+        @Override
+        public void loadFailed(FriendlyException throwable) {
+            if(throwable.severity==Severity.COMMON)
+                m.editMessage(event.getClient().getError()+" Error loading: "+throwable.getMessage()).queue();
+            else
+                m.editMessage(event.getClient().getError()+" Error loading track.").queue();
+        }
+    }
+}

src/main/java/me/jagrosh/jmusicbot/commands/SetavatarCmd.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2017 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import me.jagrosh.jdautilities.commandclient.Command;
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.utils.OtherUtil;
+import net.dv8tion.jda.core.entities.Icon;
+import net.dv8tion.jda.core.exceptions.RateLimitedException;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class SetavatarCmd extends Command {
+
+    public SetavatarCmd(Bot bot)
+    {
+        this.name = "setavatar";
+        this.help = "sets the name of the bot";
+        this.arguments = "<url>";
+        this.ownerCommand = true;
+        this.category = bot.OWNER;
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) {
+        String url;
+        if(event.getArgs().isEmpty())
+            if(!event.getMessage().getAttachments().isEmpty() && event.getMessage().getAttachments().get(0).isImage())
+                url = event.getMessage().getAttachments().get(0).getUrl();
+            else
+                url = null;
+        else
+            url = event.getArgs();
+        InputStream s = OtherUtil.imageFromUrl(url);
+        if(s==null)
+        {
+            event.reply(event.getClient().getError()+" Invalid or missing URL");
+        }
+        else
+        {
+            try {
+            event.getSelfUser().getManager().setAvatar(Icon.from(s)).queue(
+                    v -> event.reply(event.getClient().getSuccess()+" Successfully changed avatar."), 
+                    t -> event.reply(event.getClient().getError()+" Failed to set avatar."));
+            } catch(IOException e) {
+                event.reply(event.getClient().getError()+" Could not load from provided URL.");
+            }
+        }
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/SetdjCmd.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import java.util.List;
+import me.jagrosh.jdautilities.commandclient.Command;
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.utils.FinderUtil;
+import me.jagrosh.jmusicbot.utils.FormatUtil;
+import net.dv8tion.jda.core.entities.Role;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class SetdjCmd extends Command {
+
+    private final Bot bot;
+    public SetdjCmd(Bot bot)
+    {
+        this.bot = bot;
+        this.name = "setdj";
+        this.help = "sets the DJ role for certain music commands";
+        this.arguments = "<rolename|NONE>";
+        this.guildOnly = true;
+        this.category = bot.ADMIN;
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) {
+        if(event.getArgs().isEmpty())
+        {
+            event.reply(event.getClient().getError()+" Please include a role name or NONE");
+        }
+        else if(event.getArgs().equalsIgnoreCase("none"))
+        {
+            bot.clearTextChannel(event.getGuild());
+            event.reply(event.getClient().getSuccess()+" DJ role cleared; Only Admins can use the DJ commands.");
+        }
+        else
+        {
+            List<Role> list = FinderUtil.findRole(event.getArgs(), event.getGuild());
+            if(list.isEmpty())
+                event.reply(event.getClient().getWarning()+" No Roles found matching \""+event.getArgs()+"\"");
+            else if (list.size()>1)
+                event.reply(event.getClient().getWarning()+FormatUtil.listOfRoles(list, event.getArgs()));
+            else
+            {
+                bot.setRole(list.get(0));
+                event.reply(event.getClient().getSuccess()+" DJ commands can now be used by users with the **"+list.get(0).getName()+"** role.");
+            }
+        }
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/SetnameCmd.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2017 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import me.jagrosh.jdautilities.commandclient.Command;
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import net.dv8tion.jda.core.exceptions.RateLimitedException;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class SetnameCmd extends Command {
+
+    public SetnameCmd(Bot bot)
+    {
+        this.name = "setname";
+        this.help = "sets the name of the bot";
+        this.arguments = "<name>";
+        this.ownerCommand = true;
+        this.category = bot.OWNER;
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) {
+        try {
+            String oldname = event.getSelfUser().getName();
+            event.getSelfUser().getManager().setName(event.getArgs()).complete(false);
+            event.reply(event.getClient().getSuccess()+" Name changed from `"+oldname+"` to `"+event.getArgs()+"`");
+        } catch(RateLimitedException e) {
+            event.reply(event.getClient().getError()+" Name can only be changed twice per hour!");
+        } catch(Exception e) {
+            event.reply(event.getClient().getError()+" That name is not valid!");
+        }
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/SettcCmd.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import java.util.List;
+import me.jagrosh.jdautilities.commandclient.Command;
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.utils.FinderUtil;
+import me.jagrosh.jmusicbot.utils.FormatUtil;
+import net.dv8tion.jda.core.entities.TextChannel;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class SettcCmd extends Command {
+
+    private final Bot bot;
+    public SettcCmd(Bot bot)
+    {
+        this.bot = bot;
+        this.name = "settc";
+        this.help = "sets the text channel for music commands";
+        this.arguments = "<channel|NONE>";
+        this.guildOnly = true;
+        this.category = bot.ADMIN;
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) {
+        if(event.getArgs().isEmpty())
+        {
+            event.reply(event.getClient().getError()+" Please include a text channel or NONE");
+        }
+        else if(event.getArgs().equalsIgnoreCase("none"))
+        {
+            bot.clearTextChannel(event.getGuild());
+            event.reply(event.getClient().getSuccess()+" Music commands can now be used in any channel");
+        }
+        else
+        {
+            List<TextChannel> list = FinderUtil.findTextChannel(event.getArgs(), event.getGuild());
+            if(list.isEmpty())
+                event.reply(event.getClient().getWarning()+" No Text Channels found matching \""+event.getArgs()+"\"");
+            else if (list.size()>1)
+                event.reply(event.getClient().getWarning()+FormatUtil.listOfTChannels(list, event.getArgs()));
+            else
+            {
+                bot.setTextChannel(list.get(0));
+                event.reply(event.getClient().getSuccess()+" Music commands can now only be used in <#"+list.get(0).getId()+">");
+            }
+        }
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/SettingsCmd.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2017 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import me.jagrosh.jdautilities.commandclient.Command;
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.Settings;
+import net.dv8tion.jda.core.EmbedBuilder;
+import net.dv8tion.jda.core.MessageBuilder;
+import net.dv8tion.jda.core.entities.Role;
+import net.dv8tion.jda.core.entities.TextChannel;
+import net.dv8tion.jda.core.entities.VoiceChannel;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class SettingsCmd extends Command {
+
+    private final Bot bot;
+    public SettingsCmd(Bot bot)
+    {
+        this.bot = bot;
+        this.name = "settings";
+        this.help = "shows the bots settings";
+        this.aliases = new String[]{"status"};
+        this.guildOnly = true;
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) {
+        Settings s = bot.getSettings(event.getGuild());
+        MessageBuilder builder = new MessageBuilder()
+                .append("\uD83C\uDFA7 **")
+                .append(event.getSelfUser().getName())
+                .append("** settings:");
+        TextChannel tchan = event.getGuild().getTextChannelById(s.getTextId());
+        VoiceChannel vchan = event.getGuild().getVoiceChannelById(s.getVoiceId());
+        Role role = event.getGuild().getRoleById(s.getRoleId());
+        EmbedBuilder ebuilder = new EmbedBuilder()
+                .setColor(event.getSelfMember().getColor())
+                .setDescription("Text Channel: "+(tchan==null ? "Any" : "**#"+tchan.getName()+"**")
+                        + "\nVoice Channel: "+(vchan==null ? "Any" : "**"+vchan.getName()+"**")
+                        + "\nDJ Role: "+(role==null ? "None" : "**"+role.getName()+"**"))
+                .setFooter(event.getJDA().getGuilds().size()+" servers | "
+                        +event.getJDA().getGuilds().stream().filter(g -> g.getSelfMember().getVoiceState().inVoiceChannel()).count()
+                        +" audio connections", null);
+        event.getChannel().sendMessage(builder.setEmbed(ebuilder.build()).build()).queue();
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/SetvcCmd.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import java.util.List;
+import me.jagrosh.jdautilities.commandclient.Command;
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.utils.FinderUtil;
+import me.jagrosh.jmusicbot.utils.FormatUtil;
+import net.dv8tion.jda.core.entities.VoiceChannel;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class SetvcCmd extends Command {
+
+    private final Bot bot;
+    public SetvcCmd(Bot bot)
+    {
+        this.bot = bot;
+        this.name = "setvc";
+        this.help = "sets the voice channel for playing music";
+        this.arguments = "<channel|NONE>";
+        this.guildOnly = true;
+        this.category = bot.ADMIN;
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) {
+        if(event.getArgs().isEmpty())
+        {
+            event.reply(event.getClient().getError()+" Please include a voice channel or NONE");
+        }
+        else if(event.getArgs().equalsIgnoreCase("none"))
+        {
+            bot.clearVoiceChannel(event.getGuild());
+            event.reply(event.getClient().getSuccess()+" Music can now be played in any channel");
+        }
+        else
+        {
+            List<VoiceChannel> list = FinderUtil.findVoiceChannel(event.getArgs(), event.getGuild());
+            if(list.isEmpty())
+                event.reply(event.getClient().getWarning()+" No Voice Channels found matching \""+event.getArgs()+"\"");
+            else if (list.size()>1)
+                event.reply(event.getClient().getWarning()+FormatUtil.listOfVChannels(list, event.getArgs()));
+            else
+            {
+                bot.setVoiceChannel(list.get(0));
+                event.reply(event.getClient().getSuccess()+" Music can now only be played in **"+list.get(0).getName()+"**");
+            }
+        }
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/ShutdownCmd.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2017 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import me.jagrosh.jdautilities.commandclient.Command;
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.audio.AudioHandler;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class ShutdownCmd extends Command {
+
+    public ShutdownCmd(Bot bot)
+    {
+        this.name = "shutdown";
+        this.help = "safely shuts down";
+        this.ownerCommand = true;
+        this.category = bot.OWNER;
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) {
+        event.reply(event.getClient().getWarning()+" Shutting down...");
+        event.getJDA().getGuilds().stream()
+                .forEach(g -> g.getAudioManager().closeAudioConnection());
+        event.getJDA().getGuilds().stream()
+                .filter(g -> g.getAudioManager().getSendingHandler()!=null)
+                .forEach(g -> ((AudioHandler)g.getAudioManager().getSendingHandler()).getPlayer().destroy());
+        event.getJDA().shutdown();
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/SkipCmd.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.audio.AudioHandler;
+import net.dv8tion.jda.core.entities.User;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class SkipCmd extends MusicCommand {
+
+    public SkipCmd(Bot bot)
+    {
+        super(bot);
+        this.name = "skip";
+        this.help = "votes to skip the current song";
+        this.aliases = new String[]{"voteskip"};
+        this.beListening = true;
+        this.bePlaying = true;
+    }
+
+    @Override
+    public void doCommand(CommandEvent event) {
+        AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
+        if(event.getAuthor().getId().equals(handler.getCurrentTrack().getIdentifier()))
+        {
+            event.reply(event.getClient().getSuccess()+" Skipped **"+handler.getCurrentTrack().getTrack().getInfo().title
+                    +"** (requested by **"+event.getAuthor().getName()+"**)");
+            handler.getPlayer().stopTrack();
+        }
+        else
+        {
+            int listeners = (int)event.getSelfMember().getVoiceState().getChannel().getMembers().stream()
+                    .filter(m -> !m.getUser().isBot() && !m.getVoiceState().isDeafened()).count();
+            String msg;
+            if(handler.getVotes().contains(event.getAuthor().getId()))
+                msg = event.getClient().getWarning()+" You already voted to skip this song `[";
+            else
+            {
+                msg = event.getClient().getSuccess()+" You voted to skip the song `[";
+                handler.getVotes().add(event.getAuthor().getId());
+            }
+            int skippers = (int)event.getSelfMember().getVoiceState().getChannel().getMembers().stream()
+                    .filter(m -> handler.getVotes().contains(m.getUser().getId())).count();
+            int required = (int)Math.ceil(listeners * .55);
+            msg+= skippers+" votes, "+required+"/"+listeners+" needed]`";
+            if(skippers>=required)
+            {
+                User u = event.getJDA().getUserById(handler.getCurrentTrack().getIdentifier());
+                msg+="\n"+event.getClient().getSuccess()+" Skipped **"+handler.getCurrentTrack().getTrack().getInfo().title
+                    +"** (requested by "+(u==null ? "someone" : "**"+u.getName()+"**")+")";
+                handler.getPlayer().stopTrack();
+            }
+            event.reply(msg);
+        }
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/StopCmd.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.audio.AudioHandler;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class StopCmd extends MusicCommand {
+
+    public StopCmd(Bot bot)
+    {
+        super(bot);
+        this.name = "stop";
+        this.help = "stops the current song and clears the queue";
+        this.bePlaying = true;
+        this.category = bot.DJ;
+    }
+
+    @Override
+    public void doCommand(CommandEvent event) {
+        AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
+        handler.getPlayer().stopTrack();
+        handler.getQueue().clear();
+        event.getGuild().getAudioManager().closeAudioConnection();
+        event.reply(event.getClient().getSuccess()+" The player has stopped and the queue has been cleared.");
+    }
+    
+}

src/main/java/me/jagrosh/jmusicbot/commands/VolumeCmd.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2016 John Grosh <john.a.grosh@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package me.jagrosh.jmusicbot.commands;
+
+import me.jagrosh.jdautilities.commandclient.CommandEvent;
+import me.jagrosh.jmusicbot.Bot;
+import me.jagrosh.jmusicbot.audio.AudioHandler;
+import me.jagrosh.jmusicbot.utils.FormatUtil;
+
+/**
+ *
+ * @author John Grosh <john.a.grosh@gmail.com>
+ */
+public class VolumeCmd extends MusicCommand {
+
+    public VolumeCmd(Bot bot)
+    {
+        super(bot);
+        this.name = "volume";
+        this.help = "sets or shows volume";
+        this.arguments = "[0-150]";
+        this.category = bot.DJ;
+    }
+
+    @Override
+    public void doCommand(CommandEvent event) {
+        AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler();
+        int volume = handler==null ? 100 : handler.getPlayer().getVolume();
+        if(event.getArgs().isEmpty())
+        {
+            event.reply(FormatUtil.volumeIcon(volume)+" Current volume is `"+volume+"`");
+        }
+        else
+        {
+            int nvolume;
+            try{
+                nvolume = Integer.parseInt(event.getArgs());
+            }catch(NumberFormatException e){
+                nvolume = -1;
+            }
+            if(nvolume<0 || nvolume>150)
+                event.reply(event.getClient().getError()+" Volume must be a valid integer between 0 and 150!");
+            else
+            {
+                bot.setUpHandler(event).getPlayer().setVolume(nvolume);
+                event.reply(FormatUtil.volumeIcon(nvolume)+" Volume changed from `"+volume+"` to `"+nvolume+"`");
+            }
+        }
+    }
+    
+}