Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-11-29 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
491 Commits 2 Branches 0 Tags 3.9 MiB
0e07eb26be
Commit Graph

378 Commits

Author SHA1 Message Date
Vankka
7aa6191a27
Move linked_accounts table name to constant, fixes mysql 2023-06-25 21:13:01 +03:00
Vankka
2eaaa17581
Fix mirroring not working with messages that only contain an attachment, fix mirrored attachments having no content 2023-06-25 13:31:27 +03:00
Vankka
57d5d70d13
Clarify minecraftauth requirements 2023-06-24 23:01:08 +03:00
Vankka
b7d586101d
Fix default avatar url 2023-06-24 21:42:33 +03:00
Vankka
379f0fc9f0
Update to EnhancedLegacyText v2, change to square brackets format 2023-06-24 21:40:55 +03:00
Dinty1
8e79c7abf3
Fix up avatar URL stuff + disable auto invite creation by default (#2) 
* Start fixing up avatarurl stuff

* Fix some stuff

* Don't automatically create invite by default

* Add suggestion

Co-authored-by: Henri Schubin <vankka.main@gmail.com>

* Format + remove todos

Co-authored-by: Henri Schubin <vankka.main@gmail.com>

---------

Co-authored-by: Henri Schubin <vankka.main@gmail.com>
 2023-06-24 00:33:38 +03:00
Vankka
2f2b852b0d
Add discriminators back for users who still have them 2023-06-22 20:03:03 +03:00
Vankka
e45e7c921c
Add context to reserialization for reply message content in Discord->Minecraft handler 2023-06-22 19:55:55 +03:00
Vankka
0624f9ae09
Don't block enable because of ready event 2023-06-22 19:48:09 +03:00
Vankka
cc5f8c2d26
Fix commands, don't run enable/reload async anymore 2023-06-22 19:46:20 +03:00
Vankka
daee555fed
Fix advancement spam check 2023-06-19 18:52:41 +03:00
Vankka
6d744ccec4
Don't change to FAILED_TO_LOAD_CONFIG or FAILED_TO_START status on reload 2023-06-19 18:35:23 +03:00
Vankka
4e4b21ae7c
Fix order some stuff is loaded, update Commodore 2023-06-19 00:50:09 +03:00
Vankka
56af07e1e8
Fix clicking on debug url in-game 2023-06-18 23:59:46 +03:00
Vankka
9def895a04
Fix MockDiscordSRV 2023-06-18 23:47:18 +03:00
Vankka
6de141ea1d
Fix GUILD_MEMBERS intent not getting auto enabled 2023-06-18 23:44:00 +03:00
Vankka
1586fcb927
Don't use dependencies that would be downloaded in loggers 2023-06-18 23:36:15 +03:00
Vankka
11914b5d0e
Add debug config options 2023-06-18 23:27:15 +03:00
Vankka
37476fd8f9
Fix group sync not finding members that are not cached, enable chunking by default. Add GroupSyncResult for being able to interact with role 2023-06-18 22:36:59 +03:00
Vankka
67c609aa4f
Update comments to reply & attachment format 2023-06-18 22:36:13 +03:00
Vankka
13ea5382f9
Do a few suggestions 2023-06-18 19:47:17 +03:00
Vankka
aa8b0a9660
Add showing replies in Discord -> Minecraft 2023-06-18 16:20:47 +03:00
Vankka
9c7b065d62
Fix mirroring, add reply handling for messages from game message forwarding 2023-06-18 16:00:49 +03:00
Vankka
9fd3903550
Merge jda-webhooks 2023-06-18 14:15:57 +03:00
Vankka
8de37ce767
Username fixes 2023-06-18 14:14:04 +03:00
Vankka
3d6c7f72de
Fix webhook support 2023-06-18 14:00:02 +03:00
Vankka
de0bf591f9
Moving around channel configs 2023-06-17 16:24:04 +03:00
Vankka
06b1dff50a
Move around configs, make IChannelConfig better / consolidate channel+thread lookup 2023-06-17 16:21:16 +03:00
Dinty1
95272cfa80
Misc changes (#1) 
* Explain how to get token, create documentation config

* Reword some stuff

* Put this on a new line

* Rearrange
 2023-06-17 15:07:05 +03:00
Vankka
1ca4e69d9a
Add main config header, explanation for channels 2023-06-11 14:49:14 +03:00
Vankka
b69f1de11e
Clarify what "award" means and change "Webhook" -> "Bot" in webhookFormat 2023-06-11 14:34:07 +03:00
Vankka
cd9d8047c0
Updates to configs 2023-06-10 16:36:54 +03:00
Vankka
c32a2ad8bd
Execute command initial 2023-06-09 00:36:39 +03:00
Vankka
d6a21b6fca
Prepare for webhooks directly through JDA 2023-06-09 00:35:44 +03:00
Vankka
05949fe6b0
Missed a placeholder parameter improvement 2023-06-04 00:42:56 +03:00
Vankka
aecf67c924
Ansi serialization, fixes to Minecraft->Discord 2023-06-03 23:05:57 +03:00
Vankka
ce055debde
Improve how parameters are passed to placeholders 2023-06-03 16:55:37 +03:00
Vankka
03c26a6ca2
Add hover for resyncs with nothing done in-game 2023-05-31 00:01:14 +03:00
Vankka
5d63417fbb
Fix how attachment placeholder gets the delimiter 2023-05-30 23:49:14 +03:00
Vankka
c7466202b9
Fix attachments not getting placeholders replaced 2023-05-30 23:46:22 +03:00
Vankka
4613e821e2
Convert resync to a combined command 2023-05-30 23:42:53 +03:00
Vankka
3e3438f0d2
Allow loading extra languages on Bukkit 2023-05-30 19:22:34 +03:00
Vankka
05f4bb47e9
Add ReloadFlag for Discord commands 2023-05-29 00:44:32 +03:00
Vankka
df5a253b48
Add combined Minecraft & Discord commands 2023-05-29 00:42:55 +03:00
Vankka
4700adaaf9
Make ServerScheduler helper methods static 2023-05-27 20:22:32 +03:00
Vankka
c93ddb5285
Fix AdventureCommandExecutorProxy deprecations 2023-05-27 20:12:07 +03:00
Vankka
e4b80ebb15
Get rid of OrDefault. Move advancement spam detection to AwardMessageModule 2023-05-25 23:30:12 +03:00
Vankka
289ea8491f
Use configurate yaml branch, remove hocon config stuff 2023-05-20 21:05:10 +03:00
Vankka
7314fdb72b
Config improvements 2023-05-20 20:25:52 +03:00
Vankka
bded7cc26d
Fix version command output 2023-05-19 23:18:03 +03:00
Vankka
1f5c48ec2b
Make the user download url blank for now 2023-05-19 20:34:11 +03:00
Vankka
f2f5e739c4
Check token validity earlier & better 2023-05-19 20:30:58 +03:00
Vankka
fbefcd9079
Rename updater channel 2023-05-19 20:23:15 +03:00
Vankka
e5783e7b05
Add startup warning about this being a testing version, update UpdateChecker coordinates, change plugin.yml name to avoid issues with other plugins 2023-05-19 20:17:00 +03:00
Vankka
2d4252ed6f
Add jump urls to channel mentions & rendering messages, handle translatable components when serializing to plain 2023-05-19 19:59:03 +03:00
Vankka
9d2ec71b39
Remove ICommandSender#sendMessage overloads that are no-longer required 2023-05-19 18:33:33 +03:00
Vankka
ec6b15aad2
Moved ApiInstanceHolder to be a DiscordSRVApi subclass, renamed a few things 2023-05-18 00:58:42 +03:00
Vankka
ca40da0c00
Fix exception logging on java.util.logging. Fix getting manifest 2023-05-06 20:43:02 +03:00
Vankka
6b9606ddd7
Advancement/achievement fixes, event changes, updated gradle 2023-04-30 19:28:11 +03:00
Vankka
045e863dde
Move unrelocate to another module again 2023-04-30 15:19:31 +03:00
Vankka
ec02e5f88a
Progress on require linking, add folia support, achievements/advancements 2023-04-23 16:53:58 +03:00
Vankka
42ec392bcb
Linking improvements, required linking initial 2023-03-18 14:23:31 +02:00
Vankka
6ff5ddb6a7
Add Bukkit chat plugin integrations, make better use of DynamicProxy, consolidate some of the :common subprojects 2023-02-20 21:55:45 +02:00
Vankka
eb5a8dc9a8
Move DiscordConnectionDetails 2023-02-18 13:31:36 +02:00
Vankka
3b4ec92141
Improved some config comments, added minecraftauth.me to connections config 2023-01-30 20:57:24 +02:00
Vankka
88a267bc0a
Automatically disable escaping markdown when inside a code string or block 2023-01-23 00:24:31 +02:00
Vankka
6fd03af3a8
2023, cleanup unused imports, slight change to JDAConnectionManager intent message check 2023-01-22 22:24:51 +02:00
Vankka
7a9c21c56d
Specifying intents, cache flags and member caching policies in modules 2023-01-22 22:20:36 +02:00
Vankka
7d9609306e
Member mention lookup, config option for @ everyone/here, some fixes 2022-12-30 20:11:10 +02:00
Vankka
11ff9eb563
JDA 5.0.0-beta.2 2022-12-30 16:31:51 +02:00
Vankka
e827ea603a
Split os name + arch and version in debug, fix log in UpdateChecker 2022-12-28 00:53:51 +02:00
Vankka
516f6410c9
Create VersionInfo, add Build-Time manifest value 2022-12-27 23:56:21 +02:00
Vankka
9f6b2ef9fd
Add any offline uuid data to debug reports 2022-12-27 23:43:12 +02:00
Vankka
cfcbada10d
Remove optional usage from API 2022-12-27 23:34:02 +02:00
Vankka
29f48944d3
Update checker 2022-12-27 22:46:28 +02:00
Vankka
bab1d4a765
Fix using wrong field in MinecraftToDiscordChatModule 2022-12-27 22:44:53 +02:00
Vankka
26aac4d4e2
Consolidate :common:common-proxy and :common:common-server into :common 2022-12-18 23:15:24 +02:00
Vankka
f7a015d47d
JDA 5.0.0-alpha.19 2022-09-15 23:23:46 +03:00
Vankka
dbce0832a3
Change everything to a central OkHttpClient, reduce amount of threads that can be used, adjust some other stuff 2022-08-22 18:46:12 +03:00
Vankka
9774eb5879
Add command registration via event 2022-08-07 20:27:52 +03:00
Vankka
602c74ba6b
Interaction events, add handling directly to Command 2022-08-07 19:54:16 +03:00
Vankka
2f3c9946b5
Add responding with choices to DiscordCommandAutoCompleteInteractionEvent 2022-07-22 19:13:40 +03:00
Vankka
1ce73a2842
Interaction related events 2022-07-22 18:25:42 +03:00
Vankka
d8f5f89c19
Lots of interactions & commands 2022-07-10 17:33:47 +03:00
Vankka
83fb75d4c0
Implement command executors, dynamicproxy 2022-06-25 22:33:55 +03:00
Vankka
d4975f833a
enhancedBuilder -> textBuilder 2022-06-14 20:02:21 +03:00
Vankka
37248aac56
ComponentFactory#enhancedBuilder -> ComponentFactory#textBuilder 2022-06-14 18:59:23 +03:00
Vankka
28b8d76887
Rename EnhancedTextBuilder to GameTextBuilder 2022-06-14 18:58:36 +03:00
Vankka
2131fa3e86
Missing copyright headers 2022-06-09 20:05:50 +03:00
Vankka
888f376846
Make use of MethodHandles for paper component getting 2022-06-09 20:05:43 +03:00
Vankka
33738959f7
Begin with interactions, made JDAEntity, DiscordSRVApi#jdaVersion, split member & user 2022-06-09 19:31:01 +03:00
Vankka
984331a458
com.discordsrv.api.discord.api -> com.discordsrv.api.discord 
com.discordsrv.api.discord.connection -> com.discordsrv.api.discord.connection.jda
 2022-05-12 17:59:46 +03:00
Vankka
7884e6988f
Make MinecraftAuthenticationLinker cached 2022-05-11 19:29:53 +03:00
Vankka
964db4bb20
Remove some workarounds for dependencydownload + exclude some mcauth transitives 2022-05-11 19:26:02 +03:00
Vankka
02f46d2182
Implement MinecraftAuthentication as a linker 2022-05-11 19:09:41 +03:00
Vankka
40cc7086b0
Attachment mirroring 2022-05-11 18:29:47 +03:00
Vankka
0052c6e54b
Add support for replies in mirroring, block markdown urls in mirroring 2022-05-05 19:17:54 +03:00
Vankka
e5a15eea39
Message content is privileged 2022-05-01 12:30:42 +03:00
Vankka
97a8816edd
Implement ErrorCallbackContext 2022-05-01 12:27:35 +03:00
Vankka
bf60a978eb
Fix ModuleManager onShuttingDown not using its own method to disable 2022-04-26 17:01:05 +03:00
Vankka
3f030dfada
Add PlaceholderAPI (Bukkit) support 2022-04-26 17:00:09 +03:00
Vankka
5ccf8f7cb7
Rename Shutdown Behaviour to Channel Locking 2022-04-26 15:37:41 +03:00
Vankka
97a2b5edbe
Move ThreadChannelLookup to :common from :api 2022-04-26 15:36:10 +03:00
Vankka
5b8a139836
Rename slf4j-hack module to unrelocate 2022-04-26 14:56:32 +03:00
Vankka
d78450e291
Downgrade okhttp due to kotlin usage 2022-04-25 15:47:24 +03:00
Vankka
4a492a7392
Implement ApplicationDependencyManager 2022-04-25 15:35:50 +03:00
Vankka
e82f03cd21
Resolve a few deprecations 2022-04-22 21:21:48 +03:00
Vankka
13d7c09374
Remove repositories {} block from common/build.gradle 2022-04-22 21:11:56 +03:00
Vankka
60f04f1511
Version catalog, updated some versions 2022-04-22 20:56:11 +03:00
Vankka
0411384533
Fix channels using the member cache in MinecraftToDiscordChatModule 2022-04-20 10:17:11 +03:00
Vankka
a8944309c8
Some minor config comment improvements 2022-04-14 10:55:01 +03:00
Vankka
2a11718ae8
Move first join configuration lower down 2022-04-14 10:48:21 +03:00
Vankka
128647bd4f
IChannelConfig#CHANNEL_IDS_OPTION_NAME -> "channel-ids" 2022-04-14 10:46:44 +03:00
Vankka
1298a5039b
Remove printStackTrace 2022-04-14 10:12:33 +03:00
Vankka
6944cf2579
Unregister modules from the event bus on disable 2022-04-13 14:07:57 +03:00
Vankka
8a673875a6
Translations 2022-04-13 14:07:43 +03:00
Vankka
c3c5104dfa
Extra error catch 2022-04-13 14:07:25 +03:00
Vankka
a84eef853c
Fix broadcast tab complete, add placeholder support to Discord formatted broadcast 2022-04-12 13:19:26 +03:00
Vankka
eba37d9b6f
Tweak some stuff relating to FormattedText, make invite not get escaped, ever 2022-04-12 13:18:56 +03:00
Vankka
ad7bca010f
Tweak the main command a bit more 2022-04-12 12:48:41 +03:00
Vankka
cb1538d376
Tweak main command initialization a bit 2022-04-12 12:39:58 +03:00
Vankka
8c81873f92
Broadcast tab completing 2022-04-12 12:39:40 +03:00
Vankka
8929dd48e6
Broadcast tab completing 2022-04-12 12:39:31 +03:00
Vankka
2dcde1a135
Broadcast tab completing 2022-04-12 12:39:26 +03:00
Vankka
4e2177080b
Fix MinecraftComponentImpl#empty 2022-04-12 11:52:56 +03:00
Vankka
0f13f155cb
Fix SQLStorage not using the table prefix 2022-04-12 11:50:49 +03:00
Vankka
02121a61f9
Case-insensitive check for game channel owner name comparison, added some comments 2022-04-12 11:30:46 +03:00
Vankka
da8ba3d3a6
Less strict channel lookup 2022-04-12 11:20:42 +03:00
Vankka
0eb255fd33
Improvements to broadcast command 2022-04-12 11:20:28 +03:00
Vankka
a8eb9d69a8
Add broadcast commands 2022-04-10 18:21:26 +03:00
Vankka
02a0d098d0
Update MCDiscordReserializer, change some stuff regarding escaping 2022-04-10 18:20:46 +03:00
Vankka
9e6e2cb22c
Use simple name in ModuleManager#enable error 2022-04-10 16:56:48 +03:00
Vankka
a530753cac
Better permission error in ChannelShutdownBehaviourModule 2022-04-10 16:54:39 +03:00
Vankka
58929ce957
Resync command 2022-04-10 16:52:30 +03:00
Vankka
daf4b313a6
First join messages 2022-04-10 15:42:09 +03:00
Vankka
a1baec7397
Log ChannelUpdater error logging method 2022-04-04 20:50:05 +03:00
Vankka
b699a75821
Prefixes & suffixes, fix to Placeholders utility class, added more tests 2022-04-02 18:40:41 +03:00
Vankka
bbc722e689
Add channel auto locking, implement thread archiving. More fixes to shutdown not working properly/ errors when the server is stopped before DiscordSRV starts 2022-04-02 16:24:34 +03:00
Vankka
51fd9ef6d8
Some fixes, improvements & annotations for group sync 2022-04-01 19:51:45 +03:00
Vankka
14d7b0eed7
Change default stop message to use a stop button instead 2022-04-01 19:13:09 +03:00
Vankka
2b878f1265
Start & stop messages, some bug fixes & cleanup 2022-04-01 19:07:14 +03:00
Vankka
60c7dbfbc0
Update JDA 2022-04-01 18:30:42 +03:00
Vankka
627ec3045c
Remove unnecessary code in EventBus 2022-03-28 17:34:16 +03:00
Vankka
29e01878b2
Improved error logging in event bus 2022-03-28 17:25:23 +03:00
Vankka
ff63376550
remove printStackTrace used for debugging 2022-03-28 17:22:01 +03:00
Vankka
c6cbf2dfc3
Couple fixes, remove runtime dependency on error prone annotations 2022-03-28 17:20:37 +03:00
Vankka
1f6cefebac
Change integration registering to a safer method 2022-03-28 17:13:11 +03:00
Vankka
9124c18d7a
Move DiscordSRVApiProvider methods to DiscordSRVApi 2022-03-28 17:06:25 +03:00
Vankka
2d379dcb7c
Updates to debug report, debug command 2022-03-28 16:57:24 +03:00
Vankka
bea4680739
Make sure log lines are written to the file in order 2022-03-28 16:57:02 +03:00
Vankka
68fa07eb15
Pastes, manifest reading 2022-03-28 16:56:25 +03:00
Vankka
b63be457fd
Null-check executors in JDAConnectionManager#shutdownExecutors 2022-03-28 12:43:55 +03:00
Vankka
99a87382bd
In-game commands 2022-03-20 13:46:06 +02:00
Vankka
41b469f89f
Add some comments to JDAConnectionManager, re-make executor services when reconnecting, change some JDABuilder settings 2022-03-09 01:40:17 +02:00
Vankka
205cd13dd8
Table prefixes 2022-03-07 10:35:00 +02:00
Vankka
373e866346
Fix some bugs related to threads 2022-03-06 21:18:20 +02:00
Vankka
2cc92d6179
Fix editing & deleting not working with mirroring 2022-03-06 20:54:25 +02:00
Vankka
f8c5578cb3
Set shutdown status 2022-03-04 14:00:46 +02:00
Vankka
54db798e9a
Change around profile methods on players 2022-03-04 13:29:21 +02:00
Vankka
f3021d1472
Merge main 2022-03-01 17:40:17 +02:00
Vankka
2947717869
Add some generics to the component api, other minor component improvements 2022-03-01 12:28:31 +02:00
Vankka
ed674cce8a
More profile stuff 2022-02-24 17:09:53 +02:00
Vankka
ee1db84ae0
More Storage 2022-02-20 00:57:42 +02:00
Vankka
a40ac91096
Fix DependencyLoggerAdapter behaviour 2022-02-19 23:53:57 +02:00
Vankka
21045f7bb2
Merge branch 'main' into profiles 2022-02-19 22:47:47 +02:00
Vankka
af58286fed
Update DependencyDownload dependencies 2022-02-19 22:47:39 +02:00
Vankka
bc60b842c3
Storage 2022-02-19 22:44:29 +02:00
Vankka
3ff0c80e9a
Introduce a lock to debug log writing 2022-02-01 12:47:24 +02:00
Vankka
0a128e37e9
Add support for webhooks in threads, add username format option for mirroring 2022-02-01 12:39:59 +02:00
Vankka
ba1a8c196f
Beginning of profiles & linked accounts 2022-02-01 11:33:50 +02:00
Vankka
88ef85c65e
Move mock path determining to the dataDirectory method 2022-01-29 15:33:00 +02:00
Vankka
ebe072858e
Log into a temporary folder during tests 2022-01-29 13:40:58 +02:00
Vankka
61ac1ec1ec
Give CommandSenders full support for Audience, add connected/disconnected events 2022-01-29 13:34:39 +02:00
Vankka
d1d05e7081
Debug reports 2022-01-25 19:14:16 +02:00
Vankka
6f638ffb33
Add OnlineMode & PluginManager 2022-01-25 18:25:21 +02:00
Vankka
9cfaae7464
Make the EventBus faster by avoiding Map#entrySet 2022-01-25 16:24:17 +02:00
Vankka
9662d9515f
Fix writing to the wrong log file 2022-01-24 19:00:50 +02:00
Vankka
67e25a765a
Write DiscordSRV log messages to a file for debugging 2022-01-24 18:55:36 +02:00
Vankka
9f7a453132
Change event bus register message to not include "API" 2022-01-23 16:35:01 +02:00
Vankka
1097a8f2f8
Convert things to CompletableFutureUtil 2022-01-23 16:23:24 +02:00
Vankka
634c123937
Group synchronization 2022-01-23 16:11:35 +02:00
Vankka
f5acc00f8a
Make Module#enable call Module#reload by default 2022-01-20 20:19:51 +02:00
Vankka
0bbcc58d32
Make reloading channel updaters faster 2022-01-20 00:53:02 +02:00
Vankka
a89ab7441e
Fix more generics, change the way modules are registered 2022-01-20 00:04:07 +02:00
Vankka
0f5d36b407
Split out the PermissionDataProvider into smaller parts, fix some generic use in ModuleManager, make module priorities more flexible 2022-01-19 21:40:44 +02:00
Vankka
8fdd5e73e3
Vault & LuckPerms permission integrations 2022-01-18 22:15:43 +02:00
Vankka
1068150f77
Add logging 'proxy', centralize insufficient permission handling, improved toString, equals and hashCode implementations of 1st party Discord api entities 2022-01-15 14:45:50 +02:00
Vankka
d3faafcece
Fix parameters in slf4j implementation 2022-01-15 14:03:08 +02:00
Vankka
595146cc5b
Add a time frame that the channel updater will wait before giving up if not connected, 2022-01-13 20:35:54 +02:00
Vankka
ad6b7ee583
Add some missing nullability annotations 2022-01-13 19:34:53 +02:00
Vankka
318245c315
Update copyright year 2022-01-13 19:05:36 +02:00
Vankka
6c2c0c5134
Package reorganizing, and other minor changes 2022-01-13 19:03:23 +02:00
Vankka
694a6191cd
Add channel updating for name & topic 2022-01-13 19:02:41 +02:00
Vankka
7457fd90d0
Various improvements to 1st party Discord API 2022-01-13 19:02:25 +02:00
Vankka
0c9732fe11
Add message mirroring 2022-01-13 19:00:24 +02:00
Vankka
047580d9cf
Update h2, remove lombok and include the rest of the subprojects in i18n again 2022-01-13 18:57:26 +02:00
Vankka
0c7783675d
Rename scheduler methods to better match what they return, add a method to return an Executor that logs exceptions 2022-01-13 18:56:48 +02:00
Vankka
9fe73aa571
Add threads 2022-01-13 18:53:43 +02:00
Vankka
0e73f80d40
Join, leave, server switch messages. Fixed dependency logging, added config option ordering annotation, fixed some issues with translation/configuration 2021-12-24 01:21:14 +02:00
Vankka
9ffce74061
Change common listeners to a module system, update to JDA5, fix typos, simplify 1st party api, improved the way mentions are translated between Minecraft and Discord 2021-12-20 01:03:38 +02:00