From 447f0a3d25a72cb2ef4d325aaace3802e3d2b2e2 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sun, 6 Aug 2017 23:09:26 +0200 Subject: [PATCH] A fix regarding private pins and part of #34 --- .../discordplugin/listeners/MCChatListener.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java index 138c154..c4b4c64 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java @@ -42,8 +42,9 @@ public class MCChatListener implements Listener, IListener .withDescription(e.getMessage()).withColor(new Color(e.getChannel().color.getRed(), e.getChannel().color.getGreen(), e.getChannel().color.getBlue())); if (e.getSender() instanceof Player) - embed.withAuthorIcon( - "https://minotar.net/avatar/" + ((Player) e.getSender()).getName() + "/32.png"); + embed.withAuthorIcon("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(); Consumer doit = lastmsgdata -> { final EmbedObject embedObject = embed.build(); @@ -79,7 +80,7 @@ public class MCChatListener implements Listener, IListener doit.accept(data); } } - }); // TODO: Author URL + }); } private static class LastMsgData { @@ -247,8 +248,7 @@ public class MCChatListener implements Listener, IListener .findAny(); if (!ch.isPresent()) 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(); if (!chc.ID.equals(Channel.GlobalChat.ID) && !event.getMessage().getChannel().isPrivate()) dsender.sendMessage( @@ -266,7 +266,8 @@ public class MCChatListener implements Listener, IListener } lastlistp = (short) Bukkit.getOnlinePlayers().size(); } 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 else sendChatMessage.accept(dsender.getMcchannel(), dmessage);