|
|
|
@ -8,10 +8,8 @@ package moe.nekojimi.chords; |
|
|
|
|
import com.amihaiemil.eoyaml.Yaml; |
|
|
|
|
import com.amihaiemil.eoyaml.YamlMapping; |
|
|
|
|
import com.beust.jcommander.JCommander; |
|
|
|
|
import com.beust.jcommander.Parameter; |
|
|
|
|
import com.neovisionaries.ws.client.WebSocketFactory; |
|
|
|
|
import java.io.File; |
|
|
|
|
import java.io.FilenameFilter; |
|
|
|
|
import java.io.IOException; |
|
|
|
|
import java.net.*; |
|
|
|
|
import java.nio.file.Files; |
|
|
|
@ -22,8 +20,6 @@ import java.util.function.BiConsumer; |
|
|
|
|
import java.util.function.Consumer; |
|
|
|
|
import java.util.logging.Level; |
|
|
|
|
import java.util.logging.Logger; |
|
|
|
|
import javax.net.SocketFactory; |
|
|
|
|
import javax.net.ssl.SSLSocketFactory; |
|
|
|
|
import javax.security.auth.login.LoginException; |
|
|
|
|
import moe.nekojimi.chords.commands.*; |
|
|
|
|
import moe.nekojimi.musicsearcher.providers.MetaSearcher; |
|
|
|
@ -40,10 +36,11 @@ import net.dv8tion.jda.api.utils.Compression; |
|
|
|
|
import net.dv8tion.jda.api.utils.cache.CacheFlag; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* The Chords music Discord bot. |
|
|
|
|
* |
|
|
|
|
* @author jimj316 |
|
|
|
|
* @author Nekojimi |
|
|
|
|
*/ |
|
|
|
|
public final class Main extends ListenerAdapter |
|
|
|
|
public final class Chords extends ListenerAdapter |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
|
private static final CommandOptions options = new CommandOptions(); |
|
|
|
@ -99,7 +96,7 @@ public final class Main extends ListenerAdapter |
|
|
|
|
// Set activity (like "playing Something")
|
|
|
|
|
builder.setActivity(Activity.playing("music!")); |
|
|
|
|
|
|
|
|
|
final Main listener = new Main(); |
|
|
|
|
final Chords listener = new Chords(); |
|
|
|
|
|
|
|
|
|
builder.addEventListeners(listener); |
|
|
|
|
builder.setAutoReconnect(true); |
|
|
|
@ -120,7 +117,7 @@ public final class Main extends ListenerAdapter |
|
|
|
|
|
|
|
|
|
private final BiConsumer<SongRequest, Exception> downloaderMessageHandler = new DownloaderMessageHandler(); |
|
|
|
|
|
|
|
|
|
public Main() throws IOException |
|
|
|
|
public Chords() throws IOException |
|
|
|
|
{ |
|
|
|
|
log("INFO", "Starting up..."); |
|
|
|
|
|
|
|
|
@ -362,7 +359,7 @@ public final class Main extends ListenerAdapter |
|
|
|
|
playlists.put(playlist.getName(), playlist); |
|
|
|
|
} catch (IOException ex) |
|
|
|
|
{ |
|
|
|
|
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); |
|
|
|
|
Logger.getLogger(Chords.class.getName()).log(Level.SEVERE, null, ex); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |