Commit graph

347 commits

Author SHA1 Message Date
b7c8e9dfa6 Added check for Maven project 2017-06-23 19:36:17 +02:00
329c2eeaa2 Added *temporary* solution to pinned messages 2017-06-23 14:13:13 +02:00
471d394a49 Fixed redirect 2017-06-16 23:47:30 +02:00
82c2907606 Added vampire version of the question 2017-06-16 18:34:42 +02:00
alisolarflare
42bc7639be kek 2017-06-15 20:27:35 -06:00
f441d39145 Discord login started (OAuth2) 2017-06-15 22:14:06 +02:00
6cd81a6776 FINISHED basic support for mcchat (#12) 2017-06-14 22:10:26 +02:00
alisolarflare
1ad49dfe23 More responses 2017-06-09 00:01:24 -07:00
c4323d3388 #32, progress with mcchat (#12) 2017-05-31 22:42:19 +02:00
9abb342aa9 Fixes for mcchat 2017-05-28 11:56:47 +02:00
173bc40a1d Getting sender for receiving messages too 2017-05-28 11:26:23 +02:00
cb8eeb20c2 Continued adding support for mcchat (#12)
And added more server ready questions
2017-05-25 14:30:55 +02:00
914cd60694 Added mcchat (#12), needs testing 2017-05-24 13:37:12 +02:00
adb0144f91 Fixed player getting in chat 2017-05-22 21:33:12 +02:00
alisolarflare
5fbcf9a4a2 Update CommandListener.java
Added more times when the server will be ready
2017-05-16 11:48:48 -04:00
bb416ee075 Fixed issue 2017-05-15 02:19:40 +02:00
0bbb436992 Added when server will be ready 2017-05-15 01:52:09 +02:00
cf0d2e7d5d Fixed #27 and did a bit of #16 2017-05-13 16:08:01 +02:00
01db886917 Updated Discord4J stuff, getInfo shows more, etc. 2017-05-07 01:06:57 +02:00
c23d9aee09 Fixed chat msg loss <@187257785199624194>
Probably

Also fixed exception filtering
2017-04-28 22:41:23 +02:00
1ba108fb21 Added mute support and other stuff 2017-04-28 17:52:01 +02:00
d842891618 Added support for game roles with spaces 2017-04-15 22:48:54 +02:00
ea2cc31289 Added an... important bit
Again
2017-04-15 21:10:23 +02:00
1ae389c2aa Added @ Coder ping for exceptions 2017-04-15 13:36:06 +02:00
355ba01929 Finished game roles 2017-04-15 13:22:05 +02:00
e7963e4f9a Fixes and applied changes from the Core 2017-04-11 21:17:47 +02:00
b95b9092f5 Merge branch 'master' into dev
Conflicts:
	src/main/java/buttondevteam/discordplugin/DiscordPlayer.java
	src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
	src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
	src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java
	src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
	src/main/java/buttondevteam/discordplugin/listeners/MCListener.java
	src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
2017-04-02 02:06:00 +02:00
ffbb9a0a91 Fixed and updated plugin to the new things 2017-04-02 01:32:37 +02:00
b21a6b2f5f Moved update progress msgs to bot room 2017-02-04 21:06:39 +01:00
6ce730016d Implemented new player data thingy 2017-01-29 01:49:25 +01:00
dfeae5de9e Added removing cmds from chat and perform method
The perform method handles safe mode and ratelimiting.
2017-01-15 21:19:44 +01:00
2b9164ebc6 Fixes and probably added add cmd 2017-01-14 13:32:33 +01:00
519e0f468e Started game role commands 2017-01-14 01:33:44 +01:00
d50e9a23ce Fixed start message not showing 2017-01-04 20:56:00 +01:00
b7ef8f4048 Applied changes 2017-01-02 01:20:02 +01:00
6c654c28dd Added safe mode 2016-12-31 19:43:35 +01:00
c5edce848f Fixed update details msg 2016-12-31 18:39:54 +01:00
f97d7e7a05 Fixed office channel test location
Also testing it with this commit
2016-12-31 18:35:54 +01:00
7d813e8d59 Testing autoupdate improvements 2016-12-31 18:30:39 +01:00
7aeff53967 Added PR linking - in the condition 2016-12-31 03:08:20 +01:00
6cdac8696d Made delivered reactions more reliable 2016-12-31 00:41:37 +01:00
7e5ab8cbbd Removing obfuscated chars from names 2016-12-27 21:28:22 +01:00
0ba39e3e30 Giving the fix for everyone!
I was tired...
2016-12-27 16:29:38 +01:00
237559d663 Made last chat msg reset on sendMessage 2016-12-26 22:33:38 +01:00
9269e0fb19 Added extra parenthesis 2016-12-25 01:03:05 +01:00
6c1b2e39c4 IT WORKS! (See commit body)
- Added message grouping
- Moved listener and other registrations to the Discord ready event, so
people can't do things before they should
- Spent lot of time on message grouping
2016-12-25 00:48:56 +01:00
2f76583a87 Using embeds for chat and separated restart and stop messages 2016-12-24 16:50:14 +01:00
9383f5ea0c Moved update msgs to <#219530035365675010>
#coffee-table
2016-12-23 23:06:23 +01:00
e8d4f03992 Added embeds to sendMessageToChannel 2016-12-23 22:53:36 +01:00
972ea865e0 Only reacting if prod. or not master
So it won't put a checkmark on master commits if updated on a test
server
2016-12-22 23:46:04 +01:00
4ecbb15bd2 Added reaction after plugin update 2016-12-22 23:20:27 +01:00
6151fa0de9 Made the updater use the chat channel
And fixed branch...
2016-12-22 22:41:38 +01:00
ab90f935fa Testing autoupdate with this commit
- Finished autoupdate
- Made DiscordSender work with no Discord user
- Made the DiscordPlayerSender return the player's name on getName()
2016-12-22 21:56:26 +01:00
c3cc559b61 Added some debug code, testing them now 2016-12-22 21:40:09 +01:00
74fe66ec7d I'm only committing to test it btw 2016-12-22 21:29:55 +01:00
e51c2fe32f Comparing IDs
Now I'm finally only committing after my server is up
2016-12-22 21:22:55 +01:00
599f853f19 Made it use the core's test detection 2016-12-22 21:17:24 +01:00
8f92c8eb9b Why do I keep forgetting registering 2016-12-22 20:59:15 +01:00
3c16795964 Fixed timeout delay after ratelimit 2016-12-22 20:57:13 +01:00
aeee423c5a Added auto-updater listener 2016-12-22 20:52:14 +01:00
03540b430c Made the test notification not show in chat 2016-12-22 20:29:08 +01:00
2053b7f508 Added ratelimit handling for reaction remove 2016-12-21 22:58:23 +01:00
2bcb47b7b5 Some additions and fixes...
- Made the bot only react when msg starts with the ping unless we're in
PM
- Now removing color codes from AFK messages
- Removed /t as an unconnnected cmd as it doesn't work properly
- Added /yeehaw to the unconnected cmds
- Allowing bot commands in mc chat
2016-12-21 22:37:01 +01:00
4570b964b3 Added removing reactions from chat 2016-12-21 20:54:48 +01:00
cd3cc633fb Ok, nooow it should work 2016-12-20 23:07:58 +01:00
2cbfdff383 Copied reaction code from Discord itself 2016-12-20 23:02:20 +01:00
05ab8fa970 Trying 2016-12-20 22:57:42 +01:00
a53c5103f4 Fixed reaction NPE... 2016-12-20 22:47:35 +01:00
e4a4408cbc Removed YEEHAW event handler 2016-12-20 22:32:56 +01:00
ede11fa512 Added the annotation for AFK event... 2016-12-20 22:30:00 +01:00
a05115293d Added checkmark if mcchat send succeeds
Also updated Discord4J to a dev version and other stuff
2016-12-20 21:08:34 +01:00
b28e7fd67f Added line breaks... 2016-12-18 18:43:00 +01:00
2dabfcbae9 Now collecting the command responses to one msg 2016-12-18 18:23:52 +01:00
41f6cc342d Made msgs not send to Discord if cancelled 2016-12-18 12:58:37 +01:00
f7b1090670 Made repeating exceptions only send once 2016-12-18 01:13:09 +01:00
e6dd2ff979 Made the exception itself visible 2016-12-17 12:30:40 +01:00
6a456c20e8 Added new sendTitle overload 2016-12-16 19:47:09 +01:00
cad689a542 Added stack trace filtering 2016-12-16 19:33:23 +01:00
de0fb28747 Added /t cmds for /t list 2016-12-14 22:56:00 +01:00
4500360a02 Readded AFK... 2016-12-12 22:48:37 +01:00
839a90f1f0 Temporarily removing AFK 2016-12-11 20:49:12 +01:00
30266c318e Added AFK messages (#12) 2016-12-11 01:31:16 +01:00
39491efaba Fixed #20 - probably... 2016-12-11 00:46:52 +01:00
0636cb8f33 Partially added #16 2016-12-11 00:41:00 +01:00
fbfa5c9b26 Added YEEHAWs to Discord 2016-12-07 21:19:05 +01:00
6f5bca8993 Made Discord senders use the interface 2016-12-07 17:49:26 +01:00
674c85b136 Added and refactored some things
- Added limit to all messages sent to Discord
- Lowered limit of stack traces as the final message still exceeded
Discord's limit
- Moved common code of the senders to a separate class
- Made broadcasted messages only send once
https://github.com/TBMCPlugins/DiscordPlugin/issues/12
2016-12-07 17:23:40 +01:00
4238a23d39 Fixed occassional echoing 2016-12-07 10:34:32 +01:00
alisolarflare
2026e733e2 Removed colour codes from messages
Ex: <§4~§4§kM§4Ghostise§r> -> <~MGhostise>
2016-12-06 15:01:20 -05:00
b1880eadcd Fixed command whitelist again 2016-12-05 18:57:40 +01:00
2108ce2347 Fixed command whitelist... 2016-12-05 18:49:05 +01:00
28f3f52b83 Fixed cmd whitelist condition 2016-12-05 18:16:36 +01:00
f88c152fc7 Added support for nicknames from MC 2016-12-04 21:42:59 +01:00
faf3b8857f Made the chat also support players 2016-12-04 21:41:17 +01:00
c336de27ea Applied changes 2016-12-04 20:07:58 +01:00
dade15da53 Updated msg 2016-12-04 18:43:43 +01:00
71e90bcf60 Finished DiscordPlayerSender and improved things 2016-12-04 18:28:40 +01:00
19df7a375e Added the rest of the methods manually 2016-12-04 17:53:57 +01:00
e8444636b8 Merge branch 'master' of https://github.com/TBMCPlugins/DiscordPlugin.git 2016-12-04 01:52:52 +01:00
13a3616a47 Added some things
- Made the chat connect message only show up when everything is ready
(probably)
- Made the plugin enable/disable errors send if possible
- Added /mwiki as an allowed cmd
- Added DiscordPlayerSender with a metric shit ton of overridden methods
2016-12-04 01:52:06 +01:00
a838678535 Fixed condition... 2016-12-03 11:20:01 +01:00
a2dd94f501 Fixed stream double access 2016-12-02 23:37:28 +01:00
f484aba361 (#12) Online players can now use their cmds
Assuming it works.
2016-12-02 22:59:54 +01:00
b3131a063f Added proper(?) rate limit handling 2016-12-02 22:13:35 +01:00
95ab347ef6 Made @ChromaBot not count as mentioning 2016-12-02 21:19:12 +01:00
e4871b2785 Added user name for debug 2016-12-01 22:52:06 +01:00
b284bdf148 Fixes 2016-12-01 22:25:05 +01:00
4b44283236 Behave! 2016-12-01 22:06:25 +01:00
ebf862e54a (#12) Added ping and removing color codes 2016-12-01 21:51:12 +01:00
97c568a662 Added sending attachment URLs to MC (#12) 2016-12-01 21:35:21 +01:00
696f359f50 Added death messages (#12) 2016-12-01 21:05:52 +01:00
630384f125 Made unconnected accounts have restricted cmd access 2016-12-01 21:01:25 +01:00
4e2a60e625 Perms are still ignoring me 2016-11-29 22:05:00 +01:00
6808c18d5b Manually denying most Essential perms... 2016-11-29 21:42:05 +01:00
d6b5ae2d88 (#12) Added player join/leave and plugin (un)load msgs 2016-11-29 21:00:39 +01:00
b3153847b0 Made sendMessage async (#12) 2016-11-29 20:36:51 +01:00
4f2c33add7 Made the array of messages send as one 2016-11-28 19:50:44 +01:00
276ab40760 Added partial support for private channels and fixed response location 2016-11-28 18:42:41 +01:00
f338c815f1 Added command support and fixed isOp 2016-11-28 18:18:37 +01:00
ec5265f054 Added DiscordSender, fixing and adding things
- It allows putting the Discord name in the chat and other plugins'
commands to work with it
- It will now only forward the general chat from MC
- It will no longer echo the message sent from Discord
2016-11-28 18:11:16 +01:00
cadd04ccd1 Removed server shutdown message 2016-11-26 15:36:46 +01:00
7de50eb00d Added message for testing 2016-11-25 21:35:21 +01:00
20d6cd7313 IT WORKS! Chat works! With some bugs ofc 2016-11-25 21:05:35 +01:00
df75adb67a Did the MC chat connection, at least a test 2016-11-25 19:16:19 +01:00
alisolarflare
8069c71663 Re-added issue and debug channels 2016-11-23 11:49:01 -05:00
alisolarflare
b5c0d481dc Revert "Revert "Added bot-room channel""
This reverts commit 416f110ca6.
2016-11-23 11:44:44 -05:00
alisolarflare
416f110ca6 Revert "Added bot-room channel"
This reverts commit 0ba9803644.
2016-11-23 11:44:08 -05:00
alisolarflare
0ba9803644 Added bot-room channel 2016-11-23 11:34:42 -05:00
alisolarflare
81f531fa6c Deleted serverissues and debug channel 2016-11-23 11:06:44 -05:00
alisolarflare
25e189e4d1 Moved debug channels to #bot-room 2016-11-23 11:04:00 -05:00
alisolarflare
f7c6614c2a Merge remote-tracking branch 'refs/remotes/origin/master' into Ali
# Conflicts:
#	src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
2016-11-21 21:20:53 -05:00
alisolarflare
930c6bea05 Added DebugMessageListener to DPlugin 2016-11-21 20:29:53 -05:00
e2870ef4b0 Updated chat channel ID 2016-11-20 02:45:20 +01:00
d87cb6cbaf Fixed userinfo finding user by tag 2016-11-19 20:12:53 +01:00
a954720ebd Started MC chat (#8) 2016-11-15 22:01:55 +01:00
6e67787083 Moved listeners 2016-11-15 21:15:23 +01:00
714c4c3de2 Fixed some issues 2016-11-15 21:05:18 +01:00
0ff139928b Added support for role mentions
After a while of trying to test it locally while my PC is already busy,
I decided on continuing to test in production. This is alpha stage
afterall.
2016-11-15 20:48:45 +01:00
1871dfbb2f Testing again 2016-11-14 19:40:29 +01:00
c22fdeac49 Added back and changed 2016-11-14 19:37:45 +01:00
eaf74d9d83 Remove to test 2016-11-14 19:36:24 +01:00
ec43d39257 Testing for embeds 2016-11-14 19:33:29 +01:00
0839dbba73 Remove and test 2016-11-14 19:29:30 +01:00
6ef6882335 Checking for attachments 2016-11-14 19:26:37 +01:00
3066271c0e Removed thingy and hopefully triggered it 2016-11-14 19:20:46 +01:00
ce9e2987b3 Added typing and test 2016-11-14 18:06:54 +01:00
f665d1c8b9 Fixed NPE in userinfo 2016-11-14 17:41:55 +01:00
8c5dd3b320 Improved help and actually added it to cmds 2016-11-12 20:14:16 +01:00
6a4b776c37 Probably made the connect cmd case insensitive and other things 2016-11-12 01:43:54 +01:00
b144a55935 Fixed userinfo command in PM 2016-11-05 19:46:14 +01:00
73280fa88e Added some config saving code 2016-11-05 19:21:34 +01:00
19dd0f5ef5 Merge branch 'master' of https://github.com/TBMCPlugins/DiscordPlugin.git 2016-11-05 18:55:37 +01:00
31a81d7849 Fixed command paths 2016-11-05 18:55:24 +01:00
f8404c56c5 Improved test mode and removed some messages 2016-11-05 16:53:14 +01:00
e7531fd830 Made the exception handler more reliable 2016-11-03 22:45:21 +01:00
b43b7c86ff Added and fixed a bunch of things
- Added exception handler to Discord commands
- Added retry code for getting guilds/servers
- Added max message length for exception sending to Discord
- Made the connect message only appear in Minecraft when needed
- Fixed status formatting in userinfo
- Improved userinfo command
- Other fixes and improvements
2016-11-02 22:53:55 +01:00
fb5dd60b84 Fixes and stuff 2016-11-02 18:37:36 +01:00
754ed869f1 Finished player info things 2016-11-01 21:30:52 +01:00
f60a5205de Added messages 2016-10-31 18:07:53 +01:00
b2e9503a02 Again... 2016-10-31 17:39:14 +01:00
4d62c09b36 Fixed typo... 2016-10-31 17:38:37 +01:00
0d29781713 Added testing status for bot 2016-10-31 17:27:17 +01:00
c6a07162c3 Added userinfo command 2016-10-31 00:28:15 +01:00
d8dcf72075 Added messages and fixes (#3) 2016-10-30 23:18:02 +01:00
cacb14a307 Why haven't I commited this
Only the plugin.yml and registering /discord is the current change.
2016-10-30 23:10:02 +01:00
c6b831e035 Added code to actually run commands
Also made it not respond to bots...
2016-10-29 23:56:30 +02:00
01ee8d7e94 Fixed file delete and prevented constant config saving 2016-10-29 23:20:16 +02:00
9614fa0994 Fixed plugin.yml 2016-10-29 22:46:56 +02:00
7cd3a9c85e Probably finished /discord command 2016-10-29 22:22:45 +02:00
e6829fb7c9 Added commands 2016-10-29 20:45:52 +02:00
d30964bec8 Connect accept WIP, refactoring again... 2016-10-28 22:19:55 +02:00
267555848c Added a few things
- Implemented the connect command on the Discord side
- It'll retry if the message sending failed
- Wait for distinguish
2016-10-28 19:48:27 +02:00
0d4dc309a5 Started connect command 2016-10-25 22:21:25 +02:00
73629cbd64 Fixed another import 2016-10-24 20:09:58 +02:00
a782d287b0 Fixed import 2016-10-24 20:07:52 +02:00
bd81c0f485 Added sending event errors to Discord 2016-10-23 02:51:35 +02:00
555faa7f52 Added #6 and #4 2016-10-23 02:02:16 +02:00
6ab6bc9fc6 CommandListener almost done 2016-10-22 01:59:58 +02:00
441db0b6e6 Added code to unpin messages in general 2016-10-21 23:53:28 +02:00
b1d6d61e61 Fixes, improvements 2016-10-21 22:38:17 +02:00
c3fbbdfcaf Added #1 fully 2016-10-21 22:08:58 +02:00
5379d2cc1a Moved to general chat for regular posts and added pinning 2016-10-18 22:08:07 +02:00
f7dfc297ee Improvements, fixes, additions
- Now it waits 10s even if sending the message failed
- And it'll retry sending it
- Fixed condition
- Added posting distinguished posts to announcements
2016-10-10 21:40:45 +02:00
45f6cdd39f Updated Discord4J, fixed token file location 2016-10-08 18:05:04 +02:00
7db8c283f5 Reverse order and URL fix 2016-10-08 17:29:11 +02:00
ac851a845b Added if 2016-10-08 17:08:45 +02:00
01edb18649 Changed the order and simplified message 2016-10-08 17:05:05 +02:00
4db7bb7082 Added logout and a small fix 2016-10-08 16:57:54 +02:00
bd51083568 Added line to send message 2016-10-08 16:47:17 +02:00
23fbc0824c Fixed some NPEs 2016-10-08 16:44:01 +02:00
b49da2f1df Worked on #2 2016-10-07 23:48:39 +02:00
824c72318c Small changes 2016-10-06 22:39:12 +02:00
08932887b1 Added API stub (#4) 2016-10-04 21:55:03 +02:00
f0959c1abe Started #2 2016-10-04 21:40:09 +02:00
b94a689a1e Fixed logging and saying hi to the bot channel 2016-10-03 22:16:08 +02:00
842f8a63b7 Fixes 2016-09-17 22:20:43 +02:00
6f5baf6836 Added files 2016-09-16 23:07:53 +02:00