From e5fa0b0ed5b9c632497761f8035c0611fc9d559c Mon Sep 17 00:00:00 2001 From: Austin Keener Date: Thu, 10 Mar 2016 02:57:21 +0900 Subject: [PATCH] Made the IRC Bridge system also send the url for any files uploaded to Discord. Removed old jDiscord related code. --- .../bridge/endpoint/EndPointMessage.java | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/main/java/net/dv8tion/discord/bridge/endpoint/EndPointMessage.java b/src/main/java/net/dv8tion/discord/bridge/endpoint/EndPointMessage.java index 18b9229..4916855 100644 --- a/src/main/java/net/dv8tion/discord/bridge/endpoint/EndPointMessage.java +++ b/src/main/java/net/dv8tion/discord/bridge/endpoint/EndPointMessage.java @@ -111,25 +111,9 @@ public Message getDiscordMessage() public void setDiscordMessage(Message discordMessage) { String parsedMessage = discordMessage.getContent(); - Pattern userPattern = Pattern.compile("(?<=<@)[0-9]{18}(?=>)"); - Pattern channelPattern = Pattern.compile("(?<=<#)[0-9]{18}(?=>)"); - - Matcher userMatcher = userPattern.matcher(parsedMessage); - while (userMatcher.find()) - { - String userId = userMatcher.group(); - User user = Yui.getAPI().getUserById(userId); - if (user != null) - parsedMessage = parsedMessage.replace("<@" + userId + ">", user.getUsername()); - } - - Matcher channelMatcher = channelPattern.matcher(parsedMessage); - while(channelMatcher.find()) + for (Message.Attachment attach : discordMessage.getAttachments()) { - String channelId = channelMatcher.group(); - TextChannel channel = Yui.getAPI().getTextChannelById(channelId); - if (channel != null) - parsedMessage = parsedMessage.replace("<#" + channelId + ">", channel.getName()); + parsedMessage += "\n" + attach.getUrl(); } this.message = parsedMessage;