From 10dee533d15edbc473b2cf751574f2c70ab40a52 Mon Sep 17 00:00:00 2001 From: jenzuffer <35786745+jenzuffer@users.noreply.github.com> Date: Mon, 2 Nov 2020 11:13:31 +0100 Subject: [PATCH] security fix not taking messages from wrong channels anymore --- .../src/main/java/FunctionLayer/DoStuff.java | 7 +++++-- .../target/ArtificialAutism-1.0.jar | Bin 68738 -> 68745 bytes .../classes/FunctionLayer/DoStuff.class | Bin 5222 -> 5227 bytes .../target/maven-archiver/pom.properties | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java b/ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java index 18f1a7a1..412e393f 100644 --- a/ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java +++ b/ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java @@ -58,12 +58,15 @@ public class DoStuff { } List blockLast = event.getMessage().getUserMentions().buffer().blockLast(); String content = event.getMessage().getContent(); - if (!channelpermissionsDenied && blockLast != null) { + if (!channelpermissionsDenied) { + if (blockLast != null) + { for (User user : blockLast) { content = content.replace(user.getId().asString(), ""); } + } + MessageResponseHandler.getMessage(content); } - MessageResponseHandler.getMessage(content); boolean mentionedBot = false; if (blockLast != null){ for (User user : blockLast) diff --git a/ArtificialAutism/target/ArtificialAutism-1.0.jar b/ArtificialAutism/target/ArtificialAutism-1.0.jar index 92642934689b2d5fecbbedf483835116ba6e2162..7ab6f19c189f4c677c8b91045d96560df6d414cb 100644 GIT binary patch delta 3482 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 K=mrDa)BgZcN5X#q delta 3396 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 CoZZj> diff --git a/ArtificialAutism/target/classes/FunctionLayer/DoStuff.class b/ArtificialAutism/target/classes/FunctionLayer/DoStuff.class index e83972f5b33a15648fdc453696abb35c1c33e6ab..7e530ca54c00f6f548a8804c19c5fb290983fdb3 100644 GIT binary patch delta 167 zcmV~$&x%1|0EglCmy=@SaIDm9loIzKq`@>NsbS10|0RnlDR!>n+s-vi3dt4FSx?Hs zlEsY0+`yFQxh8*;%Y8`S<`B9myV}?h`MyXSFYLB2WcVSg06E3T>w$veJSss^DM~8y zq#Dm^;HpVQEvow9MKfwzP}e7~TGP~)H|=|zVk8S48 TINZTcp8#Eg^oTJqf6n|4K|3iP delta 162 zcmV;T0A2sHt0g2>?F<8UR269RNZB zA^<}HB>+SLDgZ?RNdQLyRRBo=SO7`^TL4S}UI0!3Z2(aLbpTQUeE?GdoB&h-v;bHE zw*XcFxd2xI$^csd)&OAv*#Kez-2h~hb`rG%ZvYdME)z)u{Qwn{dlP99T>u6EU;qgK QUH}RJUjP~aVUzU}b~Upnr~m)} diff --git a/ArtificialAutism/target/maven-archiver/pom.properties b/ArtificialAutism/target/maven-archiver/pom.properties index 32e3f8ea..6eb8ac83 100644 --- a/ArtificialAutism/target/maven-archiver/pom.properties +++ b/ArtificialAutism/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Nov 02 09:03:03 CET 2020 +#Mon Nov 02 11:08:19 CET 2020 version=1.0 groupId=com.mycompany artifactId=ArtificialAutism