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

Ree6 V4 #597

Merged
merged 118 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
fe3bdb4
Start updating.
DxsSucuk Jan 23, 2024
c2e6246
Merge branch 'master' into dev/internal/sql
DxsSucuk Jan 24, 2024
35b5b6f
Finishing up one Event class.
DxsSucuk Jan 24, 2024
0bce11c
Finished WebhookUtil
DxsSucuk Jan 24, 2024
812d09d
Merge branch 'master' into dev/internal/sql
DxsSucuk Feb 15, 2024
6e54ddb
Merge branch 'master' into dev/internal/sql
DxsSucuk Apr 9, 2024
6d09719
Merge branch 'master' into dev/internal/sql
DxsSucuk Apr 9, 2024
b8116ef
Merge branch 'refs/heads/master' into dev/internal/sql
DxsSucuk Apr 12, 2024
0c2355f
Fixing more internal code.
DxsSucuk Apr 12, 2024
9fe284e
Fixing more internal code.
DxsSucuk Apr 12, 2024
2ab668b
Merge remote-tracking branch 'refs/remotes/origin/master' into dev/in…
DxsSucuk Apr 12, 2024
f2e7a9b
Continues work on updating the internals.
DxsSucuk Apr 16, 2024
1d1a497
Continues work.
DxsSucuk Apr 17, 2024
8178a77
Continues work.
DxsSucuk Apr 17, 2024
95f2f03
Continues work.
DxsSucuk Apr 17, 2024
ba88b5d
Merge branch 'refs/heads/master' into dev/internal/v4
DxsSucuk May 21, 2024
7f19271
Fix formatting and stuff.
DxsSucuk May 21, 2024
0782ba7
ASYNC LANGUAGES YEEEEEEEAH BABY
DxsSucuk May 21, 2024
abcd7ee
Fixing a few things that occurred during an old refactor.
DxsSucuk May 21, 2024
fee18ca
Clean up work.
DxsSucuk May 21, 2024
f84a146
Finishing up a bit more YAY!
DxsSucuk May 21, 2024
ef48fb2
RAAAAAAAAAAAH
DxsSucuk May 21, 2024
4bb4d8d
Methane
DxsSucuk May 21, 2024
f4a39e1
ONLY 139 ERRORS LEFT LETS GO
DxsSucuk May 22, 2024
f7d43f3
Merge branch 'refs/heads/master' into dev/v4
DxsSucuk May 22, 2024
93d8ff3
ONLY 95 ERRORS LEFT RAAAAAAAAAAAAAAAAH
DxsSucuk May 22, 2024
d2f8635
0 ERRORS RAAAAAAAAAAAAH
DxsSucuk May 22, 2024
c22e9fe
Use the reactor version.
DxsSucuk Jun 11, 2024
5bed824
Merge branch 'refs/heads/master' into dev/v4
DxsSucuk Jul 4, 2024
946a606
Fixing more stuff.
DxsSucuk Jul 5, 2024
b6bbd8a
Fixing even more classes
DxsSucuk Jul 5, 2024
c1968fa
Every class should be fixed except LoggingEvents and MenuEvents.
DxsSucuk Jul 5, 2024
db87f57
Every class should be fixed except LoggingEvents and MenuEvents.
DxsSucuk Jul 5, 2024
752ba39
Every class should be fixed except LoggingEvents and MenuEvents.
DxsSucuk Jul 5, 2024
647a074
Everything should be fixed now.
DxsSucuk Jul 5, 2024
ee43685
Updating version.
DxsSucuk Jul 5, 2024
71597fa
Command stuff done, hopefully.
DxsSucuk Jul 5, 2024
e7feab4
Start of the new Sonic System.
DxsSucuk Jul 5, 2024
2c5bd23
Finished up the Sonic System.
DxsSucuk Jul 5, 2024
503f35a
Preventing output outside of debug env.
DxsSucuk Jul 5, 2024
9bbd54a
Merge branch 'refs/heads/master' into dev/v4
DxsSucuk Jul 5, 2024
687cb85
Revert bad merge.
DxsSucuk Jul 5, 2024
1f9da8f
Fix typo.
DxsSucuk Jul 5, 2024
6544aef
Merge branch 'refs/heads/master' into dev/v4
DxsSucuk Aug 2, 2024
9998ce2
Merge branch 'refs/heads/master' into dev/v4
DxsSucuk Aug 2, 2024
339564f
Merge branch 'refs/heads/master' into dev/v4
DxsSucuk Aug 8, 2024
69371d3
Fixing a conditional lock of operation.
DxsSucuk Aug 8, 2024
8f361d3
Use new repository for languages.
DxsSucuk Aug 8, 2024
ca2a1fe
Merge remote-tracking branch 'refs/remotes/origin/master' into dev/v4
DxsSucuk Aug 12, 2024
46e6463
New Addon System.
DxsSucuk Aug 14, 2024
2aee4f8
New Addon System fix.
DxsSucuk Aug 14, 2024
30f806b
Fix missing git properties and improve a few checks.
DxsSucuk Aug 14, 2024
b2df1a9
Fix missing git properties and improve a few checks.
DxsSucuk Aug 14, 2024
a96e39b
Merge branch 'refs/heads/master' into dev/v4
DxsSucuk Aug 23, 2024
11b8add
Merge branch 'refs/heads/master' into dev/v4
DxsSucuk Aug 29, 2024
65988e3
Merge branch 'master' into dev/v4
DxsSucuk Aug 29, 2024
b2c4057
Merge branch 'refs/heads/master' into dev/v4
DxsSucuk Aug 29, 2024
18202e8
Merge remote-tracking branch 'origin/dev/v4' into dev/v4
DxsSucuk Aug 29, 2024
588c7dc
Added support for custom Rank Images.
DxsSucuk Aug 29, 2024
83b10c4
Change Ticket Transcript to be an HTML page instead of a TXT file.
DxsSucuk Aug 30, 2024
e9620e4
Updated Twitch Notification for better clarity and easier use.
DxsSucuk Sep 13, 2024
62b3701
Merge branch 'master' into dev/v4
DxsSucuk Sep 23, 2024
8e6bde5
Starting #565
DxsSucuk Sep 23, 2024
920f840
Fix Album get request.
DxsSucuk Sep 23, 2024
5bad410
Fix Album get request.
DxsSucuk Sep 23, 2024
a8ac305
Refactor.
DxsSucuk Sep 25, 2024
3fa9df4
Gang Gang
DxsSucuk Sep 25, 2024
44aac15
Gang Gang
DxsSucuk Sep 25, 2024
6bb10a4
Just need to make the actual time check, design the embed and add the…
DxsSucuk Sep 25, 2024
149035e
Spotify Notifications should now work. I have not tested this yet.
DxsSucuk Sep 27, 2024
fd1be26
Fix up
DxsSucuk Sep 30, 2024
97fc985
Merge branch 'master' into dev/v4
DxsSucuk Oct 9, 2024
e89815f
Fix typos.
DxsSucuk Oct 9, 2024
61e8612
Bump
DxsSucuk Oct 9, 2024
b0bc2bc
Big refactor.
DxsSucuk Oct 9, 2024
4797d32
Fix.
DxsSucuk Oct 9, 2024
25d2cdc
V4 Userapp (#655)
DxsSucuk Oct 10, 2024
bb1fae0
Code clean up.
DxsSucuk Oct 10, 2024
981bece
Code clean up.
DxsSucuk Oct 10, 2024
a416ccc
Code clean up.
DxsSucuk Oct 10, 2024
8a8839c
Code clean up.
DxsSucuk Oct 10, 2024
5e8baac
Code clean up.
DxsSucuk Oct 10, 2024
01d2aea
Code clean up.
DxsSucuk Oct 10, 2024
e19e0b9
Code clean up.
DxsSucuk Oct 10, 2024
fb895eb
Code clean up.
DxsSucuk Oct 10, 2024
e3e7e32
Code clean up.
DxsSucuk Oct 10, 2024
776ddde
Code clean up.
DxsSucuk Oct 10, 2024
813a9de
Code clean up.
DxsSucuk Oct 10, 2024
20f6863
Code clean up.
DxsSucuk Oct 10, 2024
9cc988a
Code clean up.
DxsSucuk Oct 10, 2024
c880360
Code clean up.
DxsSucuk Oct 10, 2024
03ea599
Code clean up.
DxsSucuk Oct 10, 2024
07b31d0
Bump
DxsSucuk Oct 10, 2024
68af106
Merge remote-tracking branch 'origin/master' into dev/v4
DxsSucuk Oct 14, 2024
119bdf8
Fix a bug and bump SQL
DxsSucuk Oct 14, 2024
5691db5
Fix a bug and bump SQL
DxsSucuk Oct 16, 2024
6c035bd
Use the same main color instead of random selections such as green, c…
DxsSucuk Oct 16, 2024
cb0a7a1
Change default color.
DxsSucuk Oct 16, 2024
f012821
Clean up.
DxsSucuk Oct 16, 2024
4a2056d
Birthday changes.
DxsSucuk Oct 16, 2024
50f84a9
Bump
DxsSucuk Oct 16, 2024
84627da
Missing subcommand.
DxsSucuk Oct 16, 2024
130f37b
Code cleanup.
DxsSucuk Oct 16, 2024
fee5780
Merge remote-tracking branch 'origin/master' into dev/v4
DxsSucuk Oct 16, 2024
84da3d2
Fixed codestyle.
DxsSucuk Oct 16, 2024
b10dce4
Use .getUser instead of .getMember
DxsSucuk Oct 16, 2024
908ee92
Worked off a few todos.
DxsSucuk Oct 16, 2024
a2e397a
Worked off a few todos.
DxsSucuk Oct 16, 2024
8551359
Worked off a few todos.
DxsSucuk Oct 16, 2024
9f5f878
Use twitch color instead.
DxsSucuk Oct 18, 2024
0e7653f
Fix Setting stuff.
DxsSucuk Oct 18, 2024
24bd2c0
WE GOT HELLA SPEED GANG
DxsSucuk Oct 21, 2024
321ccf3
Fix Spotify
DxsSucuk Oct 21, 2024
a5f928e
Code cleanup
DxsSucuk Oct 21, 2024
d5fba45
Merge branch 'master' into dev/v4
DxsSucuk Oct 21, 2024
aabb368
Worked on more todos.
DxsSucuk Oct 22, 2024
ce72e8b
Cleanup
DxsSucuk Oct 22, 2024
5ee4083
Fix up a stupid way of handling ephermal support.
DxsSucuk Oct 22, 2024
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
1 change: 1 addition & 0 deletions languages/en-GB.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ message:
other: "The Birthday of %s has been removed!"
noPerms: "You don't have the permission to remove a Birthday!"
wish: "Happy birthday to <@%s>!"
list: "Here are all Birthday wishes:\n```%s```"
instagramNotifier:
added: "A Instagram Notifier has been created for the User %s!"
list: "Here are all Instagram Notifier that have been setup:\n```%s```"
Expand Down
30 changes: 23 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@

<groupId>de.presti</groupId>
<artifactId>Ree6</artifactId>
<version>3.1.13</version>
<version>4.0.0-alpha.4</version>
<packaging>jar</packaging>

<properties>
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.organization>dxssucuk</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<build.plugins.plugin.version>3.4.2</build.plugins.plugin.version>
</properties>

<repositories>
Expand Down Expand Up @@ -55,9 +56,9 @@
<dependencies>
<!-- Discord -->
<dependency>
<groupId>net.dv8tion</groupId>
<groupId>io.github.JDA-Fork</groupId>
<artifactId>JDA</artifactId>
<version>5.1.2</version>
<version>55d824408c</version>
</dependency>
<!-- Fix for the failed Lookup until they release a version -->
<dependency>
Expand All @@ -81,9 +82,9 @@
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>club.minnced</groupId>
<groupId>de.ree6</groupId>
<artifactId>discord-webhooks</artifactId>
<version>0.8.4</version>
<version>f67bf93e5f</version>
</dependency>

<!-- Sentry and YAML -->
Expand Down Expand Up @@ -182,7 +183,7 @@
<dependency>
<groupId>de.ree6</groupId>
<artifactId>Ree6-SQL</artifactId>
<version>da620ec7a5</version>
<version>7916908de2</version>
</dependency>

<!-- Logging -->
Expand Down Expand Up @@ -260,7 +261,6 @@
<version>3.1.9</version>
</dependency>


<!-- HTTP Clients -->
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
Expand All @@ -286,6 +286,19 @@
<artifactId>gson</artifactId>
<version>2.11.0</version>
</dependency>

<!-- Addons -->
<dependency>
<groupId>org.pf4j</groupId>
<artifactId>pf4j</artifactId>
<version>3.12.0</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<pluginRepositories>
Expand Down Expand Up @@ -351,6 +364,9 @@
<includeOnlyProperties>
<includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
<includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
<includeOnlyProperty>^git.dirty$</includeOnlyProperty>
<includeOnlyProperty>^git.branch$</includeOnlyProperty>
<includeOnlyProperty>^git.remote.origin.url$</includeOnlyProperty>
</includeOnlyProperties>
<commitIdGenerationMode>full</commitIdGenerationMode>
<dateFormat>ddMMyyyy</dateFormat>
Expand Down
106 changes: 0 additions & 106 deletions src/main/java/de/presti/ree6/addons/Addon.java

This file was deleted.

17 changes: 0 additions & 17 deletions src/main/java/de/presti/ree6/addons/AddonInterface.java

This file was deleted.

Loading