ChromaGaming/Chroma-Discord
1
0
Fork 0
Code Issues 21 Pull requests Projects Releases 8 Packages Wiki Activity

Started using embeds for a nicer chat #23

Merged
NorbiPeti merged 4 commits from dev into master 2016-12-24 23:56:32 +00:00
Conversation 0 Commits 4 Files changed 4 +5 -2
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9383f5ea0c - Show all commits

5
src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
View file

@ -78,6 +78,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
public static IChannel issuechannel;
public static IChannel botroomchannel;
public static IChannel officechannel;
public static IChannel coffeechannel;
public static IGuild mainServer;
public static IGuild devServer;
@ -98,6 +99,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
issuechannel = devServer.getChannelByID("219643416496046081"); // server-issues
botroomchannel = devServer.getChannelByID("239519012529111040"); // bot-room
officechannel = devServer.getChannelByID("219626707458457603"); // developers-office
coffeechannel = devServer.getChannelByID("219530035365675010"); // coffee-table
dc.changeStatus(Status.game("on TBMC"));
} else {
botchannel = devServer.getChannelByID("239519012529111040"); // bot-room
@ -106,7 +108,8 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
botroomchannel = botchannel;// bot-room
issuechannel = botchannel; // bot-room
chatchannel = devServer.getChannelByID("248185455508455424"); // minecraft_chat_test
officechannel = devServer.getChannelByID("219626707458457603"); // developers-office
officechannel = botchannel; // bot-room
coffeechannel = botchannel; // bot-room
dc.changeStatus(Status.game("testing"));
}
Bukkit.getScheduler().runTaskAsynchronously(this, () -> sendMessageToChannel(chatchannel, "",

2
src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java
View file

@ -22,7 +22,7 @@ public class AutoUpdaterListener implements IListener<MessageReceivedEvent> {
String branch = title.substring(title.indexOf(':') + 1, title.indexOf(']'));
String project = title.substring(title.indexOf('[') + 1, title.indexOf(':'));
if (branch.equals("master") || (TBMCCoreAPI.IsTestServer() && branch.equals("dev"))
&& TBMCCoreAPI.UpdatePlugin(project, new DiscordSender(null, DiscordPlugin.chatchannel), branch)
&& TBMCCoreAPI.UpdatePlugin(project, new DiscordSender(null, TBMCCoreAPI.IsTestServer()?DiscordPlugin.chatchannel:DiscordPlugin.coffeechannel), branch)
&& (!TBMCCoreAPI.IsTestServer() || !branch.equals("master")))
try {
event.getMessage().addReaction(DiscordPlugin.DELIVERED_REACTION);