Merge pull request #53 from Fashionscape/master

Update Dev

.github/workflows/gradle.yml

@@ -18,10 +18,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.14
+    - name: Set up JDK 1.16
       uses: actions/setup-java@v1
       with:
-        java-version: 1.14
+        java-version: 1.16
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

Dockerfile

@@ -1,11 +1,11 @@
-FROM gradle:6.6.1-jdk11 AS build
+FROM gradle:7.2.0-jdk16 AS build
 
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle clean --no-daemon
 RUN gradle build --no-daemon
 
-FROM openjdk:11-jre-slim
+FROM openjdk:16
 
 EXPOSE 8080
 

Makefile

@@ -11,3 +11,5 @@ docker:
 	docker push ${BUILD}
 	docker push ${LATEST}
 
+run:
+	.\gradlew run

build.gradle

@@ -1,20 +1,18 @@
 /*
- * Developed by Alek Gryczewski on 10/18/18 1:39 PM
+ * Copyright (c) 2021 Aleksei Gryczewski
- * Last modified 9/25/18 7:33 PM
- * Copyright (c) 2018. All rights reserved.
  */
 
 plugins {
-    id 'org.springframework.boot' version '2.3.3.RELEASE'
+    id 'org.springframework.boot' version '2.5.4'
     id 'application'
 }
 
 apply plugin: 'io.spring.dependency-management'
 
 group 'dev.salmonllama'
-version '2.0.3'
+version '2.0.5'
 
-sourceCompatibility = 11
+sourceCompatibility = 16
 
 repositories {
     mavenCentral()
@@ -24,17 +22,23 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.xerial:sqlite-jdbc:3.30.1'
+    implementation 'org.xerial:sqlite-jdbc:3.36.0.2'
+    implementation 'org.postgresql:postgresql:42.2.24'
     implementation 'com.github.Kaaz:ConfigurationBuilder:0.4'
-    implementation 'org.javacord:javacord:3.1.1'
+    implementation 'org.javacord:javacord:3.3.2'
-    implementation 'com.vdurmont:emoji-java:4.0.0'
+    implementation 'com.vdurmont:emoji-java:5.1.1'
-    implementation 'com.squareup.okhttp3:okhttp:4.4.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
-    implementation 'ch.qos.logback:logback-classic:1.2.3'
+    implementation 'ch.qos.logback:logback-classic:1.2.5'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.8'
+
+    implementation 'org.springframework.boot:spring-boot-starter-actuator:2.5.4'
+    implementation 'org.springframework.boot:spring-boot-starter-web:2.5.4'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa:2.5.4'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test:2.5.4'
+
+    implementation platform('com.google.cloud:libraries-bom:23.0.0')
+    implementation 'com.google.cloud:google-cloud-secretmanager'
 
-    implementation 'org.springframework.boot:spring-boot-starter-actuator'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
     testImplementation group: 'junit', name: 'junit', version: '4.12'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,9 @@
+#
+# Copyright (c) 2021 Aleksei Gryczewski
+#
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

settings.gradle

@@ -1,7 +1,5 @@
 /*
- * Developed by Alek Gryczewski on 10/18/18 1:39 PM
+ * Copyright (c) 2021 Aleksei Gryczewski
- * Last modified 8/27/18 6:45 PM
- * Copyright (c) 2018. All rights reserved.
  */
 
 rootProject.name = 'fsbot'

src/main/java/dev/salmonllama/fsbot/Main.java

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot;
 
 import dev.salmonllama.fsbot.config.BotConfig;
+import dev.salmonllama.fsbot.config.SecretManager;
 import dev.salmonllama.fsbot.database.FSDB;
 import dev.salmonllama.fsbot.guthix.Guthix;
 import dev.salmonllama.fsbot.listeners.*;
@@ -24,11 +24,11 @@ public class Main {
     private final static Logger logger = LoggerFactory.getLogger(Main.class);
 
     public static void main(String[] args) {
-        BotConfig.initConfig(Constants.BOT_FOLDER, false);
+        BotConfig.initConfig(Constants.BOT_FOLDER, false); // TODO: Sunset the bot config once and for all
 
         FSDB.init();
 
-        new DiscordApiBuilder().setToken(BotConfig.TOKEN).login().thenAccept(api -> {
+        new DiscordApiBuilder().setToken(SecretManager.DISCORD_TOKEN.getPlainText()).login().thenAccept(api -> {
 
             @SuppressWarnings("unused")
             Guthix guthix = new Guthix(api);

src/main/java/dev/salmonllama/fsbot/commands/developer/CreateGalleryCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.developer;

src/main/java/dev/salmonllama/fsbot/commands/developer/DefaultCommand.java

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2021 Aleksei Gryczewski
+ */
+
 package dev.salmonllama.fsbot.commands.developer;
 
 import dev.salmonllama.fsbot.guthix.*;

src/main/java/dev/salmonllama/fsbot/commands/developer/InviteCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.developer;

src/main/java/dev/salmonllama/fsbot/commands/developer/PermissionCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.developer;

src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.developer;

src/main/java/dev/salmonllama/fsbot/commands/general/ColorCommand.java

@@ -1,17 +1,10 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.general;
 
-import dev.salmonllama.fsbot.config.BotConfig;
-import dev.salmonllama.fsbot.database.controllers.ColorRoleController;
 import dev.salmonllama.fsbot.guthix.*;
-import org.apache.logging.log4j.util.Strings;
-import org.javacord.api.entity.server.Server;
-import org.javacord.api.entity.user.User;
-
 import java.util.Arrays;
 import java.util.List;
 
@@ -25,43 +18,7 @@ public class ColorCommand extends Command {
 
     @Override
     public void onCommand(CommandContext ctx) {
-        // The color given will be the args.
+        ctx.reply("This command is no longer active. An alternative is currently being developed. For more information, please contact Salmonllama#7233");
-        // Check if args[0] is reset. If so, remove all color roles.
-        // Check if the given string is a current color role.
-        // Remove any color roles that the user has.
-        // Give the user the color role they specified
-        ctx.getServer().ifPresentOrElse(server -> {
-            String[] args = ctx.getArgs();
-            if (server.getIdAsString().equals(BotConfig.HOME_SERVER)) {
-                if (args[0].equals("reset")) {
-                    // Remove all color roles
-                    removeColorRoles(ctx.getUser(), server);
-                }
 
-                String color = Strings.join(Arrays.asList(args), ' ');
-                ColorRoleController.get(color).thenAcceptAsync(possibleColorRole -> possibleColorRole.ifPresentOrElse(colorRole -> {
-                    // Remove all color roles
-                    removeColorRoles(ctx.getUser(), server);
-                    // Give the user the one they specified
-                    addColorRole(ctx.getUser(), server, colorRole.getRoleId());
-                }, () -> ctx.reply("That color does not exist")));
-            }
-        }, () -> ctx.reply("This command can only be used in the fashionscape server"));
-    }
-
-    private static void removeColorRoles(User user, Server server) {
-        ColorRoleController.getAll().thenAcceptAsync(
-                possibleRoles -> possibleRoles.ifPresent(
-                        colorRoles -> colorRoles.forEach(
-                                colorRole -> server.getRoleById(colorRole.getRoleId()).ifPresent(
-                                                role -> user.removeRole(role, "Removed color role")
-                                )
-                        )
-                )
-        );
-    }
-
-    private static void addColorRole(User user, Server server, long roleId) {
-        server.getRoleById(roleId).ifPresent(role -> user.addRole(role, "Added color role"));
     }
 }

src/main/java/dev/salmonllama/fsbot/commands/general/ColorsCommand.java

@@ -1,14 +1,10 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.general;
 
-import dev.salmonllama.fsbot.config.BotConfig;
-import dev.salmonllama.fsbot.database.controllers.ColorRoleController;
 import dev.salmonllama.fsbot.guthix.*;
-import org.javacord.api.entity.message.embed.EmbedBuilder;
 
 import java.util.Arrays;
 import java.util.List;
@@ -23,26 +19,6 @@ public class ColorsCommand extends Command {
 
     @Override
     public void onCommand(CommandContext ctx) {
-        // List available color roles
+        ctx.reply("This command is no longer active. An alternative is currently being developed. For more information, please contact Salmonllama#7233");
-        ctx.getServer().ifPresentOrElse(server -> {
-            if (server.getIdAsString().equals(BotConfig.HOME_SERVER)) {
-                ColorRoleController.getAll().thenAcceptAsync(
-                        possibleColorRoles -> possibleColorRoles.ifPresentOrElse(colorRoles -> {
-                            EmbedBuilder response = new EmbedBuilder()
-                                    .setTitle("Color roles")
-                                    .setFooter(String.format("Found %d roles", colorRoles.size()));
-
-                            colorRoles.forEach(
-                                    colorRole -> server.getRoleById(colorRole.getRoleId()).ifPresent(
-                                        role -> response.addField(colorRole.getColor(), role.getMentionTag(), true)
-                                    )
-                            );
-
-                            ctx.reply(response);
-                        }, () -> ctx.reply("No color roles have been found")));
-            } else {
-                ctx.reply("This command can only be used in the fashionscape server");
-            }
-        }, () -> ctx.reply("This command can only be used in the fashionscape server"));
     }
 }

src/main/java/dev/salmonllama/fsbot/commands/general/HelpCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.general;

src/main/java/dev/salmonllama/fsbot/commands/general/OutfitCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.general;

src/main/java/dev/salmonllama/fsbot/commands/general/PingCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.general;

src/main/java/dev/salmonllama/fsbot/commands/general/PrivacyCommand.java

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2021 Aleksei Gryczewski
+ */
+
 package dev.salmonllama.fsbot.commands.general;
 
 import dev.salmonllama.fsbot.guthix.*;

src/main/java/dev/salmonllama/fsbot/commands/general/ShowGalleriesCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.general;

src/main/java/dev/salmonllama/fsbot/commands/general/StatsCommand.java

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2021 Aleksei Gryczewski
+ */
+
 package dev.salmonllama.fsbot.commands.general;
 
 import java.util.*;

src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsBodyCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.osrssearch;

src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsCapeCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.osrssearch;

src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsFeetCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.osrssearch;

src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsHandCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.osrssearch;

src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsHeadCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.osrssearch;

src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsLegsCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.osrssearch;

src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsNeckCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.osrssearch;

src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsSearchCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.osrssearch;

src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsSearchUtilities.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.osrssearch;

src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsShieldCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.osrssearch;

src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsWeaponCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.osrssearch;

src/main/java/dev/salmonllama/fsbot/commands/rs3search/Rs3BackCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.rs3search;

src/main/java/dev/salmonllama/fsbot/commands/rs3search/Rs3BodyCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.rs3search;

src/main/java/dev/salmonllama/fsbot/commands/rs3search/Rs3FeetCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.rs3search;

src/main/java/dev/salmonllama/fsbot/commands/rs3search/Rs3HandCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.rs3search;

src/main/java/dev/salmonllama/fsbot/commands/rs3search/Rs3HeadCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.rs3search;

src/main/java/dev/salmonllama/fsbot/commands/rs3search/Rs3LegsCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.rs3search;

src/main/java/dev/salmonllama/fsbot/commands/rs3search/Rs3MainhandCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.rs3search;

src/main/java/dev/salmonllama/fsbot/commands/rs3search/Rs3NeckCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.rs3search;

src/main/java/dev/salmonllama/fsbot/commands/rs3search/Rs3OffhandCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.rs3search;

src/main/java/dev/salmonllama/fsbot/commands/rs3search/Rs3SearchCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.rs3search;

src/main/java/dev/salmonllama/fsbot/commands/rs3search/Rs3SearchUtilities.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.rs3search;

src/main/java/dev/salmonllama/fsbot/commands/rs3search/Rs3TwohandedCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.rs3search;

src/main/java/dev/salmonllama/fsbot/commands/staff/AddColorCommand.java

@@ -1,15 +1,10 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.staff;
 
-import dev.salmonllama.fsbot.config.BotConfig;
-import dev.salmonllama.fsbot.database.controllers.ColorRoleController;
-import dev.salmonllama.fsbot.database.models.ColorRole;
 import dev.salmonllama.fsbot.guthix.*;
-import org.javacord.api.entity.permission.Role;
 
 import java.util.Arrays;
 import java.util.List;
@@ -24,22 +19,8 @@ public class AddColorCommand extends Command {
 
     @Override
     public void onCommand(CommandContext ctx) {
-        // Command takes only a role mention.
+        ctx.getApi().getOwner().thenAcceptAsync(owner -> {
-        ctx.getServer().ifPresentOrElse(server -> {
+            ctx.reply("This command is no longer active. An alternative is currently being developed. For more information, please contact " + owner.getDiscriminatedName());
-            if (server.getIdAsString().equals(BotConfig.HOME_SERVER)) {
+        });
-                List<Role> roles = ctx.getMessage().getMentionedRoles();
-                roles.forEach(role -> {
-                    ColorRole colorRole = new ColorRole.ColorRoleBuilder(role.getId())
-                            .setColor(role.getName())
-                            .setServerId(server.getId())
-                            .build();
-
-                    ColorRoleController.insert(colorRole);
-                    ctx.reply("Added color role:" + colorRole.toString());
-                });
-            } else {
-                ctx.reply("This command can only be used in the fashionscape server");
-            }
-        }, () -> ctx.reply("This command can only be used in the fashionscape server"));
     }
 }

src/main/java/dev/salmonllama/fsbot/commands/staff/BlacklistUserCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.staff;

src/main/java/dev/salmonllama/fsbot/commands/staff/EchoCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.staff;

src/main/java/dev/salmonllama/fsbot/commands/staff/EditMetaCommand.java

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2021 Aleksei Gryczewski
+ */
+
 package dev.salmonllama.fsbot.commands.staff;
 
 import com.vdurmont.emoji.EmojiParser;

src/main/java/dev/salmonllama/fsbot/commands/staff/ForceDeleteCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.staff;

src/main/java/dev/salmonllama/fsbot/commands/staff/GetOutfitCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.staff;

src/main/java/dev/salmonllama/fsbot/commands/staff/GetServersCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.staff;

src/main/java/dev/salmonllama/fsbot/commands/staff/OutfitInfoCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.staff;

src/main/java/dev/salmonllama/fsbot/commands/staff/RemoveOutfitCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.staff;
@@ -73,6 +72,7 @@ public class RemoveOutfitCommand extends Command {
 
                         EmbedBuilder log = new EmbedBuilder()
                                 .setTitle("Outfit Marked as Deleted")
+                                .setFooter(outfit.getId())
                                 .setThumbnail(outfit.getLink())
                                 .setColor(Color.RED)
                                 .addField("Deleted By:", ctx.getAuthor().getDiscriminatedName());

src/main/java/dev/salmonllama/fsbot/commands/staff/RestoreOutfitCommand.java

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2021 Aleksei Gryczewski
+ */
+
 package dev.salmonllama.fsbot.commands.staff;
 
 import com.vdurmont.emoji.EmojiParser;
@@ -69,6 +73,7 @@ public class RestoreOutfitCommand extends Command {
 
                         EmbedBuilder log = new EmbedBuilder()
                                 .setTitle("Outfit Restored as Active")
+                                .setFooter(outfit.getId())
                                 .setThumbnail(outfit.getLink())
                                 .setColor(Color.BLUE)
                                 .addField("Restored By:", ctx.getAuthor().getDiscriminatedName());

src/main/java/dev/salmonllama/fsbot/commands/staff/RetagCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.staff;
@@ -77,6 +76,7 @@ public class RetagCommand extends Command {
 
                             EmbedBuilder log = new EmbedBuilder()
                                     .setTitle("Outfit Retagged")
+                                    .setFooter(outfit.getId())
                                     .setColor(Color.YELLOW)
                                     .setThumbnail(outfit.getLink())
                                     .addField("New tag:", newTag);

src/main/java/dev/salmonllama/fsbot/commands/staff/SetStatusCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.staff;

src/main/java/dev/salmonllama/fsbot/commands/staff/WelcomeMessageCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.commands.staff;

src/main/java/dev/salmonllama/fsbot/config/BotConfig.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 // Shoutout to Kaaz (again) for a kickass config service: https://github.com/Kaaz/ConfigurationBuilder
@@ -16,16 +15,13 @@ import java.nio.file.Paths;
 
 public class BotConfig {
     @ConfigurationOption
-    public static String TOKEN = "token-goes-here";
+    public static String DB_ADDR = "SQLite connection address here";
 
     @ConfigurationOption
-    public static String DB_ADDR = "fsbot.db";
+    public static String DB_NAME = "SQLite database name here";
 
     @ConfigurationOption
-    public static String DB_NAME = "fsbot";
+    public static String DEFAULT_PREFIX = "default prefix here";
-
-    @ConfigurationOption
-    public static String DEFAULT_PREFIX = "~";
 
     @ConfigurationOption
     public static String BOT_OWNER = "owner's id here";
@@ -69,12 +65,6 @@ public class BotConfig {
     @ConfigurationOption
     public static String MEMBER_ROLE = "member role id here";
 
-    @ConfigurationOption
-    public static String IMGUR_ID = "imgur_id_here";
-
-    @ConfigurationOption
-    public static String IMGUR_BEARER = "imgur bearer here";
-
     @ConfigurationOption
     public static String DEFAULT_REACTION = ":heartpulse:";
 

src/main/java/dev/salmonllama/fsbot/config/SecretManager.java

@@ -0,0 +1,28 @@
+package dev.salmonllama.fsbot.config;
+
+import java.io.IOException;
+
+import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
+
+public enum SecretManager {
+    DISCORD_TOKEN   ("projects/fashionscapers-212707/secrets/fs_discord_token/versions/1"),
+    IMGUR_ID        ("projects/fashionscapers-212707/secrets/fs_imgur_client_id/versions/1"),
+    IMGUR_BEARER    ("projects/fashionscapers-212707/secrets/fs_imgur_bearer_token/versions/1")
+    ;
+
+    private final String resourceId;
+
+    SecretManager(String resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public String getPlainText() {
+        try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
+            return client.accessSecretVersion(this.resourceId).getPayload().getData().toStringUtf8();
+        } catch (IOException e) {
+            e.printStackTrace(); // TODO: Add plain text error message to log to console
+            System.exit(1); // Secrets are integral to full operation, crash if not retrieved properly.
+            return null;
+        }
+    }
+}

src/main/java/dev/salmonllama/fsbot/database/DatabaseModel.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.database;

src/main/java/dev/salmonllama/fsbot/database/DatabaseProvider.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 // Heavily inspired by Kaaz's Emily database connection: https://github.com/Kaaz/DiscordBot/tree/master/src/main/java/emily/db
@@ -9,9 +8,12 @@ package dev.salmonllama.fsbot.database;
 import dev.salmonllama.fsbot.exceptions.UnknownParameterException;
 import dev.salmonllama.fsbot.config.BotConfig;
 import dev.salmonllama.fsbot.utilities.Constants;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sqlite.javax.SQLiteConnectionPoolDataSource;
 
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.sql.*;
 
 public class DatabaseProvider {
@@ -19,10 +21,15 @@ public class DatabaseProvider {
     private final String DB_NAME;
     private Connection c;
 
+    private final static Logger logger = LoggerFactory.getLogger(DatabaseProvider.class);
+
     public DatabaseProvider(String dbName) {
         DB_NAME = dbName;
-        String PATH = Paths.get(Constants.BOT_FOLDER.toString(), Constants.DB_NAME).toString();
+        Path addr = Path.of(Constants.BOT_FOLDER.toString(), BotConfig.DB_ADDR);
-        DB_ADDR = "jdbc:sqlite:".concat(PATH);
+        DB_ADDR = "jdbc:sqlite:".concat(addr.toString());
+
+        logger.info("Initializing database...");
+        logger.info(DB_ADDR);
     }
 
     private Connection createConnection() {

src/main/java/dev/salmonllama/fsbot/database/FSDB.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 // Heavily inspired by Kaaz's Emily database connection: https://github.com/Kaaz/DiscordBot/tree/master/src/main/java/emily/db
@@ -39,7 +38,7 @@ public class FSDB {
     private static void prepareTables() {
         try {
             get().query(Outfit.schema());
-            get().query(ColorRole.schema());
+//            get().query(ColorRole.schema());
             get().query(GalleryChannel.schema());
             get().query(ServerConfig.schema());
             get().query(ServerBlacklist.schema());

src/main/java/dev/salmonllama/fsbot/database/controllers/ColorRoleController.java

@@ -1,7 +1,10 @@
+/*
+ * Copyright (c) 2021 Aleksei Gryczewski
+ */
+
 package dev.salmonllama.fsbot.database.controllers;
 
 import dev.salmonllama.fsbot.database.FSDB;
-import dev.salmonllama.fsbot.database.models.ColorRole;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -13,7 +16,7 @@ import java.util.concurrent.CompletionException;
 
 public class ColorRoleController {
     // Need insert, get by color, exists by color, exists by role, get by server, count, and delete
-    public static CompletableFuture<Void> insert(ColorRole cr) {
+/*    public static CompletableFuture<Void> insert(ColorRole cr) {
         return CompletableFuture.runAsync(() -> {
             try {
                 insertExec(cr);
@@ -172,5 +175,5 @@ public class ColorRoleController {
                 .setServerId(rs.getLong("server_id"))
                 .setColor(rs.getString("color"))
                 .build();
-    }
+    }*/
 }

src/main/java/dev/salmonllama/fsbot/database/controllers/GalleryController.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.database.controllers;

src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.database.controllers;

src/main/java/dev/salmonllama/fsbot/database/controllers/ServerBlacklistController.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.database.controllers;

src/main/java/dev/salmonllama/fsbot/database/controllers/ServerConfigController.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.database.controllers;

src/main/java/dev/salmonllama/fsbot/database/controllers/StaticPermissionController.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.database.controllers;

src/main/java/dev/salmonllama/fsbot/database/controllers/UserBlacklistController.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.database.controllers;

src/main/java/dev/salmonllama/fsbot/database/models/GalleryChannel.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.database.models;

src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.database.models;

src/main/java/dev/salmonllama/fsbot/database/models/ServerBlacklist.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.database.models;

src/main/java/dev/salmonllama/fsbot/database/models/ServerConfig.java

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2021 Aleksei Gryczewski
+ */
+
 package dev.salmonllama.fsbot.database.models;
 
 import dev.salmonllama.fsbot.database.DatabaseModel;

src/main/java/dev/salmonllama/fsbot/database/models/StaticPermission.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.database.models;

src/main/java/dev/salmonllama/fsbot/database/models/UserBlacklist.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.database.models;

src/main/java/dev/salmonllama/fsbot/endpoints/imgur/ImgurAPIConnection.java

@@ -1,11 +1,10 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.endpoints.imgur;
 
-import dev.salmonllama.fsbot.config.BotConfig;
+import dev.salmonllama.fsbot.config.SecretManager;
 import okhttp3.*;
 import org.json.JSONObject;
 
@@ -23,8 +22,8 @@ public class ImgurAPIConnection {
     private final Request.Builder requestBuilder;
 
     public ImgurAPIConnection() {
-        CLIENT_ID = BotConfig.IMGUR_ID;
+        CLIENT_ID = SecretManager.IMGUR_ID.getPlainText();
-        BEARER_TOKEN = BotConfig.IMGUR_BEARER;
+        BEARER_TOKEN = SecretManager.IMGUR_BEARER.getPlainText();
 
         client = new OkHttpClient().newBuilder().build();
         requestBuilder = new Request.Builder();

src/main/java/dev/salmonllama/fsbot/endpoints/imgur/ImgurUpload.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.endpoints.imgur;

src/main/java/dev/salmonllama/fsbot/endpoints/scapefashion/ScapeFashionConnection.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.endpoints.scapefashion;

src/main/java/dev/salmonllama/fsbot/endpoints/scapefashion/ScapeFashionImages.java

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2021 Aleksei Gryczewski
+ */
+
 package dev.salmonllama.fsbot.endpoints.scapefashion;
 
 public class ScapeFashionImages {

src/main/java/dev/salmonllama/fsbot/endpoints/scapefashion/ScapeFashionItem.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.endpoints.scapefashion;

src/main/java/dev/salmonllama/fsbot/endpoints/scapefashion/ScapeFashionResult.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.endpoints.scapefashion;

src/main/java/dev/salmonllama/fsbot/endpoints/scapefashion/ScapeFashionSlotOsrs.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.endpoints.scapefashion;

src/main/java/dev/salmonllama/fsbot/endpoints/scapefashion/ScapeFashionSlotRs3.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.endpoints.scapefashion;

src/main/java/dev/salmonllama/fsbot/endpoints/scapefashion/ScapeFashionWiki.java

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2021 Aleksei Gryczewski
+ */
+
 package dev.salmonllama.fsbot.endpoints.scapefashion;
 
 public class ScapeFashionWiki {

src/main/java/dev/salmonllama/fsbot/exceptions/FailedUploadException.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.exceptions;

src/main/java/dev/salmonllama/fsbot/exceptions/UnknownParameterException.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.exceptions;

src/main/java/dev/salmonllama/fsbot/guthix/Command.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.guthix;

src/main/java/dev/salmonllama/fsbot/guthix/CommandCategory.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.guthix;

src/main/java/dev/salmonllama/fsbot/guthix/CommandContext.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.guthix;

src/main/java/dev/salmonllama/fsbot/guthix/CommandPermission.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.guthix;

src/main/java/dev/salmonllama/fsbot/guthix/Guthix.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.guthix;

src/main/java/dev/salmonllama/fsbot/guthix/PermissionManager.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.guthix;

src/main/java/dev/salmonllama/fsbot/guthix/PermissionType.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.guthix;

src/main/java/dev/salmonllama/fsbot/guthix/Registry.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.guthix;

src/main/java/dev/salmonllama/fsbot/guthix/RegistryCommand.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.guthix;

src/main/java/dev/salmonllama/fsbot/listeners/AchievementListener.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.listeners;

src/main/java/dev/salmonllama/fsbot/listeners/ForceDeleteAttachedListener.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.listeners;

src/main/java/dev/salmonllama/fsbot/listeners/ImageListener.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.listeners;
@@ -86,7 +85,16 @@ public class ImageListener implements MessageCreateListener {
                     .setDeleteHash(upload.getDeleteHash());
 
             storeAndLog(event, channel, outfitBuilder);
-        }).exceptionally(ExceptionLogger.get());
+        }).exceptionally(e -> {
+            EmbedBuilder errorEmbed = new EmbedBuilder()
+                    .setTitle("Error!")
+                    .setColor(Color.RED)
+                    .setAuthor(event.getApi().getYourself())
+                    .setDescription(e.getMessage());
+
+            event.getChannel().sendMessage(errorEmbed);
+            return null;
+        });
     }
 
     private void store(MessageCreateEvent event, ServerTextChannel channel, MessageAttachment image) {

src/main/java/dev/salmonllama/fsbot/listeners/NewMemberListener.java

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020. Aleksei Gryczewski
+ * Copyright (c) 2021 Aleksei Gryczewski
- * All rights reserved.
  */
 
 package dev.salmonllama.fsbot.listeners;