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

54 Commits

Author SHA1 Message Date
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
Josh Roy
3f857e3183 Fix DiscordUtil#getOrCreateWebhook using webhooks without tokens 2021-11-25 14:03:56 -05:00
Josh Roy
668c9634ca Ensure JDA is started before allowing calls to the JDA object 2021-11-25 14:03:56 -05:00
Josh Roy
680d3230ea
Add /discord command to display invite code (#4620) 2021-11-06 19:18:37 -04:00
Andre_601
78c846a0a8
Minor typo corrections for EssentialsXDiscord (#4603) 2021-11-01 21:41:58 -04:00
Josh Roy
9601687190
Add console regex filter for discord module (#4534) 2021-10-24 12:12:42 -04:00
Josh Roy
2ed94f1048
Add provider to use new Paper advancement API (#4588) 
Paper added in PaperMC/Paper@40ee634
 2021-10-24 14:27:07 +00:00
Josh Roy
58b0fb089f
Improve error message when primary channel is improperly defined (#4586) 
* Improve message verboseness when primary channel is improperly defined

* Clarify primary channel behavior
 2021-10-20 13:09:56 +01:00
Josh Roy
43f4d306be
Add discordbroadcast command (#4541) 
* Add discordbroadcast command

* Update EssentialsDiscord/src/main/resources/plugin.yml

Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>

* Add emoji parsing/tab complete for discordbroadcast command

Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
 2021-10-11 15:54:55 -04:00
Josh Roy
cb7d9baf7a
Fix exception while running vanilla commands for chat command relay (#4552) 
Fixes #4545
 2021-10-11 19:32:41 +00:00
Josh Roy
d86b471402
Add action message type (#4520) 
Adds a message type which will show when a player runs the /action (/me) command.

Message Type:
```yml
# Configure which Discord channels different messages will be sent to.
# You can either use the names of the channels listed above or just the id of a channel.
# If an invalid channel is used, the primary channel will be used instead.
#
# To disable a message from showing, use 'none' as the channel name.
message-types:
  ...
  # Action messages sent when a player runs the /me or /action commands.
  action: primary
```

Message Format:
```yml
# The following entries allow you to customize the formatting of messages sent by the plugin.
# Each message has a description of how it is used along with placeholders that can be used.
messages:
  ...
  # This is the message sent to Discord when a player runs the /me or /action command.
  # The following placeholders can be used here:
  # - {username}: The name of the user who ran the command
  # - {displayname}: The display name of the user who ran the command
  # - {action}: The action (message) the user used in the command.
  # ... PlaceholderAPI placeholders are also supported here too!
  action: ":person_biking: {displayname} *{action}*"
```
 2021-09-15 14:52:14 +00:00
Josh Roy
1179caab88
Fix bot-command-relay option not ignoring itself (#4453) 2021-08-12 12:37:19 +01:00
Josh Roy
36432c65e9
Fix NPE on webhooks messages with show-webhook-messages enabled (#4452) 
Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>

Fixes #4451.
 2021-08-09 21:30:30 +00:00
Josh Roy
871e718f63
Add online/unique placeholders to join/leave formats for discord (#4427) 2021-08-09 16:23:49 -04:00
Josh Roy
ac8a13f039
Add name parameter for Discord avatar URL (#4369) 
Allows offline mode/Geyser users to configure their own avatar URL using a service that accepts usernames.
 2021-08-09 19:48:43 +00:00
Josh Roy
c221e96122
Make discord chat format world name use world alias (#4419) 2021-08-09 19:57:03 +01:00
Josh Roy
26c016fea2
Add config option to allow webhooks/bots to send commands (#4442) 
```yml
# Console relay settings
# The console relay sends every message shown in the console to a Discord channel.
console:
  ...
  # Set to true if bots/webhooks should be able to send commands through the command relay.
  bot-command-relay: false
```
 2021-08-09 18:48:01 +00:00
Josh Roy
9179c6c1e2
Update EssXDiscord tutorial for new developer mode location (#4409) 2021-08-09 19:38:04 +01:00
Josh Roy
3f9aceb922 Add DiscordService#sendChatMessage 
Allows plugins to send messages to the chat channel via API using the format from our config
 2021-08-07 17:37:02 -07:00
Josh Roy
3da8efae49 Fix incorrect parameter name for allowGroupMentions 2021-08-07 17:37:02 -07:00
triagonal
90828965df
Fix NPE during reload with invalid discord bot tokens (#4417) 2021-07-31 10:19:20 -04:00
Josh Roy
17e026f9aa Require MessageType's start with a letter 
May cause issues with YML serialization as it can get finicky with keys starting with numbers.
 2021-07-28 16:24:09 -07:00
Josh Roy
f1d7e50dc0 Don't warn about unregistered channel-id based MessageType's 
You shouldn't be registering these, there is no point for a user to configure where these go because it would be ignored.
 2021-07-28 16:24:09 -07:00
Josh Roy
e2cb7b2102 Fix advanced relay breaking when multiple channels were defined 2021-07-28 16:24:09 -07:00
Josh Roy
28578a5d8a Fix some typos in the tutorial 2021-07-28 16:24:09 -07:00
Josh Roy
1556b911b2
Fix webhook messages being parsed unnecessarily (#4346) 
This wasted CPU time parsing responses from Discord that we will never use, plus caused problems when parsing webhooks that our library couldn't parse correctly (MinnDevelopment/discord-webhooks#36).
 2021-07-11 20:36:46 +01:00
triagonal
c020526b1e
Strip formatting in webhook name (#4344) 2021-07-11 09:57:46 -04:00
Josh Roy
cca98e817f Add show-displayname option 2021-07-10 11:08:51 -04:00
Josh Roy
46a8a7d04c Remove join/quit message null checks 
If you don't want to see them, don't configure them.
 2021-07-10 11:08:51 -04:00
Josh Roy
d4ddc87d81 Fix less strict length check on messageQueue add rather than iteration 2021-07-10 11:08:51 -04:00
Chew
b473460ffc Use native Discord timestamps for console timestamps 2021-07-10 11:08:51 -04:00
Josh Roy
db027bced3 Add option to log channels to console 2021-07-10 11:08:51 -04:00
Josh Roy
12cc0b99f9 Fix some minor grammer issues in config 2021-07-10 11:08:51 -04:00
Josh Roy
15cac529c5 Improve death message validation 
Now takes gamerules in to account and will not send blank or null death messages.
 2021-07-10 11:08:51 -04:00
Josh Roy
feed2d6a45 Fix improper bitwise logic in DiscordUtil#getRoleColorFormat 2021-07-10 11:08:51 -04:00
Josh Roy
3bc58264ea Add advancement message type 2021-07-10 11:08:51 -04:00
Josh Roy
0a0416ae38 Fix disabling a single command causing all commands to be disabled 2021-07-10 11:08:51 -04:00
Josh Roy
d244956b4b Ensure no JDA code is called during invalid shutdown 2021-07-10 11:08:51 -04:00
Josh Roy
37e3730e9d Add fake vanish join/leave + exclude vanished messages 2021-07-10 11:08:51 -04:00
T41US
cba5063b33
Add config option to change discord show-avatar url (#4330) 
Co-authored-by: T41US <adityakomp@gmail.com>
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
 2021-07-07 19:55:43 +00:00
pop4959
2858bd3784
Add role placeholder to Discord message format (#4329) 
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
 2021-07-07 11:55:25 -04:00
Josh Roy
7e25570344
Remove usage of java.awt.Color (#4312) 
This fixes issues on headless JREs which lack java.awt classes.
 2021-07-03 20:46:09 +01:00
Josh Roy
d78729f343
Disallow empty discord filters (#4298) 2021-07-01 15:59:35 -07:00
Josh Roy
a55289196b Add server start/stop messages 2021-07-01 15:56:46 -04:00
Josh Roy
3505b47d8f Fix vanilla command execution on discord 2021-07-01 15:56:46 -04:00