ChromaGaming/Chroma-Discord
1
0
Fork 0
Code Issues 21 Pull requests Packages Projects Releases 8 Wiki Activity
462 commits 3 branches 8 tags 1.3 MiB
Commit graph

404 commits

Author SHA1 Message Date
Norbi Peti 8e2538e553
Ignore case for role command 2019-04-05 17:26:10 +02:00
Norbi Peti 22bdc3fa62
YEEHAW fix, reload command 2019-03-16 14:49:27 +01:00
Norbi Peti 2b4034b05f
NPE and 2 cmd fix 2019-03-14 16:40:58 +01:00
Norbi Peti b39a571246
Made excluded plugins configurable 
Using configable mod role in debug command
Also moved the AnnouncerModule
 2019-03-09 23:09:27 +01:00
Norbi Peti cadb53d886
Made the plugin work cleanly (#51) 
Clean install works pretty well
Automatically setting first server as main server
Removed devServer variable, getting the guild from the channels
Disabling each component that doesn't have its channel(s)/role(s) set correctly (unless it's not required)
Removed redundant variable from the FunModule
Correctly handling missing channel settings in some places
Checking any role position for game roles, not just "ChromaBot"
The bot is playing Minecraft now
Always giving permission for commands for now
 2019-03-09 02:07:56 +01:00
Norbi Peti 14c42614d8
#bot mention ch null handling, limiting tries 
Won't try to get channels forever, since they may be set incorrectly
 2019-03-02 19:04:38 +01:00
Norbi Peti 0f1f7b4ead
Better handling of missing token 
Also moved the token's location
 2019-03-01 18:01:32 +01:00
Norbi Peti ca5fb90774
Command system fixes 
In encounter order:
Lowercasing message first character on the sender
Command sender fixes
Mention deleting fixed if there is no space
Added error handler to the message receive event
Converted role command
 2019-02-23 00:33:10 +01:00
Norbi Peti 325b094bf7
Converted all commands 
Well, haven't finished the role command
 2019-02-22 00:44:13 +01:00
Norbi Peti 0c9da49add
Brtoggle & cmd fix 
#89
Channelcon
Attempted to support chat rooms in custom chat
 2019-02-17 02:26:14 +01:00
Norbi Peti 0cbc22eb72
Added support for broadcast toggles 
#89
 2019-02-16 14:08:37 +01:00
Norbi Peti 5a9986de4f
Command stuff fixed 
Replies sanitized, userinfo converted
Manually removing spaces
Tested
 2019-02-16 00:39:48 +01:00
Norbi Peti 13b168d238 Made all channels configurable 
Removed Vault repo, was unused and errors now
Removed all channel fields from main class
 2019-02-13 15:21:57 +01:00
Norbi Peti 9ba57fd989
Actually using the cmd sys, logger stuff 
Some of the new files are a couple days old
Using the plugin's logger almost everywhere
 2019-02-12 22:40:09 +01:00
Norbi Peti d08d32f73f
Started using new command system for DC cmds 
Some of the new files are a couple days old
 2019-02-09 00:24:42 +01:00
Norbi Peti abd4050786
Server start/stop msg + announcer fix 
Announcer data migration fix (which won't be needed because I'm gonna copy the new config over)
The server start/stop messages show up again
 2019-01-30 23:41:52 +01:00
Norbi Peti 2659170c4d
Modules, fixes, pins 
Keeping 40 pinned messages instead of 10
GameRoleModule fixes
AnnouncerModule
Other fixes
#51
 2019-01-30 01:09:18 +01:00
Norbi Peti 7c15495fab
Using modules more & calling preprocess event 
Calling the command preprocess event
Added to FunModule (/list, full house)
Made whitelisted commands and other stuff configurable
Game role module
Name change
#51
 2019-01-28 23:21:17 +01:00
Norbi Peti 5c7100bb69
Added check for mcchat on shutdown 
It'll only log fake players out that aren't actually on the server
 2019-01-20 00:43:47 +01:00
Norbi Peti baa9cb65c8
API changes 2019-01-12 01:29:34 +01:00
Norbi Peti 93af5f66d2
Fixes and improvements (config) 
Fixed occasional ConcurrentModificationException with the custom chat loading
Waiting much less on MC command responses (0.2s instead of 0.5s)
Made the #bot channel configurable
Linking the #bot channel everywhere it's mentioned
#51
 2019-01-10 01:45:45 +01:00
Norbi Peti f13c8321cd
Slight API change 2018-12-27 01:16:55 +01:00
Norbi Peti 1911672b10
Christmas hotfix 2018-12-26 01:35:36 +01:00
Norbi Peti 68e69782ee
Well, not everything 
Fixed some private mcchat issues
Fixed #85
 2018-12-23 23:50:13 +01:00
Norbi Peti 040373280e
Everything seems to work 
Removed double handling of certain events in MCListeners
Removed MentionEvent handling completely
Some mcchat fixes
 2018-12-23 22:34:26 +01:00
Norbi Peti 7a6b79365f
Another version of the events stuff 
It directly calls the methods in the modules
Also made a fun module
 2018-12-23 03:22:50 +01:00
Norbi Peti e29e6f1682
First version of new events stuff 
Actually registered the debug message listener
 2018-12-23 00:39:27 +01:00
Norbi Peti 5ff433f3bb
Code organization 
Moved part of MCListener
Added support for custom chat player list
 2018-12-22 16:20:20 +01:00
Norbi Peti 21221dfeeb
NPE fix, prefix 2018-12-18 00:52:02 +01:00
Norbi Peti 1878a46041
Cleanup, organizing (MCChatListener) 
Removed all sysouts
Split MCChatListener into utils, private and custom (and the existing one)
Using fixed version of Discord4J (fixes issues with local testing)
 2018-12-17 21:33:55 +01:00
Norbi Peti 38b45299c0
Adding two modules 
GeneralEventBroadcaster
Minecraft chat
#51
 2018-12-14 23:58:24 +01:00
Norbi Peti 9527be99d1
Fixed 122 errors - by fixing the pom 
Also other fixes
 2018-11-22 23:11:19 +01:00
Norbi Peti d12fe961c0
No Origins 2018-11-22 01:02:20 +01:00
Norbi Peti 8721b623cb
Fix 2018-11-01 21:47:40 +01:00
Norbi Peti 17887707cb
Bunch of channel stuff 
#70 is technically fixed but there's another issue
#61 and #71 are definitely fixed
Allowing multiple channels to be connected
 2018-11-01 01:34:36 +01:00
Norbi Peti a0e0890160
YEEHAW, small fixes (mcchat) 
Working on #70
 2018-10-25 23:54:16 +02:00
Norbi Peti 7d624816f2
Performance improvements (user data) 
CommandSender (DiscordSenderBase) level of caching implemented (not perfect but much better than before)
Various mcchat improvements
 2018-10-25 14:19:50 +02:00
Norbi Peti 9e827d14d0
Toggles work! Other changes 
#75
- Changed shutdown kick message
- Added timeout for resetting as well
- Last message handling fixed (#71)
- Some restructuring related to mcchat
 2018-10-24 00:07:07 +02:00
Norbi Peti 18fdbc5770
More work on toggles 
#75
Most channel toggles should work
Needs testing
 2018-10-23 03:06:34 +02:00
Norbi Peti 774186a600
Can't toggle toggles yet 
#75
Also allowing any text after "remove"
 2018-10-22 01:50:09 +02:00
Norbi Peti d79b1674eb
Fixed lowercase cmds & channel mentions 
Fixed commands from private mcchat being lowercased
Added channel mention support (#51)
Added version command (#51)
 2018-09-09 13:29:43 +02:00
Norbi Peti 12a21461c0
Added escaping & fixed reset stuff 
Escaping everything, including names (#47)
Player list unhooking added (#73)
Also removed autoupdater stuff and did other smaller changes
 2018-08-03 23:23:55 +02:00
Norbi Peti 4507cf38a9
Fixed channelcon echo 
The senders are now stored per-channel
#56
This one took a bit to track down
 2018-07-22 13:11:24 +02:00
Norbi Peti d22b6dec80
Only sending join/leave events to custom chats 
Also sending server start/stop messages still
#57
I need to look over this freshly
 2018-07-22 00:26:22 +02:00
Norbi Peti 4f6612c21b
Updated help text 2018-07-20 13:18:33 +02:00
Norbi Peti 557eac2292
Reset command fixes 
Now it's disabling and enabling the plugin
Some changes were made to handle this as well
Fixed main thread checks, the plugin may not be enabled in the main thread
 2018-07-20 12:43:17 +02:00
Norbi Peti 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
Norbi Peti e718fafd52
Added API changes 2018-07-15 01:14:04 +02:00
Norbi Peti 38ef88f10d
Add ButtonCore dependency 
And remove PEX dependency
 2018-07-02 15:56:36 +02:00
Norbi Peti 735f6d4085
Fix #59 2018-06-23 21:53:52 +02:00
Norbi Peti 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
Norbi Peti 29683d4c0c
Channelcon chat almost works 
#52
 2018-06-13 01:30:17 +02:00
Norbi Peti 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
Norbi Peti 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
Norbi Peti b60c4f5090
Many fixes and debug messages 
Mainly game roles
Mostly debug messages
 2018-06-06 23:22:16 +02:00
Norbi Peti 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
Norbi Peti 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
Norbi Peti 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
Norbi Peti fba5c5b49a
Fixes, channel con work 
Connecting channels is WIP
 2018-05-22 01:42:52 +02:00
Norbi Peti b60bf36864 Finished game roles 
Still needs testing

Couldn't set GPG signing up - yet
 2018-05-07 01:11:08 +02:00
Norbi Peti 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
Norbi Peti 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
Norbi Peti 68e99e0000
Some fixes (DAPI, mcchat) 2018-04-08 02:39:05 +02:00
Norbi Peti b31aea0c04
Fixed role admin cmds 
And some code analysis stuff
 2018-04-07 01:05:54 +02:00
Norbi Peti 42966d0feb
Removed religion making offer 
For now
 2018-02-14 21:07:52 +01:00
Norbi Peti 1bf0024dc4
Fixed removing delivered reactions 2018-01-09 19:40:58 +01:00
Norbi Peti 3af44a053a
Discord->MC fixes (mcchat) 2018-01-07 20:58:23 +01:00
Norbi Peti 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
Norbi Peti a4ca1bb6d3
Fixed message grouping in mcchat 
Also updated the role adding cmd path
 2017-12-26 02:02:00 +01:00
Norbi Peti 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
Norbi Peti 6fc92d5083 Made smaller API changes 2017-11-30 22:15:34 +01:00
Norbi Peti 4c8a1c4582 Refactoring, ChromaBot API, fixes, needs testing 2017-11-29 22:30:34 +01:00
Norbi Peti 20ff9cc3e6 Only showing join/leave/etc. messages if not hooked 2017-11-28 23:07:34 +01:00
Norbi Peti 0c9dd6f49a Server crash stack trace zero 
Forgot to commit this for a whiiile
 2017-11-24 23:53:48 +01:00
Norbi Peti f8c543017a The hack works! 2017-10-29 18:49:52 +01:00
Norbi Peti 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
Norbi Peti 541913e2af Fixed embeds in sendMsg & added embedWithHead 2017-10-28 20:55:26 +02:00
Norbi Peti 4ada764a04 Separated waiting and not waiting msg sends 2017-10-28 01:01:31 +02:00
Norbi Peti 1244b50560 MCChat fixes 2017-10-28 00:27:00 +02:00
Norbi Peti 2308ef4195 Excluded list impr., MCCHAT FIX, API upd. 2017-10-24 22:29:46 +02:00
Norbi Peti 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
Norbi Peti 51adad4bd6 Added RP channel for the public chat 2017-09-09 22:07:43 +02:00
Norbi Peti 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
Norbi Peti e4382bbcd2 Full house cooldown, reset last msg in PM 
Plus test account enforced
 2017-08-18 03:12:33 +02:00
Norbi Peti 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
Norbi Peti 0156888681 Fixes, implemented ChatRooms 
A few hours ago
 2017-08-07 20:42:28 +02:00
Norbi Peti 447f0a3d25 A fix regarding private pins and part of #34 2017-08-06 23:09:26 +02:00
Norbi Peti cda76fdb93 Fixes, added quitting fake players on disable 2017-08-06 02:23:13 +02:00
Norbi Peti 649fd4611f Excluding ProtocolLib from fake player events 2017-08-05 15:45:31 +02:00
Norbi Peti 67074017d2 Added chat channel & mixed case cmds support 
Needs testing
 2017-08-04 13:33:26 +02:00
Norbi Peti 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
Norbi Peti 11ecabe325 Added important parenthesis 2017-07-13 12:56:43 +02:00
Norbi Peti 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
Norbi Peti 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
Norbi Peti abe8af501e I HAVE A MORE WORKED OUT PLAN 2017-07-10 14:28:04 +02:00
Norbi Peti a85b7f9a2d Continued work on mcchat 2017-07-09 21:30:37 +02:00
Norbi Peti d2467210dd I HAVE A PLAN! (A todo list) 2017-07-09 02:49:18 +02:00
Norbi Peti 9e85883e34 Mostly fixed permissions (now it's recursing) 2017-07-08 02:13:56 +02:00
Norbi Peti 2aca1551ef Probably done with DiscordConnectedPlayer 2017-07-07 02:22:44 +02:00
Norbi Peti c746543042 Fixed that one line changing everything 2017-07-04 22:15:24 +02:00
Norbi Peti 69599cdd20 Added one line that changes everything 
Hopefully in a good way
 2017-07-04 21:48:23 +02:00
Norbi Peti 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
Norbi Peti 9d0525571b Lombok still doesn't work compile-time 2017-07-04 03:16:32 +02:00
Norbi Peti 39bbeafe6b Added Lombok, started fake player 2017-07-03 23:45:14 +02:00
Norbi Peti 92e7e6abc4 Updated autouppdater, colorized chat & test check 
Also using RequestBuffer...
 2017-07-01 01:31:31 +02:00
Norbi Peti 6dd21b03c1 Applied changes and a fix 2017-06-30 18:29:21 +02:00
Norbi Peti a6244b7f9f Fixed mcchat stuff and ch IDs added etc. 
#12
 2017-06-30 16:55:13 +02:00
Norbi Peti b7c8e9dfa6 Added check for Maven project 2017-06-23 19:36:17 +02:00
Norbi Peti 329c2eeaa2 Added *temporary* solution to pinned messages 2017-06-23 14:13:13 +02:00
Norbi Peti 471d394a49 Fixed redirect 2017-06-16 23:47:30 +02:00
Norbi Peti 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
Norbi Peti f441d39145 Discord login started (OAuth2) 2017-06-15 22:14:06 +02:00
Norbi Peti 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
Norbi Peti c4323d3388 #32, progress with mcchat (#12) 2017-05-31 22:42:19 +02:00
Norbi Peti 9abb342aa9 Fixes for mcchat 2017-05-28 11:56:47 +02:00
Norbi Peti 173bc40a1d Getting sender for receiving messages too 2017-05-28 11:26:23 +02:00
Norbi Peti cb8eeb20c2 Continued adding support for mcchat (#12) 
And added more server ready questions
 2017-05-25 14:30:55 +02:00
Norbi Peti 914cd60694 Added mcchat (#12), needs testing 2017-05-24 13:37:12 +02:00
Norbi Peti 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
Norbi Peti bb416ee075 Fixed issue 2017-05-15 02:19:40 +02:00
Norbi Peti 0bbb436992 Added when server will be ready 2017-05-15 01:52:09 +02:00
Norbi Peti cf0d2e7d5d Fixed #27 and did a bit of #16 2017-05-13 16:08:01 +02:00
Norbi Peti 01db886917 Updated Discord4J stuff, getInfo shows more, etc. 2017-05-07 01:06:57 +02:00
Norbi Peti c23d9aee09 Fixed chat msg loss <@187257785199624194> 
Probably

Also fixed exception filtering
 2017-04-28 22:41:23 +02:00
Norbi Peti 1ba108fb21 Added mute support and other stuff 2017-04-28 17:52:01 +02:00
Norbi Peti d842891618 Added support for game roles with spaces 2017-04-15 22:48:54 +02:00
Norbi Peti ea2cc31289 Added an... important bit 
Again
 2017-04-15 21:10:23 +02:00
Norbi Peti 1ae389c2aa Added @ Coder ping for exceptions 2017-04-15 13:36:06 +02:00
Norbi Peti 355ba01929 Finished game roles 2017-04-15 13:22:05 +02:00
Norbi Peti e7963e4f9a Fixes and applied changes from the Core 2017-04-11 21:17:47 +02:00
Norbi Peti 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
Norbi Peti ffbb9a0a91 Fixed and updated plugin to the new things 2017-04-02 01:32:37 +02:00
Norbi Peti b21a6b2f5f Moved update progress msgs to bot room 2017-02-04 21:06:39 +01:00
Norbi Peti 6ce730016d Implemented new player data thingy 2017-01-29 01:49:25 +01:00
Norbi Peti 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
Norbi Peti 2b9164ebc6 Fixes and probably added add cmd 2017-01-14 13:32:33 +01:00
Norbi Peti 519e0f468e Started game role commands 2017-01-14 01:33:44 +01:00
Norbi Peti d50e9a23ce Fixed start message not showing 2017-01-04 20:56:00 +01:00
Norbi Peti b7ef8f4048 Applied changes 2017-01-02 01:20:02 +01:00
Norbi Peti 6c654c28dd Added safe mode 2016-12-31 19:43:35 +01:00
Norbi Peti c5edce848f Fixed update details msg 2016-12-31 18:39:54 +01:00
Norbi Peti f97d7e7a05 Fixed office channel test location 
Also testing it with this commit
 2016-12-31 18:35:54 +01:00
Norbi Peti 7d813e8d59 Testing autoupdate improvements 2016-12-31 18:30:39 +01:00
Norbi Peti 7aeff53967 Added PR linking - in the condition 2016-12-31 03:08:20 +01:00
Norbi Peti 6cdac8696d Made delivered reactions more reliable 2016-12-31 00:41:37 +01:00
Norbi Peti 7e5ab8cbbd Removing obfuscated chars from names 2016-12-27 21:28:22 +01:00
Norbi Peti 0ba39e3e30 Giving the fix for everyone! 
I was tired...
 2016-12-27 16:29:38 +01:00