Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-22 09:08:01 +01:00
Code Issues Projects Releases Wiki Activity
6,362 Commits 10 Branches 68 Tags 435 MiB
refactor/folia
Commit Graph

98 Commits

Author SHA1 Message Date
Josh Roy
d0493ccd2a
Merge remote-tracking branch 'upstream/2.x' into refactor/folia 
# Conflicts:
#	Essentials/src/main/java/com/earth2me/essentials/commands/Commandskull.java
 2023-08-22 11:37:36 -04:00
diademiemi
e3e52db10e
Add discord roles blacklist and aliases for chat format (#5157) 
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
 2023-08-08 21:39:12 -04:00
Josh Roy
10fc005652
Merge remote-tracking branch 'upstream/2.x' into refactor/folia 
# Conflicts:
#	EssentialsDiscord/src/main/java/net/essentialsx/discord/util/ConsoleInjector.java
 2023-07-27 19:30:00 -04:00
Josh Roy
52c9ca8197
Fix inaccurate online player count for Discord leave message (#5440) 
fixes #5256
 2023-07-23 15:10:46 +01:00
Josh Roy
863b9cffc5 Add backoff and skip for Discord console relay 2023-07-01 17:45:07 -04:00
Josh Roy
1921abd310 Shorten logger names for Discord module console relay 2023-07-01 17:45:07 -04:00
Josh Roy
803d800bdd Fix Discord module webhook closing incorrectly 2023-07-01 17:45:07 -04:00
Josh Roy
5276204cf2 Increase Discord module console relay message limit 2023-07-01 17:45:07 -04:00
Josh Roy
697128bcf2 Update Discord Module to JDA 5 2023-07-01 17:45:07 -04:00
Charles DeLancey
0d322e2c6b
Fix typo in Discord docs (#5371) 2023-05-30 07:46:09 -04:00
Sasha Sorokin
e5b0c4c855
Add support for local and global chats in Discord (#4684) 
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
 2023-04-30 21:30:11 -04:00
Josh Roy
84fd45bd09
Bump JDA 4 version (#5328) 
Bumping this for 2.20 release as  JDA 5 still not out of beta

Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
 2023-04-29 18:14:36 +00:00
Josh Roy
01883a6b18
Truncate command and argument descriptions (#5314) 
Fixes #5315.
 2023-04-29 19:00:40 +01:00
Josh Roy
9133dce3eb
Merge branch '2.x' into refactor/folia 2023-04-15 20:34:56 -04:00
Josh Roy
3a737480ec
Remove unneeded sanitization in webhook names (#5311) 
Regression from 384f63bf92
 2023-04-13 07:15:48 +01:00
diademiemi
384f63bf92
Allow configuring Discord webhook name (#5159) 
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
 2023-04-10 00:27:36 +00:00
Josh Roy
4cb861badc
Run interaction commands async for now (hopefully okay) 2023-04-02 21:11:55 -04:00
Josh Roy
7279be7850
allow DiscordMessageEvent calls from any context 2023-04-02 20:58:56 -04:00
Josh Roy
4ff9286a79
Move over some discord things 2023-03-30 13:28:41 -04:00
Josh Roy
0e4bab24cb
Get like 70% of the plugin to work 2023-03-27 23:31:39 -04:00
Josh Roy
ca71d93963
Fix discord permission issues with link module (#5197) 2022-12-27 21:07:47 +00:00
Josh Roy
520e8f991f Add DiscordService#getInviteUrl 2022-12-26 01:24:17 +00:00
Josh Roy
52c500ee6d Add InteractionRole#getAsMention + InteractionRole#canInteract 2022-12-26 01:24:17 +00:00
Josh Roy
ba5a8becfc Add support for role arguments in slash commands 2022-12-26 01:24:17 +00:00
Josh Roy
2a1957229f Add InteractionMember#hasRole convince methods 2022-12-26 01:24:17 +00:00
Josh Roy
939e5c5a55 Add InteractionRole#isPublicRole 2022-12-26 01:24:17 +00:00
Josh Roy
80bbf8c55b Add DiscordService#getRole & DiscordService#modifyMemberRoles 2022-12-26 01:24:17 +00:00
Josh Roy
376abc4aab Add DiscordService#getMemberById 2022-12-26 01:24:17 +00:00
Josh Roy
a7f4d6b16b Add InteractionMember#getAsMention 2022-12-26 01:24:17 +00:00
diademiemi
db10678095
Add first join message type for Discord (#5160) 
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>

Add a new message type for when a player has joined for the first time.
 2022-12-24 14:59:00 +00:00
Josh Roy
4414eea513
Close discord webhook clients on shutdown (#5165) 2022-11-27 19:29:36 +00:00
Josh Roy
6e931b2b3b
Fix ConsoleInjector not getting reinjecting on reload (#5149) 2022-11-11 15:28:55 -08:00
Noah van der Aa
4aa93a43db
Add mutable "viewers" list to DiscordRelayEvent (#5080) 
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
 2022-10-14 22:26:01 +00:00
Josh Roy
0ca58ce4ba
Rewrite User storage and UUID cache (#4581) 
Co-authored-by: triagonal <10545540+triagonal@users.noreply.github.com>
Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
 2022-09-09 15:49:43 -04:00
Josh Roy
b808511efe
Update discord bot authorization tutorial (#5098) 2022-09-02 09:43:09 -04:00
Josh Roy
b135fcf086
Fix leave messages being sent when vanished (#5009) 2022-07-23 18:35:14 -04:00
Josh Roy
4a53cfe7ac
Prevent role snowflakes from resolving roles with ids as names (#4983) 
Fixes #4981.
 2022-07-10 00:24:04 +01:00
Josh Roy
a60f3c067f
Fix Essentials' logger breaking on 1.8.8-1.12.2 (#4975) 2022-07-02 14:50:45 -04:00
Josh Roy
6816eb4e18
Use component logger on Paper for console colors (#4941) 
Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
 2022-06-27 14:54:10 -04:00
Josh Roy
0931b21f6d
Fix places where Discord formatting wasn't sanitized (#4945) 
Fixes #4891
 2022-06-15 15:35:12 +00:00
Josh Roy
9147d1036d
Fix ANSI color codes not getting stripped on Paper (#4942) 
Paper uses 0x7f as an intermediate character between adventure and its ANSI pattern converter, we need to strip this.
 2022-06-15 16:31:42 +01:00
MD
a7f602e2ad Remove commons-lang3 dependency 
`commons-lang3` is scheduled for removal by Spigot.

This commit reimplements the methods we use from StringUtils in StringUtil, and replaces NumberUtils.isDigits(String) with NumberUtil.isLong(String).
 2022-06-15 16:18:35 +01:00
Josh Roy
b916488de2 Bump VersionUtil and Spigot 2022-06-15 16:18:35 +01:00
Josh Roy
41f5cc3175
Use Paper command forwarding API (#4794) 
Uses API added in PaperMC/Paper@9940bca, when available.
 2022-02-06 17:56:13 +00:00
Josh Roy
5f98d3fac5
Add mitigation for JDK-8274349 (#4711) 2021-12-24 21:40:41 -05:00
MD
d53ff36a2a Prevent IndexOutOfBoundsException in interaction replies (#4690) 2021-12-15 20:55:37 +00:00
Josh Roy
840035944a
Truncate Discord interaction messages to proper length (#4686) 2021-12-14 18:46:59 +00:00
Josh Roy
20a7d1c7ee
Add DiscordRelayEvent to edit relayed Discord->MC messages (#4656) 
Implements the event suggested in #4580.

Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
 2021-12-14 16:26:57 +00:00
Josh Roy
dc27af78bf Update to MC 1.18.1 2021-12-11 12:13:50 +00:00
Josh Roy
9b629e42d8
Bump JDA + discord-webhooks dependencies (#4655) 2021-12-04 14:47:40 +00:00