Updated some things in preparation for reset (#165)
This commit is contained in:
commit
4b28efc58c
7 changed files with 504 additions and 17 deletions
9
.idea/Ellie-bot.iml
Normal file
9
.idea/Ellie-bot.iml
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="JAVA_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
|
<exclude-output />
|
||||||
|
<content url="file://$MODULE_DIR$" />
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
</module>
|
|
@ -0,0 +1,328 @@
|
||||||
|
Index: pom.xml
|
||||||
|
IDEA additional info:
|
||||||
|
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
|
||||||
|
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\r\n xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\r\n <modelVersion>4.0.0</modelVersion>\r\n\r\n <groupId>net.elliebot.ellie</groupId>\r\n <artifactId>EllieBot</artifactId>\r\n <version>5.0.0</version>\r\n\r\n <properties>\r\n <maven.compiler.source>11</maven.compiler.source>\r\n <maven.compiler.target>11</maven.compiler.target>\r\n </properties>\r\n <dependencies>\r\n <dependency>\r\n <groupId>net.dv8tion</groupId>\r\n <artifactId>JDA</artifactId>\r\n <version>4.4.1_353</version>\r\n </dependency>\r\n </dependencies>\r\n <repositories>\r\n <repository>\r\n <id>dv8tion</id>\r\n <name>m2-dv8tion</name>\r\n <url>https://m2.dv8tion.net/releases</url>\r\n </repository>\r\n </repositories>\r\n</project>
|
||||||
|
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 @@
|
||||||
|
<artifactId>JDA</artifactId>
|
||||||
|
<version>4.4.1_353</version>
|
||||||
|
</dependency>
|
||||||
|
+ <dependency>
|
||||||
|
+ <groupId>ch.qos.logback</groupId>
|
||||||
|
+ <artifactId>logback-classic</artifactId>
|
||||||
|
+ <version>1.2.8</version>
|
||||||
|
+ </dependency>
|
||||||
|
</dependencies>
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
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
|
||||||
|
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"ExternalStorageConfigurationManager\" enabled=\"true\" />\r\n <component name=\"MavenProjectsManager\">\r\n <option name=\"originalFiles\">\r\n <list>\r\n <option value=\"$PROJECT_DIR$/pom.xml\" />\r\n </list>\r\n </option>\r\n </component>\r\n <component name=\"ProjectRootManager\" version=\"2\" languageLevel=\"JDK_16\" default=\"true\" project-jdk-name=\"temurin-16\" project-jdk-type=\"JavaSDK\" />\r\n</project>
|
||||||
|
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 @@
|
||||||
|
-<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
|
<component name="MavenProjectsManager">
|
||||||
|
Index: .idea/workspace.xml
|
||||||
|
IDEA additional info:
|
||||||
|
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
|
||||||
|
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"SELECTIVE\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"61990dc1-c961-40f0-8a8d-ab716806f62a\" name=\"Changes\" comment=\"\">\r\n <change beforePath=\"$PROJECT_DIR$/src/main/java/net/elliebot/ellie/commands/UserInfoCommand.java\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/src/main/java/net/elliebot/ellie/commands/UserInfoCommand.java\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/src/main/java/net/elliebot/ellie/events/HelloEvent.java\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/src/main/java/net/elliebot/ellie/events/HelloEvent.java\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/src/main/java/net/elliebot/ellie/main.java\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/src/main/java/net/elliebot/ellie/main.java\" afterDir=\"false\" />\r\n </list>\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_BRANCH_BY_REPOSITORY\">\r\n <map>\r\n <entry key=\"$PROJECT_DIR$\" value=\"main\" />\r\n </map>\r\n </option>\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"MarkdownSettingsMigration\">\r\n <option name=\"stateVersion\" value=\"1\" />\r\n </component>\r\n <component name=\"MavenImportPreferences\">\r\n <option name=\"generalSettings\">\r\n <MavenGeneralSettings>\r\n <option name=\"useMavenConfig\" value=\"true\" />\r\n </MavenGeneralSettings>\r\n </option>\r\n </component>\r\n <component name=\"ProjectId\" id=\"2EhjCsIvMNE0DmvWtphzqS6Qpgr\" />\r\n <component name=\"ProjectLevelVcsManager\" settingsEditedManually=\"true\" />\r\n <component name=\"ProjectViewState\">\r\n <option name=\"hideEmptyMiddlePackages\" value=\"true\" />\r\n <option name=\"showLibraryContents\" value=\"true\" />\r\n </component>\r\n <component name=\"PropertiesComponent\"><![CDATA[{\r\n \"keyToString\": {\r\n \"RunOnceActivity.OpenProjectViewOnStart\": \"true\",\r\n \"RunOnceActivity.ShowReadmeOnStart\": \"true\"\r\n }\r\n}]]></component>\r\n <component name=\"SpellCheckerSettings\" RuntimeDictionaries=\"0\" Folders=\"0\" CustomDictionaries=\"0\" DefaultDictionary=\"application-level\" UseSingleDictionary=\"true\" transferred=\"true\" />\r\n <component name=\"TaskManager\">\r\n <task active=\"true\" id=\"Default\" summary=\"Default task\">\r\n <changelist id=\"61990dc1-c961-40f0-8a8d-ab716806f62a\" name=\"Changes\" comment=\"\" />\r\n <created>1663054617242</created>\r\n <option name=\"number\" value=\"Default\" />\r\n <option name=\"presentableId\" value=\"Default\" />\r\n <updated>1663054617242</updated>\r\n </task>\r\n <servers />\r\n </component>\r\n <component name=\"Vcs.Log.Tabs.Properties\">\r\n <option name=\"TAB_STATES\">\r\n <map>\r\n <entry key=\"MAIN\">\r\n <value>\r\n <State />\r\n </value>\r\n </entry>\r\n </map>\r\n </option>\r\n </component>\r\n</project>
|
||||||
|
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 @@
|
||||||
|
</component>
|
||||||
|
<component name="ChangeListManager">
|
||||||
|
<list default="true" id="61990dc1-c961-40f0-8a8d-ab716806f62a" name="Changes" comment="">
|
||||||
|
- <change beforePath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/commands/UserInfoCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/commands/UserInfoCommand.java" afterDir="false" />
|
||||||
|
- <change beforePath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/events/HelloEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/events/HelloEvent.java" afterDir="false" />
|
||||||
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/listeners/EllieListener.java" afterDir="false" />
|
||||||
|
+ <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
|
||||||
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
+ <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
||||||
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/commands/UserInfoCommand.java" beforeDir="false" />
|
||||||
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/events/HelloEvent.java" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/main.java" afterDir="false" />
|
||||||
|
</list>
|
||||||
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
|
+ </component>
|
||||||
|
+ <component name="FileTemplateManagerImpl">
|
||||||
|
+ <option name="RECENT_TEMPLATES">
|
||||||
|
+ <list>
|
||||||
|
+ <option value="Class" />
|
||||||
|
+ </list>
|
||||||
|
+ </option>
|
||||||
|
</component>
|
||||||
|
<component name="Git.Settings">
|
||||||
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||||
|
@@ -22,6 +33,19 @@
|
||||||
|
</option>
|
||||||
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
|
</component>
|
||||||
|
+ <component name="GitHubPullRequestSearchHistory">{
|
||||||
|
+ "lastFilter": {
|
||||||
|
+ "state": "OPEN"
|
||||||
|
+ }
|
||||||
|
+}</component>
|
||||||
|
+ <component name="GithubPullRequestsUISettings">
|
||||||
|
+ <option name="selectedUrlAndAccountId">
|
||||||
|
+ <UrlAndAccount>
|
||||||
|
+ <option name="accountId" value="eab705c4-6cde-4103-a027-9cde06c6d147" />
|
||||||
|
+ <option name="url" value="https://github.com/EllieBotDevs/Ellie-bot.git" />
|
||||||
|
+ </UrlAndAccount>
|
||||||
|
+ </option>
|
||||||
|
+ </component>
|
||||||
|
<component name="MarkdownSettingsMigration">
|
||||||
|
<option name="stateVersion" value="1" />
|
||||||
|
</component>
|
||||||
|
@@ -38,12 +62,13 @@
|
||||||
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
|
<option name="showLibraryContents" value="true" />
|
||||||
|
</component>
|
||||||
|
- <component name="PropertiesComponent"><![CDATA[{
|
||||||
|
- "keyToString": {
|
||||||
|
- "RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||||
|
- "RunOnceActivity.ShowReadmeOnStart": "true"
|
||||||
|
+ <component name="PropertiesComponent">{
|
||||||
|
+ "keyToString": {
|
||||||
|
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||||
|
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
|
+ "last_opened_file_path": "C:/Users/JDRCa/Desktop/Projects/Ellie-bot"
|
||||||
|
}
|
||||||
|
-}]]></component>
|
||||||
|
+}</component>
|
||||||
|
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
||||||
|
<component name="TaskManager">
|
||||||
|
<task active="true" id="Default" summary="Default task">
|
||||||
|
@@ -53,17 +78,85 @@
|
||||||
|
<option name="presentableId" value="Default" />
|
||||||
|
<updated>1663054617242</updated>
|
||||||
|
</task>
|
||||||
|
+ <task id="LOCAL-00001" summary="Updated REAMEME.md">
|
||||||
|
+ <created>1678707300888</created>
|
||||||
|
+ <option name="number" value="00001" />
|
||||||
|
+ <option name="presentableId" value="LOCAL-00001" />
|
||||||
|
+ <option name="project" value="LOCAL" />
|
||||||
|
+ <updated>1678707300888</updated>
|
||||||
|
+ </task>
|
||||||
|
+ <task id="LOCAL-00002" summary="Deleted codeql-analysis.yml as it was outdated">
|
||||||
|
+ <created>1678708055154</created>
|
||||||
|
+ <option name="number" value="00002" />
|
||||||
|
+ <option name="presentableId" value="LOCAL-00002" />
|
||||||
|
+ <option name="project" value="LOCAL" />
|
||||||
|
+ <updated>1678708055154</updated>
|
||||||
|
+ </task>
|
||||||
|
+ <task id="LOCAL-00003" summary="Added codeql-analysis.yml as I have updated it to use java instead of JavaScript">
|
||||||
|
+ <created>1678708239367</created>
|
||||||
|
+ <option name="number" value="00003" />
|
||||||
|
+ <option name="presentableId" value="LOCAL-00003" />
|
||||||
|
+ <option name="project" value="LOCAL" />
|
||||||
|
+ <updated>1678708239367</updated>
|
||||||
|
+ </task>
|
||||||
|
+ <task id="LOCAL-00004" summary="Updated CODEOWNERS">
|
||||||
|
+ <created>1678710846454</created>
|
||||||
|
+ <option name="number" value="00004" />
|
||||||
|
+ <option name="presentableId" value="LOCAL-00004" />
|
||||||
|
+ <option name="project" value="LOCAL" />
|
||||||
|
+ <updated>1678710846454</updated>
|
||||||
|
+ </task>
|
||||||
|
+ <option name="localTasksCounter" value="5" />
|
||||||
|
<servers />
|
||||||
|
</component>
|
||||||
|
<component name="Vcs.Log.Tabs.Properties">
|
||||||
|
+ <option name="RECENT_FILTERS">
|
||||||
|
+ <map>
|
||||||
|
+ <entry key="Branch">
|
||||||
|
+ <value>
|
||||||
|
+ <list>
|
||||||
|
+ <RecentGroup>
|
||||||
|
+ <option name="FILTER_VALUES">
|
||||||
|
+ <option value="origin/staging" />
|
||||||
|
+ </option>
|
||||||
|
+ </RecentGroup>
|
||||||
|
+ <RecentGroup>
|
||||||
|
+ <option name="FILTER_VALUES">
|
||||||
|
+ <option value="staging" />
|
||||||
|
+ </option>
|
||||||
|
+ </RecentGroup>
|
||||||
|
+ </list>
|
||||||
|
+ </value>
|
||||||
|
+ </entry>
|
||||||
|
+ </map>
|
||||||
|
+ </option>
|
||||||
|
<option name="TAB_STATES">
|
||||||
|
<map>
|
||||||
|
<entry key="MAIN">
|
||||||
|
<value>
|
||||||
|
- <State />
|
||||||
|
+ <State>
|
||||||
|
+ <option name="FILTERS">
|
||||||
|
+ <map>
|
||||||
|
+ <entry key="branch">
|
||||||
|
+ <value>
|
||||||
|
+ <list>
|
||||||
|
+ <option value="origin/staging" />
|
||||||
|
+ </list>
|
||||||
|
+ </value>
|
||||||
|
+ </entry>
|
||||||
|
+ </map>
|
||||||
|
+ </option>
|
||||||
|
+ </State>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
+ <component name="VcsManagerConfiguration">
|
||||||
|
+ <MESSAGE value="Updated REAMEME.md" />
|
||||||
|
+ <MESSAGE value="Deleted codeql-analysis.yml as it was outdated" />
|
||||||
|
+ <MESSAGE value="Added codeql-analysis.yml as I have updated it to use java instead of JavaScript" />
|
||||||
|
+ <MESSAGE value="Updated CODEOWNERS" />
|
||||||
|
+ <option name="LAST_COMMIT_MESSAGE" value="Updated CODEOWNERS" />
|
||||||
|
+ </component>
|
||||||
|
</project>
|
||||||
|
\ No newline at end of file
|
||||||
|
Index: .idea/vcs.xml
|
||||||
|
IDEA additional info:
|
||||||
|
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
|
||||||
|
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"VcsDirectoryMappings\">\r\n <mapping directory=\"$PROJECT_DIR$\" vcs=\"Git\" />\r\n </component>\r\n</project>
|
||||||
|
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 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
|
+ <mapping directory="" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
|
\ 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());
|
||||||
|
}
|
||||||
|
-
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,4 @@
|
||||||
|
<changelist name="Uncommitted_changes_before_Update_at_21_08_2023_11_04_pm_[Changes]" date="1692615869188" recycled="true" deleted="true">
|
||||||
|
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_21_08_2023_11_04_pm_[Changes]/shelved.patch" />
|
||||||
|
<option name="DESCRIPTION" value="Uncommitted changes before Update at 21/08/2023 11:04 pm [Changes]" />
|
||||||
|
</changelist>
|
124
.idea/uiDesigner.xml
Normal file
124
.idea/uiDesigner.xml
Normal file
|
@ -0,0 +1,124 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="Palette2">
|
||||||
|
<group name="Swing">
|
||||||
|
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
||||||
|
</item>
|
||||||
|
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
||||||
|
<initial-values>
|
||||||
|
<property name="text" value="Button" />
|
||||||
|
</initial-values>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
|
<initial-values>
|
||||||
|
<property name="text" value="RadioButton" />
|
||||||
|
</initial-values>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
|
<initial-values>
|
||||||
|
<property name="text" value="CheckBox" />
|
||||||
|
</initial-values>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
||||||
|
<initial-values>
|
||||||
|
<property name="text" value="Label" />
|
||||||
|
</initial-values>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
|
<preferred-size width="150" height="-1" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
|
<preferred-size width="150" height="-1" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
|
<preferred-size width="150" height="-1" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
|
<preferred-size width="150" height="50" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
|
<preferred-size width="150" height="50" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
|
<preferred-size width="150" height="50" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
|
<preferred-size width="150" height="50" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
||||||
|
<preferred-size width="150" height="50" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
|
<preferred-size width="150" height="50" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
|
<preferred-size width="200" height="200" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
|
<preferred-size width="200" height="200" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
||||||
|
<preferred-size width="-1" height="20" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
||||||
|
</item>
|
||||||
|
</group>
|
||||||
|
</component>
|
||||||
|
</project>
|
|
@ -5,9 +5,7 @@
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="61990dc1-c961-40f0-8a8d-ab716806f62a" name="Changes" comment="">
|
<list default="true" id="61990dc1-c961-40f0-8a8d-ab716806f62a" name="Changes" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/commands/UserInfoCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/commands/UserInfoCommand.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/events/HelloEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/events/HelloEvent.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/elliebot/ellie/main.java" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
@ -25,25 +23,22 @@
|
||||||
<component name="MarkdownSettingsMigration">
|
<component name="MarkdownSettingsMigration">
|
||||||
<option name="stateVersion" value="1" />
|
<option name="stateVersion" value="1" />
|
||||||
</component>
|
</component>
|
||||||
<component name="MavenImportPreferences">
|
<component name="ProjectColorInfo">{
|
||||||
<option name="generalSettings">
|
"associatedIndex": 5
|
||||||
<MavenGeneralSettings>
|
}</component>
|
||||||
<option name="useMavenConfig" value="true" />
|
|
||||||
</MavenGeneralSettings>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="ProjectId" id="2EhjCsIvMNE0DmvWtphzqS6Qpgr" />
|
<component name="ProjectId" id="2EhjCsIvMNE0DmvWtphzqS6Qpgr" />
|
||||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||||
<component name="ProjectViewState">
|
<component name="ProjectViewState">
|
||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
<option name="showLibraryContents" value="true" />
|
<option name="showLibraryContents" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent"><![CDATA[{
|
<component name="PropertiesComponent">{
|
||||||
"keyToString": {
|
"keyToString": {
|
||||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true"
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
|
"git-widget-placeholder": "staging"
|
||||||
}
|
}
|
||||||
}]]></component>
|
}</component>
|
||||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
||||||
<component name="TaskManager">
|
<component name="TaskManager">
|
||||||
<task active="true" id="Default" summary="Default task">
|
<task active="true" id="Default" summary="Default task">
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
# Ellie Discord Bot ©2018-2022 EllieBotDevs
|
## This project has moved homes to https://toastielab.dev/EllieBotDevs/Ellie-bot (the repo over there will serve as a mirror until everything has moved over properly)
|
||||||
|
|
||||||
|
# Ellie Discord Bot ©2018-2023 EllieBotDevs
|
||||||
|
|
||||||
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
|
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
|
||||||
[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-)
|
[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-)
|
||||||
|
@ -66,7 +68,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
```
|
```
|
||||||
To learn more about this license follow the link above or you can view it in the [LICENSE](LICENSE)
|
To learn more about this license follow the link above, or you can view it in the [LICENSE](LICENSE)
|
||||||
|
|
||||||
## Contributors ✨
|
## Contributors ✨
|
||||||
|
|
||||||
|
|
|
@ -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(...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Reference in a new issue