Commit graph

358 commits

Author SHA1 Message Date
de857fef0b
Channelcon&chat&other fixes
#58 fixed
Made checkmarks stored separately per channel
#55 fixed
Correctly handling interrupt events, a local bug might have been fixed where the server didn't always stop.
Added a reset command

Needs testing
2018-07-19 00:39:17 +02:00
e718fafd52
Added API changes 2018-07-15 01:14:04 +02:00
38ef88f10d
Add ButtonCore dependency
And remove PEX dependency
2018-07-02 15:56:36 +02:00
735f6d4085
Fix #59 2018-06-23 21:53:52 +02:00
e47f8abb05
Channelcon chat works!
groupid, not args... that took a while to track down...
Various fixes regarding channelcon
Saving channel connections works
Fromcmd fix for channel cmds
Only allow game roles from the main server
Game role fix
Only allowing one connection per group for now
2018-06-13 23:54:27 +02:00
29683d4c0c
Channelcon chat almost works
#52
2018-06-13 01:30:17 +02:00
1b85eb027a
Channelcon works, chat not yet
Sending/receiving or saving connections doesn't work yet
Command logging for Discord
/ prefix works from #bot
Plugin update update (#37)
#52
2018-06-08 23:45:10 +02:00
b8814030e2
Fixes, channelcon, emoji
Limited timeout for shutdown message
Added some unconnected commands
Fixed mcchat tasks on shutdown
Added /rp as an allowed channel
Changed help texts to use /command syntax
Added channelcon remove
Added emoji parsing
2018-06-08 01:48:07 +02:00
b60c4f5090
Many fixes and debug messages
Mainly game roles
Mostly debug messages
2018-06-06 23:22:16 +02:00
0497d6c8ac
Fixes & debug & /lenny
Fixed cmd handling for real
Added debug command (not the best for debugging commands)
Stop send/receive threads on shutdown
Allow /lenny for the unconnected
2018-06-06 00:12:55 +02:00
b350be608a
Fixes & fromcmd
- Exception handling got extra parenthesis
- Async player join event handling
- Added fromcmd check (shows /tableflip and similar)
2018-06-03 02:44:32 +02:00
aabdd3a914
Channel connect, fixes
- To do or not to do
- Fixed args handling regarding whitespace
- Showing the help text for cmds when needed
- Fixed userinfo cmd not accepting spaces while Discord does
- Moved command registration to start, not the initializer
-- Prevents possible deadlocks according to IntelliJ
- Other fixes
2018-05-22 22:43:36 +02:00
fba5c5b49a
Fixes, channel con work
Connecting channels is WIP
2018-05-22 01:42:52 +02:00
b60bf36864 Finished game roles
Still needs testing

Couldn't set GPG signing up - yet
2018-05-07 01:11:08 +02:00
20b9d6947b Channel cmds, game role detection
- Add channel handling
- Add autodetect of game roles
-- Announces adding/removing/changing them
--- TODO
2018-05-06 01:03:22 +02:00
155311b019
MCchat and other fixes
- Fixed disallowed command stopping message processing
- Fixed failure sending a message to Discord stopping msg proc.
- Added timestamps for messages showing when the message was sent
- Fixed mentioning in mcchat (now it only detects it's own roles)
- Fixed exception reporting (shouldn't break the code block, also only shows buttondevteam lines)
2018-04-17 19:05:52 +02:00
68e99e0000
Some fixes (DAPI, mcchat) 2018-04-08 02:39:05 +02:00
b31aea0c04
Fixed role admin cmds
And some code analysis stuff
2018-04-07 01:05:54 +02:00
42966d0feb
Removed religion making offer
For now
2018-02-14 21:07:52 +01:00
1bf0024dc4
Fixed removing delivered reactions 2018-01-09 19:40:58 +01:00
3af44a053a
Discord->MC fixes (mcchat) 2018-01-07 20:58:23 +01:00
ee2e979e12 Either fixing or breaking mcchat
Made it a few days ago
Using a queue to send messages to Discord
2018-01-03 19:36:11 +01:00
a4ca1bb6d3
Fixed message grouping in mcchat
Also updated the role adding cmd path
2017-12-26 02:02:00 +01:00
6027315d09 Channel IDs shown always + more
* Server restart/stop now sends to PMs
* Special handling of players kicked because of shutdown/restart
* Enter safe mode on disable so actions won't be attempted to be
performed anymore
* Channel ID relocation in PMs also has the effect of showing the actual
message in notifications
2017-12-07 22:01:05 +01:00
6fc92d5083 Made smaller API changes 2017-11-30 22:15:34 +01:00
4c8a1c4582 Refactoring, ChromaBot API, fixes, needs testing 2017-11-29 22:30:34 +01:00
20ff9cc3e6 Only showing join/leave/etc. messages if not hooked 2017-11-28 23:07:34 +01:00
0c9dd6f49a Server crash stack trace zero
Forgot to commit this for a whiiile
2017-11-24 23:53:48 +01:00
f8c543017a The hack works! 2017-10-29 18:49:52 +01:00
f85b56fe28 Quite big hack for hooking into all broadcasts
Right now it doesn't let anyone in.
2017-10-29 02:00:44 +02:00
541913e2af Fixed embeds in sendMsg & added embedWithHead 2017-10-28 20:55:26 +02:00
4ada764a04 Separated waiting and not waiting msg sends 2017-10-28 01:01:31 +02:00
1244b50560 MCChat fixes 2017-10-28 00:27:00 +02:00
2308ef4195 Excluded list impr., MCCHAT FIX, API upd. 2017-10-24 22:29:46 +02:00
08fae9b73b Implemented player list + Fixed early msg error
- The description of the mcchat channel now contains the list of online
players
- Fixed error if someone said something on Discord when the plugin
wasn't ready

(Left the debug msgs in and had to force close Eclipse so it doesn't get
pushed)
2017-10-22 03:03:15 +02:00
51adad4bd6 Added RP channel for the public chat 2017-09-09 22:07:43 +02:00
9a00c260a4 Fixes related to mcchat and other fixes
- Fixed crash of PresenceUpdateEvent
- Lowered the frequency of full houses
- Removed testing-related method
- Added support for null exception messages...
- Added indicator to show if someone is talking from Discord
2017-08-23 02:44:53 +02:00
e4382bbcd2 Full house cooldown, reset last msg in PM
Plus test account enforced
2017-08-18 03:12:33 +02:00
6e619f659f Bunch of fixes!
- Fixed fake user name, some plugins depend on MC name - Players will
need to relog into mcchat if their name changed
- Fixed join-while-mcchat in ButtonCore
- Fixed Discord->MC messages showing up in inccorect places on Discord
- Fixed chat channel feedback
- Other fixes
2017-08-15 03:05:38 +02:00
0156888681 Fixes, implemented ChatRooms
A few hours ago
2017-08-07 20:42:28 +02:00
447f0a3d25 A fix regarding private pins and part of #34 2017-08-06 23:09:26 +02:00
cda76fdb93 Fixes, added quitting fake players on disable 2017-08-06 02:23:13 +02:00
649fd4611f Excluding ProtocolLib from fake player events 2017-08-05 15:45:31 +02:00
67074017d2 Added chat channel & mixed case cmds support
Needs testing
2017-08-04 13:33:26 +02:00
b0c791e622 Did some old open issues
#5 - Post if the server crashes
#7 - When announcing a Reddit post, use Discord names, if known
#9 - Print "full house" when full house
2017-07-19 13:26:22 +02:00
11ecabe325 Added important parenthesis 2017-07-13 12:56:43 +02:00
fd14bf1954 FINISHED mcchat!
#12 #13
Vanilla commands are supported as well
Now it'll send the command output to the player as well, if ran on
Discord
Minecraft chat sending to Discord made async
Started using CraftBukkit
Updated Travis config according to that
2017-07-13 00:58:05 +02:00
a501d9d457 Lot of bugfixes and improvements for mcchat
#12 (PM support should be finished)
#13 works
In no particular order:
Fixed duplicate responses, messages, wrong quit/join event calls, made
the private chat enabled state only persist until the server is
restarted, testing message always appears in PMs, added separate senders
for public and private chat, sending all kinds of messages to private
chat as well, adjusted message for non-whitelisted cmds, changed a lot
on sender getting etc.

1-2 hours of sleep, then work, then programming in the morning, more
sleep, more programming throughout the day.
2017-07-12 00:00:19 +02:00
abe8af501e I HAVE A MORE WORKED OUT PLAN 2017-07-10 14:28:04 +02:00
a85b7f9a2d Continued work on mcchat 2017-07-09 21:30:37 +02:00
d2467210dd I HAVE A PLAN! (A todo list) 2017-07-09 02:49:18 +02:00
9e85883e34 Mostly fixed permissions (now it's recursing) 2017-07-08 02:13:56 +02:00
2aca1551ef Probably done with DiscordConnectedPlayer 2017-07-07 02:22:44 +02:00
c746543042 Fixed that one line changing everything 2017-07-04 22:15:24 +02:00
69599cdd20 Added one line that changes everything
Hopefully in a good way
2017-07-04 21:48:23 +02:00
cf5aaa53fb Undid delegate, mcchat fixes, testing check
It checks if it's running in production and another copy is testing at
the moment
2017-07-04 18:04:01 +02:00
9d0525571b Lombok still doesn't work compile-time 2017-07-04 03:16:32 +02:00
39bbeafe6b Added Lombok, started fake player 2017-07-03 23:45:14 +02:00
92e7e6abc4 Updated autouppdater, colorized chat & test check
Also using RequestBuffer...
2017-07-01 01:31:31 +02:00
6dd21b03c1 Applied changes and a fix 2017-06-30 18:29:21 +02:00
a6244b7f9f Fixed mcchat stuff and ch IDs added etc.
#12
2017-06-30 16:55:13 +02:00
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