mirror of
https://github.com/correl/mage.git
synced 2024-11-28 11:09:54 +00:00
Merge pull request #2819 from spjspj/master
Modify the profanity filter to push it back to client side only.
This commit is contained in:
spjspj
GitHub
commit
c2e41640e8
4 changed files with 75 additions and 17 deletions
|
|
@ -38,9 +38,12 @@ import java.awt.Dimension;
|
|||
import java.awt.Font;
|
||||
import java.awt.event.KeyEvent;
|
||||
import java.util.UUID;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import javax.swing.JTextField;
|
||||
import mage.client.MageFrame;
|
||||
import mage.client.SessionHandler;
|
||||
import mage.client.dialog.PreferencesDialog;
|
||||
import mage.client.util.GUISizeHelper;
|
||||
import mage.view.ChatMessage.MessageColor;
|
||||
import mage.view.ChatMessage.MessageType;
|
||||
|
|
@ -184,6 +187,39 @@ public class ChatPanelBasic extends javax.swing.JPanel {
|
|||
}
|
||||
}
|
||||
|
||||
Pattern profanityPattern = Pattern.compile(".*(1ab1a|1d1ot|13ch|13p3r|13sb1ans|13sbo|13s13|13sb1an|13sbo|13sy|1nbr3d|1nc3st|1njun|1ub3|\\Wbj|\\Wcum|\\Wdum|\\Wfag|\\Wfap|\\Wfuk|\\Wj1s|\\Wp3do|\\Wp33|\\Wpoo\\W|\\Wt1t|aho13|an1l1ngu|ana1|anus|ar3o1a|ar3o13|ary1an|ashat|asho13|asmast3r|asmunch|asw1p3|b1atch|b1gt1t|b1mbo|b1ow|b1tch|ba1ls|bab3|bang|barf|bastard|bawdy|b3an3r|b3ard3dc1am|b3ast1al1ty|b3atch|b3at3r|b3av3r|b3otch|b3yotch|bo1nk|bod1ly|bon3d|bon3r|bon3|boob|boot13|booty|bow31|br3ast|bugg3r|bukak3|bung|busty|butt|c11t|caca|cahon3|cam31to3|carp3tmunch3r|cawk|c3rv1x|ch1nc|ch1nk|chod3|co1tal|cockb1ock|cockho1st3r|cocknock3r|cocksmok3r|cocksuck3r|cock|condom|coon|corksuck3r|crabs|cums1ut|cumshot|cumsta1n|cun1l1ngus|cuntfac3|cunthunt3r|cunt|d1ck|d1k3|d1ldo|d1mw1t|d1ngl3|d1psh1p|dago|dam1t|damn1t|damn3d|damn|dawg13styl3|dog13styl3|dogysty13|dong|dop3y|douch3|drunk|dumas|dumbas|dumy|dyk3|3jacu1at3|3n1arg3m3nt|3r3ct1on|3r3ct|3rot1c|3xtacy|3xtasy|f.ck|f1osy|f1st3d|f1st1ng|f1sty|fa1gt|fa1g|fack|fag1t|fag3d|fagot|fag|fcuk|f31at1o|f31at3|f31ch1ng|f31ch3r|f31ch|f31tch3r|f31tch|foad|fobar|fond13|for3sk1n|fu.k|fudg3pack3r|fuk|g1ans|g1golo|ganja|ghay|gh3y|go1d3nshow3r|gonad|gook|gr1ngo|h1tl3r|handjob|hardon|hokah|hok3r|homo|honky|hoor|hootch|hoot3r|horny|hump1ng|hump3d|hump|hym3n|j1sm|j1s3d|j1sm|j1s|jackas|jackho13|jackof|j3rk3d|j3rkof|j3rk|junk13|junky|k1an|k1k3|k1nky|knob3nd|kyk3|mams|masa|mast3rba|masturba|max1|m3ns3s|m3nstruat|mfuck1ng|mofo|moron|moth3rf|mthrf|muff|n1gl|n1g|n1mrod|n1ny|n1pl3|nak3d|napa1m|napy|nas1|n3gro|noky|nympho|op1at3|op1um|ora1y|ora1|org13s|organ|orgasm|orgy|ovary|ovum|p1lowb1t3r|p1mp|p1nko|p1s3d|p1ssof|p1ss|pak1|pant13|panty|past13|pasty|p3ck3r|p3doph1l|p33p33|p3n1al|p3n1l3|p3n1s|p3n3trat1on|p3n3trat3|p3rv3rs1on|p3yot3|pha11c|phuck|po1ack|po1ock|poontang|poon|poop|porno|porn|pr1ck|pr1g|pron|pub1|pub3|punkas|punky|puss1|pussy|puto|qu1cky|qu1ck13|qu1m|qu3af|qu3ro|qu3rs|qu3r|r1mjob|r1tard|racy|rap1st|rap3d|rap3r|rap3|raunch|r31ch|r3cta1|r3ctum|r3ctus|r3tard|r3tar|rtard|rumpram3r|rump|s1av3|s13as|s1ut|sack|sad1s|scag|scant1ly|sch1ong|sch1so|scr3w|scrog|scrot|scrud|scum|s3aman|s3am3n|s3duc3|s3m3n|s3xua1|sh1t|skag|skank|sm3gma|smut|sn1p3r|snatch|sodom|sp1ck|sp1c|sp1k|sp3rm|spunk|st3amy|stfu|ston3d|str1p|strok3|stup1d|suck|sumofab1atch|t1nkl3|t1tfuck|tampon|tard|t3abag1ng|t3at|t3st1|t3st3|t3urd|thrust|tramp|trans|trashy|twat|ug1y|unw3d|ur1n3a|ut3rus|vag1na|vu1gar|vu1va|w1g3r|wang|wank3r|wank|w31n3r|w31rdo|w3dg13|w3n13|w3tback|w3w3|wh1t3y|wh1s|whor3|womb).*");
|
||||
Pattern profanity2Pattern = Pattern.compile(".*(1ab1a|1d1ot|13ch|13p3r|13sb1ans|13sbo|13s13|13sb1an|13sbo|13sy|1nbr3d|1nc3st|1njun|1ub3|\\Wbj|\\Wcum|\\Wdum|\\Wfag|\\Wfap|\\Wfuk|\\Wj1s|\\Wp3do|\\Wp3|\\Wpo\\W|\\Wt1t|aho13|an1l1ngu|ana1|anus|ar3o1a|ar3o13|ary1an|ashat|asho13|asmast3r|asmunch|asw1p3|b1atch|b1gt1t|b1mbo|b1ow|b1tch|ba1ls|bab3|bang|barf|bastard|bawdy|b3an3r|b3ard3dc1am|b3ast1al1ty|b3atch|b3at3r|b3av3r|b3otch|b3yotch|bo1nk|bod1ly|bon3d|bon3r|bon3|bob|bot13|boty|bow31|br3ast|bug3r|bukak3|bung|busty|but|c1t|caca|cahon3|cam31to3|carp3tmunch3r|cawk|c3rv1x|ch1nc|ch1nk|chod3|co1tal|cockb1ock|cockho1st3r|cocknock3r|cocksmok3r|cocksuck3r|cock|condom|con|corksuck3r|crabs|cums1ut|cumshot|cumsta1n|cun1l1ngus|cuntfac3|cunthunt3r|cunt|d1ck|d1k3|d1ldo|d1mw1t|d1ngl3|d1psh1p|dago|dam1t|damn1t|damn3d|damn|dawg13styl3|dog13styl3|dogysty13|dong|dop3y|douch3|drunk|dumas|dumbas|dumy|dyk3|3jacu1at3|3n1arg3m3nt|3r3ct1on|3r3ct|3rot1c|3xtacy|3xtasy|f.ck|f1osy|f1st3d|f1st1ng|f1sty|fa1gt|fa1g|fack|fag1t|fag3d|fagot|fag|fcuk|f31at1o|f31at3|f31ch1ng|f31ch3r|f31ch|f31tch3r|f31tch|foad|fobar|fond13|for3sk1n|fu.k|fudg3pack3r|fuk|g1ans|g1golo|ganja|ghay|gh3y|go1d3nshow3r|gonad|gr1ngo|h1tl3r|handjob|hardon|hokah|hok3r|homo|honky|hor|hotch|hot3r|horny|hump1ng|hump3d|hump|hym3n|j1sm|j1s3d|j1sm|j1s|jackas|jackho13|jackof|j3rk3d|j3rkof|j3rk|junk13|junky|k1an|k1k3|k1nky|knob3nd|kyk3|mams|masa|mast3rba|masturba|max1|m3ns3s|m3nstruat|mfuck1ng|mofo|moron|moth3rf|mthrf|muf|n1gl|n1g|n1mrod|n1ny|n1pl3|nak3d|napa1m|napy|nas1|n3gro|noky|nympho|op1at3|op1um|ora1y|ora1|org13s|organ|orgasm|orgy|ovary|ovum|p1lowb1t3r|p1mp|p1nko|p1s3d|p1sof|p1s|pak1|pant13|panty|past13|pasty|p3ck3r|p3doph1l|p3p3|p3n1al|p3n1l3|p3n1s|p3n3trat1on|p3n3trat3|p3rv3rs1on|p3yot3|pha1c|phuck|po1ack|po1ock|pontang|pon|pop|porno|porn|pr1ck|pr1g|pron|pub1|pub3|punkas|punky|pus1|pusy|puto|qu1cky|qu1ck13|qu1m|qu3af|qu3ro|qu3rs|qu3r|r1mjob|r1tard|racy|rap1st|rap3d|rap3r|rap3|raunch|r31ch|r3cta1|r3ctum|r3ctus|r3tard|r3tar|rtard|rumpram3r|rump|s1av3|s13as|s1ut|sack|sad1s|scag|scant1ly|sch1ong|sch1so|scr3w|scrog|scrot|scrud|scum|s3aman|s3am3n|s3duc3|s3m3n|s3xua1|sh1t|skag|skank|sm3gma|smut|sn1p3r|snatch|sodom|sp1ck|sp1c|sp1k|sp3rm|spunk|st3amy|stfu|ston3d|str1p|strok3|stup1d|suck|sumofab1atch|t1nkl3|t1tfuck|tampon|tard|t3abag1ng|t3at|t3st1|t3st3|t3urd|thrust|tramp|trans|trashy|twat|ug1y|unw3d|ur1n3a|ut3rus|vag1na|vu1gar|vu1va|w1g3r|wang|wank3r|wank|w31n3r|w31rdo|w3dg13|w3n13|w3tback|w3w3|wh1t3y|wh1s|whor3|womb).*");
|
||||
|
||||
private boolean containsSwearing(String message, String level) {
|
||||
String orig = message;
|
||||
message = message.replaceAll("\\W", ".");
|
||||
message = "." + message + ".";
|
||||
|
||||
message = message.toLowerCase();
|
||||
message = message.replaceAll("(.)(\\1{2,})", "$1");
|
||||
message = message.replaceAll("[@]", "a");
|
||||
message = message.replaceAll("[il]", "1");
|
||||
message = message.replaceAll("[e]", "3");
|
||||
message = message.replaceAll("[0]", "o");
|
||||
message = message.replaceAll("[5z]", "s");
|
||||
|
||||
Matcher matchPattern = profanityPattern.matcher(message);
|
||||
if (matchPattern.find()) {
|
||||
System.out.println("message: Matched profanity:" + message);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (level.equals("2")) {
|
||||
message = message.replaceAll("\\.", "");
|
||||
matchPattern = profanity2Pattern.matcher(message);
|
||||
if (matchPattern.find()) {
|
||||
System.out.println("message: Matched profanity (level2):" + message);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Display message in the chat. Use different colors for timestamp, username
|
||||
* and message.
|
||||
|
|
@ -194,6 +230,8 @@ public class ChatPanelBasic extends javax.swing.JPanel {
|
|||
* @param messageType
|
||||
* @param color Preferred color. Not used.
|
||||
*/
|
||||
Pattern cardNamePattern = Pattern.compile(".*<font bgcolor=orange.*?</font>.*");
|
||||
|
||||
public void receiveMessage(String username, String message, String time, MessageType messageType, MessageColor color) {
|
||||
StringBuilder text = new StringBuilder();
|
||||
if (time != null) {
|
||||
|
|
@ -227,11 +265,42 @@ public class ChatPanelBasic extends javax.swing.JPanel {
|
|||
if (color.equals(MessageColor.YELLOW)) {
|
||||
textColor = "Yellow";
|
||||
}
|
||||
if (username != null && !username.isEmpty()) {
|
||||
text.append(getColoredText(userColor, username + userSeparator));
|
||||
if (messageType == MessageType.WHISPER) {
|
||||
if (username.equalsIgnoreCase("Whisper from " + SessionHandler.getUserName())) {
|
||||
if (message.toLowerCase().startsWith("profanity 0")) {
|
||||
PreferencesDialog.saveValue(PreferencesDialog.KEY_GAME_USE_PROFANITY_FILTER, "0");
|
||||
} else if (message.toLowerCase().startsWith("profanity 1")) {
|
||||
PreferencesDialog.saveValue(PreferencesDialog.KEY_GAME_USE_PROFANITY_FILTER, "1");
|
||||
} else if (message.toLowerCase().startsWith("profanity 2")) {
|
||||
PreferencesDialog.saveValue(PreferencesDialog.KEY_GAME_USE_PROFANITY_FILTER, "2");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Matcher matchPattern = cardNamePattern.matcher(message);
|
||||
String messageToTest = message;
|
||||
while (matchPattern.find()) {
|
||||
messageToTest = message.replaceFirst("<font bgcolor=orange.*?</font>", "");
|
||||
}
|
||||
|
||||
if (messageType == MessageType.USER_INFO || messageType == MessageType.GAME || messageType == MessageType.STATUS
|
||||
|| PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_USE_PROFANITY_FILTER, "0").equals("0")
|
||||
|| !PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_USE_PROFANITY_FILTER, "0").equals("0") && !containsSwearing(messageToTest, PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_USE_PROFANITY_FILTER, "0"))) {
|
||||
if (username != null && !username.isEmpty()) {
|
||||
text.append(getColoredText(userColor, username + userSeparator));
|
||||
}
|
||||
text.append(getColoredText(textColor, ManaSymbols.replaceSymbolsWithHTML(message, ManaSymbols.Type.CHAT)));
|
||||
this.txtConversation.append(text.toString());
|
||||
} else if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_USE_PROFANITY_FILTER, "0").equals("1")) {
|
||||
if (username != null && !username.isEmpty()) {
|
||||
text.append(getColoredText("black", username + userSeparator));
|
||||
}
|
||||
text.append(getColoredText(textColor, ManaSymbols.replaceSymbolsWithHTML("<font color=black size=-2>" + message + "</font> <font size=-2>Profanity detected. Type: <font color=green>/w " + SessionHandler.getUserName() + " profanity 0</font>' to turn the filter off</font></font>", ManaSymbols.Type.CHAT)));
|
||||
this.txtConversation.append(text.toString());
|
||||
} else if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_USE_PROFANITY_FILTER, "0").equals("2")) {
|
||||
text.append(getColoredText(textColor, ManaSymbols.replaceSymbolsWithHTML("<font color=black size=-2>" + username + ": Profanity detected. To make it less strict, type: </font> <font color=green size=-2>/w " + SessionHandler.getUserName() + " profanity 1</font>", ManaSymbols.Type.CHAT)));
|
||||
this.txtConversation.append(text.toString());
|
||||
}
|
||||
text.append(getColoredText(textColor, ManaSymbols.replaceSymbolsWithHTML(message, ManaSymbols.Type.CHAT)));
|
||||
this.txtConversation.append(text.toString());
|
||||
}
|
||||
|
||||
protected String getColoredText(String color, String text) {
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
|
|||
public static final String KEY_GAME_SHOW_STORM_COUNTER = "gameShowStormCounter";
|
||||
public static final String KEY_GAME_CONFIRM_EMPTY_MANA_POOL = "gameConfirmEmptyManaPool";
|
||||
public static final String KEY_GAME_ASK_MOVE_TO_GRAVE_ORDER = "gameAskMoveToGraveORder";
|
||||
public static final String KEY_GAME_USE_PROFANITY_FILTER = "gameUseProfanityFilter";
|
||||
|
||||
public static final String KEY_GUI_TABLE_FONT_SIZE = "guiTableFontSize";
|
||||
public static final String KEY_GUI_CHAT_FONT_SIZE = "guiChatFontSize";
|
||||
|
|
|
|||
|
|
@ -107,13 +107,6 @@ public class ChatManager {
|
|||
this.broadcast(chatId, userName, message, color, withTime, messageType, null);
|
||||
}
|
||||
|
||||
private boolean containsSwearing(String message) {
|
||||
if (message != null && message.toLowerCase().matches("^.*(anal|asshole|balls|bastard|bitch|blowjob|cock|crap|cunt|cum|damn|dick|dildo|douche|fag|fuck|idiot|moron|penis|piss|prick|pussy|rape|rapist|sex|screw|shit|slut|vagina).*$")) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
final Pattern cardNamePattern = Pattern.compile("\\[(.*?)\\]");
|
||||
|
||||
public void broadcast(UUID chatId, String userName, String message, MessageColor color, boolean withTime, MessageType messageType, SoundToPlay soundToPlay) {
|
||||
|
|
@ -167,11 +160,6 @@ public class ChatManager {
|
|||
}
|
||||
|
||||
userMessages.put(userName, message);
|
||||
if (containsSwearing(messageToCheck)) {
|
||||
String informUser = "Your message appears to contain profanity";
|
||||
chatSessions.get(chatId).broadcastInfoToUser(user, informUser);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (messageType == MessageType.TALK) {
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ if (!exists $cards{$cardName}) {
|
|||
# Check if card is already implemented
|
||||
my $fileName = "../Mage.Sets/src/mage/cards/".lc(substr($cardName, 0, 1))."/".toCamelCase($cardName).".java";
|
||||
if(-e $fileName) {
|
||||
die "$cardName is already implemented.\n";
|
||||
die "$cardName is already implemented.\n$fileName\n";
|
||||
}
|
||||
|
||||
# Generate lines to corresponding sets
|
||||
|
|
|
|||
Loading…
Reference in a new issue