TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-06-28 00:40:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #230 from speedxx/development

Browse source 
remove this blocked string & don't send messages containing discord.gg to server-chat
This commit is contained in:
super 2020-07-16 22:31:21 -04:00 committed by GitHub
parent 30fd3ea6a1 c1f0d81fcc
commit d33f661d55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java
View file

@ -73,12 +73,6 @@ public class ChatManager extends FreedomService
return;
}
if (message.startsWith("Connected using PickaxeChat for "))
{
event.setCancelled(true);
return;
}
// Truncate messages that are too long - 256 characters is vanilla client max
if (message.length() > 256)
{
@ -230,4 +224,4 @@ public class ChatManager extends FreedomService
}
}
}
}
}

8
src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
View file

@ -292,6 +292,12 @@ public class Discord extends FreedomService
{
message = StringUtils.remove(message, "@");
}
if (message.toLowerCase().contains("discord.gg"))
{
return;
}
if (enabled && !chat_channel_id.isEmpty())
{
CompletableFuture<Message> sentMessage = bot.getTextChannelById(chat_channel_id).sendMessage(message).submit(true);
@ -482,4 +488,4 @@ public class Discord extends FreedomService
return false;
}
}
}