From 8b75992a32e52195bfb4d7d9a503f25dfc9267b0 Mon Sep 17 00:00:00 2001 From: Emotion Date: Tue, 14 Mar 2023 01:33:59 +1300 Subject: [PATCH 1/4] Updated CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index dd0f986..74b3a99 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,5 @@ # Modifications to the source code should be handled by the code review team -*.ts @EllieBotDevs/code-reviewers +*.java @EllieBotDevs/code-reviewers # Modifications to sensitive files should be reviewed by maintainers /.github/ @EllieBotDevs/dev-team From 7c325739afad8c6d403435cf8323ef335f56ada7 Mon Sep 17 00:00:00 2001 From: toastie_t0ast Date: Sat, 17 Jun 2023 13:00:28 +1200 Subject: [PATCH 2/4] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d4aa97e..905d8de 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# Ellie Discord Bot ©2018-2022 EllieBotDevs +# This project has moved homes all future code is now available at https://toastielab.dev/EllieBotDevs/Ellie-bot (please push any new changes to there as this may be archived at a later date) + +## Ellie Discord Bot ©2018-2022 EllieBotDevs [![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-) From 95a08abd35a11b4b3d7dd11624fdee82bdf559c0 Mon Sep 17 00:00:00 2001 From: Emotion Date: Mon, 21 Aug 2023 23:17:07 +1200 Subject: [PATCH 3/4] Updated some things in preparation for reset --- .idea/Ellie-bot.iml | 9 + .../shelved.patch | 328 ++++++++++++++++++ ...pdate_at_21_08_2023_11_04_pm__Changes_.xml | 4 + .idea/uiDesigner.xml | 124 +++++++ .idea/workspace.xml | 25 +- README.md | 6 +- .../ellie/listeners/EllieListener.java | 25 ++ 7 files changed, 503 insertions(+), 18 deletions(-) create mode 100644 .idea/Ellie-bot.iml create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_21_08_2023_11_04_pm_[Changes]/shelved.patch create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_21_08_2023_11_04_pm__Changes_.xml create mode 100644 .idea/uiDesigner.xml create mode 100644 src/main/java/net/elliebot/ellie/listeners/EllieListener.java diff --git a/.idea/Ellie-bot.iml b/.idea/Ellie-bot.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/Ellie-bot.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_21_08_2023_11_04_pm_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_21_08_2023_11_04_pm_[Changes]/shelved.patch new file mode 100644 index 0000000..20ea68e --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_21_08_2023_11_04_pm_[Changes]/shelved.patch @@ -0,0 +1,328 @@ +Index: pom.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n 4.0.0\r\n\r\n net.elliebot.ellie\r\n EllieBot\r\n 5.0.0\r\n\r\n \r\n 11\r\n 11\r\n \r\n \r\n \r\n net.dv8tion\r\n JDA\r\n 4.4.1_353\r\n \r\n \r\n \r\n \r\n dv8tion\r\n m2-dv8tion\r\n https://m2.dv8tion.net/releases\r\n \r\n \r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/pom.xml b/pom.xml +--- a/pom.xml (revision 8b75992a32e52195bfb4d7d9a503f25dfc9267b0) ++++ b/pom.xml (date 1681114047837) +@@ -18,6 +18,11 @@ + JDA + 4.4.1_353 + ++ ++ ch.qos.logback ++ logback-classic ++ 1.2.8 ++ + + + +Index: src/main/java/net/elliebot/ellie/commands/UserInfoCommand.java +=================================================================== +diff --git a/src/main/java/net/elliebot/ellie/commands/UserInfoCommand.java b/src/main/java/net/elliebot/ellie/commands/UserInfoCommand.java +deleted file mode 100644 +--- a/src/main/java/net/elliebot/ellie/commands/UserInfoCommand.java (revision 8b75992a32e52195bfb4d7d9a503f25dfc9267b0) ++++ /dev/null (revision 8b75992a32e52195bfb4d7d9a503f25dfc9267b0) +@@ -1,8 +0,0 @@ +-package net.elliebot.ellie.commands; +- +-/** +- * +- * @author EllieBotDevs (devs@elliebot.net) +- */ +-public class UserInfoCommand { +-} +Index: src/main/java/net/elliebot/ellie/events/HelloEvent.java +=================================================================== +diff --git a/src/main/java/net/elliebot/ellie/events/HelloEvent.java b/src/main/java/net/elliebot/ellie/events/HelloEvent.java +deleted file mode 100644 +--- a/src/main/java/net/elliebot/ellie/events/HelloEvent.java (revision 8b75992a32e52195bfb4d7d9a503f25dfc9267b0) ++++ /dev/null (revision 8b75992a32e52195bfb4d7d9a503f25dfc9267b0) +@@ -1,21 +0,0 @@ +-package net.elliebot.ellie.events; +- +-import net.dv8tion.jda.api.entities.Guild; +-import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; +-import net.dv8tion.jda.api.hooks.ListenerAdapter; +- +-/** +- * +- * @author EllieBotDevs (devs@elliebot.net) +- */ +-public class HelloEvent extends ListenerAdapter { +- +- public void onGuildMessageReceived(GuildMessageReceivedEvent event){ +- String messageSent = event.getMessage().getContentRaw(); +- if(messageSent.equalsIgnoreCase("Hi")){ +- event.getChannel().sendMessage("hello").queue(); +- } +- } +- +- +-} +Index: src/main/java/net/elliebot/ellie/listeners/EllieListener.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/src/main/java/net/elliebot/ellie/listeners/EllieListener.java b/src/main/java/net/elliebot/ellie/listeners/EllieListener.java +new file mode 100644 +--- /dev/null (date 1681113991840) ++++ b/src/main/java/net/elliebot/ellie/listeners/EllieListener.java (date 1681113991840) +@@ -0,0 +1,25 @@ ++package net.elliebot.ellie.listeners; ++ ++import net.dv8tion.jda.api.entities.Message; ++import net.dv8tion.jda.api.entities.MessageChannel; ++import net.dv8tion.jda.api.events.message.MessageReceivedEvent; ++import net.dv8tion.jda.api.hooks.ListenerAdapter; ++ ++public class EllieListener extends ListenerAdapter ++{ ++ @Override ++ public void onMessageReceived(MessageReceivedEvent event) ++ { ++ if (event.getAuthor().isBot()) return; ++ // We don't want to respond to other bot accounts, including ourself ++ Message message = event.getMessage(); ++ String content = message.getContentRaw(); ++ // getContentRaw() is an atomic getter ++ // getContentDisplay() is a lazy getter which modifies the content for e.g. console view (strip discord formatting) ++ if (content.equals("!ping")) ++ { ++ MessageChannel channel = event.getChannel(); ++ channel.sendMessage("Pong!").queue(); // Important to call .queue() on the RestAction returned by sendMessage(...) ++ } ++ } ++} +\ No newline at end of file +Index: .idea/misc.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/misc.xml b/.idea/misc.xml +--- a/.idea/misc.xml (revision 8b75992a32e52195bfb4d7d9a503f25dfc9267b0) ++++ b/.idea/misc.xml (date 1692615499283) +@@ -1,4 +1,3 @@ +- + + + +Index: .idea/workspace.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n 1663054617242\r\n \r\n \r\n \r\n \r\n \r\n \r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/workspace.xml b/.idea/workspace.xml +--- a/.idea/workspace.xml (revision 8b75992a32e52195bfb4d7d9a503f25dfc9267b0) ++++ b/.idea/workspace.xml (date 1681114047836) +@@ -5,14 +5,25 @@ + + + +- +- ++ ++ ++ ++ ++ ++ + + + ++ ++ + + + + ++ { ++ "lastFilter": { ++ "state": "OPEN" ++ } ++} ++ ++ ++ + + +@@ -38,12 +62,13 @@ + +- { ++ "keyToString": { ++ "RunOnceActivity.OpenProjectViewOnStart": "true", ++ "RunOnceActivity.ShowReadmeOnStart": "true", ++ "last_opened_file_path": "C:/Users/JDRCa/Desktop/Projects/Ellie-bot" + } +-}]]> ++} + + + +@@ -53,17 +78,85 @@ + ++ ++ 1678707300888 ++ ++ ++ 1678708055154 ++ ++ ++ 1678708239367 ++ ++ ++ 1678710846454 ++ ++ + ++ + + ++ ++ ++ ++ ++ ++ + +\ No newline at end of file +Index: .idea/vcs.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n \r\n \r\n \r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/vcs.xml b/.idea/vcs.xml +--- a/.idea/vcs.xml (revision 8b75992a32e52195bfb4d7d9a503f25dfc9267b0) ++++ b/.idea/vcs.xml (date 1681114047834) +@@ -1,6 +1,6 @@ + + + +- ++ + + +\ No newline at end of file +Index: src/main/java/net/elliebot/ellie/main.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>package net.elliebot.ellie;\r\n\r\nimport net.elliebot.ellie.events.HelloEvent;\r\nimport net.dv8tion.jda.api.JDA;\r\nimport net.dv8tion.jda.api.JDABuilder;\r\nimport net.dv8tion.jda.api.entities.Activity;\r\nimport net.dv8tion.jda.api.utils.Compression;\r\nimport net.dv8tion.jda.api.utils.cache.CacheFlag;\r\n\r\n/**\r\n *\r\n * @author EllieBotDevs (devs@elliebot.net)\r\n */\r\npublic class main {\r\n\r\n public static void main(String args[]) throws Exception{\r\n\r\n JDA jda = JDABuilder.createDefault(\"Bot-Token\").build();\r\n\r\n jda.addEventListener(new HelloEvent());\r\n }\r\n\r\n\r\n}\r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/src/main/java/net/elliebot/ellie/main.java b/src/main/java/net/elliebot/ellie/main.java +--- a/src/main/java/net/elliebot/ellie/main.java (revision 8b75992a32e52195bfb4d7d9a503f25dfc9267b0) ++++ b/src/main/java/net/elliebot/ellie/main.java (date 1681113991841) +@@ -1,6 +1,6 @@ + package net.elliebot.ellie; + +-import net.elliebot.ellie.events.HelloEvent; ++import net.elliebot.ellie.listeners.EllieListener; + import net.dv8tion.jda.api.JDA; + import net.dv8tion.jda.api.JDABuilder; + import net.dv8tion.jda.api.entities.Activity; +@@ -17,8 +17,7 @@ + + JDA jda = JDABuilder.createDefault("Bot-Token").build(); + +- jda.addEventListener(new HelloEvent()); ++ jda.addEventListener(new EllieListener()); + } +- + + } diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_21_08_2023_11_04_pm__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_21_08_2023_11_04_pm__Changes_.xml new file mode 100644 index 0000000..bcc0274 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_21_08_2023_11_04_pm__Changes_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f6f2462..a4545ec 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,9 +5,7 @@ - - - +