Sorry twitch, you were not fun to work with while you lasted

Author: RhythmicSys

.idea/.gitignore

@@ -10,8 +10,6 @@
 import simplexity.commands.ReloadCommand;
 import simplexity.config.TTSConfig;
 import simplexity.setup.PollySetup;
-import simplexity.twitch.TwitchClientHandler;
-import simplexity.setup.TwitchSetup;
 
 import java.util.Scanner;
 
@@ -20,8 +18,6 @@ public class Main {
     private static CommandManager commandManager;
     public static PollyHandler pollyHandler;
     private static SpeechHandler speechHandler;
-    private static TwitchClientHandler twitchClientHandler;
-    private static boolean connectToTwitch;
     public static Scanner scanner;
 
     public static void main(String[] args) {
@@ -31,16 +27,12 @@ public static void main(String[] args) {
         registerCommands(commandManager);
         TTSConfig.getInstance().reloadConfig();
         PollySetup.setupPollyAndSpeech();
-        TwitchSetup.setup();
         while (true) {
             String input = scanner.nextLine();
             if (input.equals("--exit")) {
                 return;
             }
             if (!commandManager.runCommand(input)) {
-                if (twitchClientHandler != null && connectToTwitch) {
-                    twitchClientHandler.getTwitchClient().getChat().sendMessage(TTSConfig.getInstance().getTwitchChannel(), input);
-                }
                 speechHandler.processSpeech(input);
             }
         }
@@ -72,18 +64,4 @@ public static Scanner getScanner(){
         return scanner;
     }
 
-    public static void setConnectToTwitch(boolean connectToTwitch) {
-        Main.connectToTwitch = connectToTwitch;
-    }
-    public static boolean isConnectToTwitch() {
-        return connectToTwitch;
-    }
-
-    public static TwitchClientHandler getTwitchClientHandler() {
-        return twitchClientHandler;
-    }
-
-    public static void setTwitchClientHandler(TwitchClientHandler twitchClientHandlerToSet) {
-        twitchClientHandler = twitchClientHandlerToSet;
-    }
 }

github/resources/twitch_application_registration.png

@@ -67,6 +67,7 @@ public InputStream synthesizeSSMLSpeech(String text, VoiceId voice) {
             return synthesizeSpeechResult.getAudioStream();
         } catch (RuntimeException exception) {
             Util.logAndPrint(logger, Errors.CAUGHT_EXCEPTION.replace("%error%", exception.getMessage()), Level.ERROR);
+            Util.logAndPrint(logger, Errors.MESSAGE_NOT_PARSABLE.replace("%message%", text), Level.ERROR);
             return null;
         }
     }

github/resources/twitch_application_registration_landing_page.png

@@ -1,12 +1,18 @@
 package simplexity.commands;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
 public abstract class Command {
     public String name;
     public String description;
+    public final Logger logger;
 
     public Command(String name, String usage) {
         this.name = name;
         this.description = usage;
+        this.logger = LoggerFactory.getLogger(this.getClass().getName());
     }
 
     public abstract void execute();

src/main/java/simplexity/Main.java

@@ -1,22 +1,28 @@
 package simplexity.commands;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
 import simplexity.messages.Errors;
+import simplexity.util.Util;
 
 import java.util.HashMap;
 
 public class CommandManager {
     private final HashMap<String, Command> commands = new HashMap<>();
+    private static final Logger logger = LoggerFactory.getLogger(CommandManager.class);
 
     public void registerCommand(Command command) {
         commands.put(command.getName(), command);
     }
 
     public boolean runCommand(String command) {
         if (command.startsWith("--") && !commands.containsKey(command)) {
-            System.out.println(Errors.UNKNOWN_COMMAND.replace("%command%", command));
+            Util.logAndPrint(logger, Errors.UNKNOWN_COMMAND.replace("%command%", command), Level.ERROR);
             return true;
         }
         if (!commands.containsKey(command)){
+            Util.logAndPrint(logger, "Commands does not contain key " + command, Level.INFO);
             return false;
         }
         commands.get(command).execute();

src/main/java/simplexity/amazon/SpeechHandler.java

@@ -1,5 +1,10 @@
 package simplexity.commands;
 
+import org.slf4j.event.Level;
+import simplexity.httpserver.AuthServer;
+import simplexity.messages.Output;
+import simplexity.util.Util;
+
 public class ExitCommand extends Command {
 
     public ExitCommand(String name, String usage) {
@@ -8,5 +13,8 @@ public ExitCommand(String name, String usage) {
 
     @Override
     public void execute() {
+        Util.logAndPrint(logger, Output.SHUTTING_DOWN, Level.INFO);
+        AuthServer.stop();
+        System.exit(0);
     }
 }

src/main/java/simplexity/commands/Command.java

@@ -1,14 +1,11 @@
 package simplexity.commands;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
 import simplexity.config.TTSConfig;
 import simplexity.messages.Output;
 import simplexity.util.Util;
 
 public class ReloadCommand extends Command {
-    private static final Logger logger = LoggerFactory.getLogger(ReloadCommand.class);
     public ReloadCommand(String name, String usage) {
         super(name, usage);
     }

src/main/java/simplexity/commands/CommandManager.java

@@ -4,11 +4,6 @@ public class ConfigDefaults {
     public static final String AWS_REGION = "aws-region= \"US_EAST_1\"\n";
     public static final String AWS_ACCESS_KEY = "aws-access-id= \"\"\n";
     public static final String AWS_SECRET_KEY = "aws-secret-key= \"\"\n";
-    public static final String TWITCH_CHANNEL = "twitch-channel= \"\"\n";
-    public static final String CONNECT_TO_TWITCH = "connect-to-twitch= false\n";
-    public static final String TWITCH_APP_CLIENT_ID = "twitch-app-client-id= \"\"\n";
-    public static final String TWITCH_APP_CLIENT_SECRET = "twitch-app-client-secret= \"\"\n";
-    public static final String TWITCH_APP_REDIRECT_URI = "twitch-app-redirect-uri= \"\"\n";
     public static final String REPLACE_TEXT = """
             replace-text {
               "**"= "<prosody volume=\\"x-loud\\" pitch=\\"low\\" rate=\\"slow\\">"