Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V8 feature/exception handling #132

Merged
merged 2 commits into from
Apr 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
org.gradle.java.home=C\:\\Program Files\\Java\\jdk1.8.0_144org.gradle.java.home=C\:\\Program Files\\Java\\jdk1.8.0_144
1 change: 0 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
*/

rootProject.name = "FlamesPlus"

3 changes: 3 additions & 0 deletions src/main/java/com/severalcircles/flames/FLogger.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

package com.severalcircles.flames;

import com.severalcircles.flames.system.exception.ExceptionID;

import java.util.logging.Level;

/**
Expand All @@ -13,6 +15,7 @@
* @version 8
* @since Flames 8
*/
@ExceptionID(value = "502")
@SuppressWarnings("SameReturnValue")
public class FLogger {
public static final String ANSI_RESET = "\u001B[0m";
Expand Down
14 changes: 10 additions & 4 deletions src/main/java/com/severalcircles/flames/Flames.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

package com.severalcircles.flames;

import com.severalcircles.flames.data.SystemDataManager;
import com.severalcircles.flames.data.user.UserDataManager;
import com.severalcircles.flames.events.EventManager;
import com.severalcircles.flames.interactions.FlamesInteractionManager;
import com.severalcircles.flames.system.manager.*;
import com.severalcircles.flames.system.exception.ExceptionID;
import com.severalcircles.flames.system.exception.java.FlamesConnectException;
import com.severalcircles.flames.system.exception.MessageCodes;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.JDABuilder;
import net.dv8tion.jda.api.requests.GatewayIntent;
Expand All @@ -23,6 +23,7 @@
* @version 8
* @since Flames Flames 2
*/
@ExceptionID("501")
public class Flames {
private static JDA api;
private static final FLogger flogger = new FLogger();
Expand All @@ -39,6 +40,7 @@ public class Flames {
*/
public static void main(String[] args) {
flogger.finest("Secret message for the devs: I'm a flamingo.");
// flogger.severe(MessageCodes.generateCodeError(new FlamesException("Based")));
try {
InputStream is = Flames.class.getClassLoader().getResourceAsStream("version.properties");
versionProp.load(is);
Expand All @@ -65,6 +67,9 @@ public static void main(String[] args) {
} catch (IllegalArgumentException e) {
getFlogger().severe("FlamesToken environment variable not found. Please set the FlamesToken environment variable to your bot's token.");
System.exit(1);
} catch (Exception e) {
Flames.getFlogger().severe(e.getMessage() + " [" + MessageCodes.generateCodeError(new FlamesConnectException(e.getMessage())) + "]");
System.exit(1);
}
flogger.fine("Flames is now online!");
flogger.resetLastClass();
Expand All @@ -89,6 +94,7 @@ public static void main(String[] args) {
});
flogger.info("Starting secondary managers");
managers2.add(new UserDataManager());
managers2.add(new FlamesReportManager());
// managers2.add(TodayManager.newDay());
managers2.forEach(manager -> {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package com.severalcircles.flames.data.user;

import com.severalcircles.flames.system.exception.AlreadyCollectedException;
import com.severalcircles.flames.system.exception.flames.AlreadyCollectedException;
import net.dv8tion.jda.api.entities.User;

import java.time.Instant;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,36 @@
package com.severalcircles.flames.events;

import com.severalcircles.flames.Flames;
import com.severalcircles.flames.data.user.ConsentManager;
import com.severalcircles.flames.data.user.UserDataManager;
import com.severalcircles.flames.interactions.FlamesInteractionManager;
import com.severalcircles.flames.system.exception.ConsentException;
import com.severalcircles.flames.system.exception.ExceptionID;
import com.severalcircles.flames.system.exception.FlamesExceptionHandler;
import com.severalcircles.flames.system.exception.flames.FlamesException;
import com.severalcircles.flames.system.exception.runtime.FlamesRuntimeException;
import com.severalcircles.flames.system.manager.ConsentManager;
import com.severalcircles.flames.system.manager.UserDataManager;
import com.severalcircles.flames.system.manager.FlamesInteractionManager;
import com.severalcircles.flames.system.exception.flames.ConsentException;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;

import java.io.IOException;

@ExceptionID("601")
public class InteractionEvents extends ListenerAdapter {
@Override
public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) {
super.onSlashCommandInteraction(event);
Flames.getFlogger().fine("Received slash command interaction " + event.getName());
try {
FlamesInteractionManager.getCommandInteraction(event.getName()).execute(event, new UserDataManager().loadUser(event.getUser()));
} catch (IOException | ConsentException e) {
throw new RuntimeException(e);
Flames.getFlogger().finest("try");
FlamesInteractionManager.getCommandInteraction(event.getName()).execute(event, UserDataManager.flames());
// } catch (IOException | ConsentException e) {
// Flames.getFlogger().finest("catch");
// event.getInteraction().replyEmbeds(new FlamesExceptionHandler(new FlamesException(e.getMessage())).handle()).complete();
} finally {
Flames.getFlogger().finest("finally");
// event.getInteraction().deferReply().complete();
}
}

Expand Down
11 changes: 6 additions & 5 deletions src/main/java/com/severalcircles/flames/events/MessageEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@
package com.severalcircles.flames.events;

import com.severalcircles.flames.Flames;
import com.severalcircles.flames.conversations.ConversationManager;
import com.severalcircles.flames.data.user.ConsentManager;
import com.severalcircles.flames.system.exception.ExceptionID;
import com.severalcircles.flames.system.manager.ConversationManager;
import com.severalcircles.flames.system.manager.ConsentManager;
import com.severalcircles.flames.data.user.FlamesUser;
import com.severalcircles.flames.data.user.UserDataManager;
import com.severalcircles.flames.system.exception.ConsentException;
import com.severalcircles.flames.system.manager.UserDataManager;
import com.severalcircles.flames.system.exception.flames.ConsentException;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;

import java.io.IOException;

@ExceptionID("602")
public class MessageEvent extends ListenerAdapter {
@Override
public void onMessageReceived(@NotNull MessageReceivedEvent event) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
package com.severalcircles.flames.events;

import com.severalcircles.flames.Flames;
import com.severalcircles.flames.system.exception.ExceptionID;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;

@ExceptionID("603")
public class StatusChange extends ListenerAdapter {
@Override
public void onStatusChange(@NotNull net.dv8tion.jda.api.events.StatusChangeEvent event) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

package com.severalcircles.flames.frontend;

import com.severalcircles.flames.system.exception.ExceptionID;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.MessageEmbed;

Expand All @@ -15,6 +16,7 @@
* @version 8
* @since Flames 8
*/
@ExceptionID("701")
@Embed(name = "Consent")
public class ConsentEmbed extends FlamesEmbed {

Expand All @@ -25,7 +27,7 @@ public ConsentEmbed(Locale locale) {
@Override
public MessageEmbed get() {
return new EmbedBuilder()
.setTitle(local.getString("title"), "https://flames.severalcircles.com/privacy-policy")
.setTitle(local.getString("title.user"), "https://flames.severalcircles.com/privacy-policy")
.setDescription(local.getString("description"))
.addField(local.getString("helpful1title"), local.getString("helpful1text"), false)
.addField(local.getString("helpful2title"), local.getString("helpful2text"), true)
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/severalcircles/flames/frontend/DayPart.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

package com.severalcircles.flames.frontend;

import com.severalcircles.flames.system.exception.ExceptionID;

@ExceptionID("702")
public enum DayPart {
EARLY_MORNING(4, 6), MORNING(7, 11), AFTERNOON(12, 5), EVENING(6, 9), NIGHT(10, 12), MIDNIGHT(1, 3);
private final double hourStart;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

package com.severalcircles.flames.frontend;

import com.severalcircles.flames.system.exception.ExceptionID;

import net.dv8tion.jda.api.entities.MessageEmbed;

import java.util.Locale;
Expand All @@ -12,9 +14,10 @@
* Abstract class for embeds that are used in the bot. Embeds are used to display information in a more visually appealing way than text.
* big chungus, big chungus, big chungus, big big chungus
* @author Several Circles
* @version 83333
* @version 8
* @since Flames 8
*/
@ExceptionID("700")
public abstract class FlamesEmbed {
ResourceBundle local;
public FlamesEmbed(Locale locale) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* Copyright (c) 2023 Several Circles
*/

package com.severalcircles.flames.frontend;

import com.severalcircles.flames.Flames;
import com.severalcircles.flames.system.exception.ExceptionID;
import com.severalcircles.flames.system.exception.MessageCodes;
import com.severalcircles.flames.system.exception.flames.FlamesException;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.MessageEmbed;

import java.awt.*;
import java.time.Instant;
import java.util.Locale;

@ExceptionID("703")
@Embed(name="FlamesException")
public class FlamesExceptionEmbed extends FlamesEmbed{
FlamesException e;
String code;
public FlamesExceptionEmbed(Locale locale, FlamesException e) {
super(locale);
this.e = e;
code = MessageCodes.generateCodeError(e);
}

@Override
public MessageEmbed get() {
String title = local.getString("title." + e.getClass().getSimpleName());
String description;
try {
description = local.getString("description." + e.getClass().getSimpleName());
} catch (NullPointerException ignored) {
description = e.getMessage();
}
String helpfultitle = local.getString("helpful.title." + e.getClass().getSimpleName());
try {
helpfultitle = local.getString("helpful.title." + e.getClass().getSimpleName());
} catch(NullPointerException ignored) {
helpfultitle = local.getString("helpful.title.default");
}String helpfuldesc = local.getString("helpful.description." + e.getClass().getSimpleName());
try {
helpfultitle = local.getString("helpful.description." + e.getClass().getSimpleName());
} catch(NullPointerException ignored) {
helpfultitle = local.getString("helpful.description.default");
}

return new EmbedBuilder()
.setAuthor(String.format(local.getString("author"), code), null, Flames.getApi().getSelfUser().getAvatarUrl())
.setTitle(title)
.setDescription(description)
.addField(helpfultitle, helpfuldesc, false)
.setTimestamp(Instant.now())
.setColor(Color.RED)
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@

package com.severalcircles.flames.frontend;

import com.severalcircles.flames.system.exception.ExceptionID;
import net.dv8tion.jda.api.entities.MessageEmbed;

import java.util.Locale;

@ExceptionID("704")
@Embed(name = "WelcomeBack")
public class WelcomeBackEmbed extends FlamesEmbed {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@
* @version 8
* @since Flames 5
*/
package com.severalcircles.flames.frontend;
@ExceptionID("400")
package com.severalcircles.flames.frontend;

import com.severalcircles.flames.system.exception.ExceptionID;
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
package com.severalcircles.flames.interactions;

import com.severalcircles.flames.data.user.FlamesUser;
import com.severalcircles.flames.system.exception.ExceptionID;
import net.dv8tion.jda.api.interactions.Interaction;

@ExceptionID("800")
public abstract class FlamesInteraction {
private Interaction interaction;
private FlamesUser user;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@

import com.severalcircles.flames.data.user.FlamesUser;
import com.severalcircles.flames.frontend.DayPart;
import com.severalcircles.flames.system.exception.ExceptionID;
import net.dv8tion.jda.api.interactions.components.ActionRow;
import net.dv8tion.jda.api.interactions.components.buttons.ButtonInteraction;
import net.dv8tion.jda.api.interactions.components.text.TextInput;
import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
import net.dv8tion.jda.api.interactions.modals.Modal;

import java.util.ResourceBundle;

@ExceptionID("820")
public class AnswerQuestionButton extends FlamesButtonInteraction {
private DayPart dayPart;
public AnswerQuestionButton(DayPart dayPart) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
package com.severalcircles.flames.interactions.button;

import com.severalcircles.flames.data.user.FlamesUser;
import com.severalcircles.flames.data.user.UserDataManager;
import com.severalcircles.flames.system.exception.ExceptionID;
import com.severalcircles.flames.system.manager.UserDataManager;
import net.dv8tion.jda.api.interactions.components.buttons.ButtonInteraction;

import java.io.IOException;

@ExceptionID("820")
public class ConsentButtons extends FlamesButtonInteraction {
@Override
public void execute(ButtonInteraction interaction, FlamesUser user) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@

import com.severalcircles.flames.data.user.FlamesUser;
import com.severalcircles.flames.interactions.FlamesInteraction;
import com.severalcircles.flames.system.exception.ExceptionID;
import net.dv8tion.jda.api.interactions.components.buttons.ButtonInteraction;

@ExceptionID("820")
public abstract class FlamesButtonInteraction extends FlamesInteraction {
public abstract void execute(ButtonInteraction interaction, FlamesUser user);
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
package com.severalcircles.flames.interactions.slash;

import com.severalcircles.flames.data.user.FlamesUser;
import com.severalcircles.flames.system.exception.ExceptionID;
import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction;
@ExceptionID("810")
@FlamesCommand(name = "based", description = "Based")
public class BasedCommand extends FlamesSlashCommand {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

import com.severalcircles.flames.Flames;
import com.severalcircles.flames.conversations.Conversation;
import com.severalcircles.flames.conversations.ConversationManager;
import com.severalcircles.flames.system.exception.ExceptionID;
import com.severalcircles.flames.system.manager.ConversationManager;
import com.severalcircles.flames.conversations.external.Tenor;
import com.severalcircles.flames.data.user.FlamesUser;
import net.dv8tion.jda.api.EmbedBuilder;
Expand All @@ -17,7 +18,7 @@
import java.util.Objects;
import java.util.Random;
import java.util.concurrent.atomic.AtomicReference;

@ExceptionID("810")
@FlamesCommand(name = "captionthis", description = "Captions this conversation")
public class CaptionThisCommand extends FlamesSlashCommand {
@Override
Expand Down
Loading