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

A fix regarding private pins and part of #34

Browse source
This commit is contained in:
Norbi Peti 2017-08-06 23:09:26 +02:00
parent cda76fdb93
commit 447f0a3d25
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
View file

@ -42,8 +42,9 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
.withDescription(e.getMessage()).withColor(new Color(e.getChannel().color.getRed(), .withDescription(e.getMessage()).withColor(new Color(e.getChannel().color.getRed(),
e.getChannel().color.getGreen(), e.getChannel().color.getBlue())); e.getChannel().color.getGreen(), e.getChannel().color.getBlue()));
if (e.getSender() instanceof Player) if (e.getSender() instanceof Player)
embed.withAuthorIcon( embed.withAuthorIcon("https://minotar.net/avatar/" + ((Player) e.getSender()).getName() + "/32.png")
"https://minotar.net/avatar/" + ((Player) e.getSender()).getName() + "/32.png"); .withAuthorUrl("https://tbmcplugins.github.io/profile.html?type=minecraft&id="
+ ((Player) e.getSender()).getUniqueId()); // TODO: Constant/method to get URLs like this
final long nanoTime = System.nanoTime(); final long nanoTime = System.nanoTime();
Consumer<LastMsgData> doit = lastmsgdata -> { Consumer<LastMsgData> doit = lastmsgdata -> {
final EmbedObject embedObject = embed.build(); final EmbedObject embedObject = embed.build();
@ -79,7 +80,7 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
doit.accept(data); doit.accept(data);
} }
} }
}); // TODO: Author URL });
} }
private static class LastMsgData { private static class LastMsgData {
@ -247,8 +248,7 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
.findAny(); .findAny();
if (!ch.isPresent()) if (!ch.isPresent())
VanillaCommandListener.runBukkitOrVanillaCommand(dsender, cmd); VanillaCommandListener.runBukkitOrVanillaCommand(dsender, cmd);
else // TO!DO: Only allow talking in general in public chat - A to-do from before I went to Greece else {
{
Channel chc = ch.get(); Channel chc = ch.get();
if (!chc.ID.equals(Channel.GlobalChat.ID) && !event.getMessage().getChannel().isPrivate()) if (!chc.ID.equals(Channel.GlobalChat.ID) && !event.getMessage().getChannel().isPrivate())
dsender.sendMessage( dsender.sendMessage(
@ -266,7 +266,8 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
} }
lastlistp = (short) Bukkit.getOnlinePlayers().size(); lastlistp = (short) Bukkit.getOnlinePlayers().size();
} else {// Not a command } else {// Not a command
if (dmessage.length() == 0 && event.getMessage().getAttachments().size() == 0) if (dmessage.length() == 0 && event.getMessage().getAttachments().size() == 0
&& !event.getChannel().isPrivate())
TBMCChatAPI.SendChatMessage(Channel.GlobalChat, dsender, "pinned a message on Discord."); // TODO: Not chat message TBMCChatAPI.SendChatMessage(Channel.GlobalChat, dsender, "pinned a message on Discord."); // TODO: Not chat message
else else
sendChatMessage.accept(dsender.getMcchannel(), dmessage); sendChatMessage.accept(dsender.getMcchannel(), dmessage);