Need to add a white list of words

CODEOWNERS

@@ -0,0 +1 @@
+*       @zedwick

Jenkinsfile

@@ -0,0 +1,16 @@
+pipeline {
+    agent {
+        docker {
+            image 'maven:3-alpine' 
+            args '-v /root/.m2:/root/.m2' 
+        }
+    }
+    stages {
+        stage('Build') { 
+            steps {
+                sh 'mvn -B -DskipTests clean package'
+		archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true 
+            }
+        }
+    }
+}

README

@@ -1,7 +1,7 @@
 ##########################################
 ##                                      ##
 ##      Bungee Chat Filter Config       ##
-##               v1.2                   ##
+##                 v1.7                 ##
 ##########################################
 
 #Monitor commands - Monitor commands send by the players as chat
@@ -11,6 +11,7 @@ Monitor Commands: true
 Commands:
     - msg
     - message
+    - m
     - tell
     - whisper
     - w
@@ -19,35 +20,49 @@ Commands:
     - s
     - l
     - local
+    - url
+    - website
     - hub
+    - shop
+    - broadcast
 
 #AntiSpam - Will use the minimum chat delay to force players to wait *1500ms or what ever you specified between messages
 AntiSpam: true
+AntiRepeat: true
 #Minimum-Chat-Delay - The time in miliseconds a player must wait between messages
 Minimum-Chat-Delay: 1500
+Minimum-Repeat-Delay: 60000
+#Messages sent to the player in chat when they are blocked by AntiSpam or AntiRepeat
+AntiSpamMessage: &cPlease do not spam
+AntiRepeatMessage: &cPlease do not spam
 
 #Rules - Groups of rules which monitor the chat
 #rules:
-#   rulename:  - the name of the rule
-#       regex:  - the string regex that the rule will check for
-#       ignores:  - If the message contains a value that matches ignore then none of the actions will be performed
-#       permission: - the permission required to bypass this rule
-#       actions: - here is the list of actions the rule will perform if matched
-#           deny: true      - this will deny the message and cancel the event
-#           message: (message)      -this will send a message (message) to the player
-#           kick: (message)     - this will kick the player with the (message)
-#           alert: (message)        - this will send a broadcast to the server {player} will be replaced with the players display name
-#           command: /(command)     - this will cause the player to send the (command)
-#           remove: true        - this will remove any matches from the players message
-#           replace:              - this will replace the matched word with a random word from the list below
+#   rulename:                       - the name of the rule.
+#       regex:                      - the string regex that the rule will check for.
+#       ignores:                    - If the message contains a value that matches ignore then none of the actions will be performed.
+#       permission:                 - the permission required to bypass this rule.
+#       actions:                    - here is the list of actions the rule will perform if matched.
+#           deny: true              - this will deny the message and cancel the event.
+#           message: <message>      - this will send a message <message to the player. (Supports Placeholders, see below)
+#           kick: <message>         - this will kick the player with the <message>. (Supports Placeholders, see below)
+#           alert: <message>        - this will send the <message> to all players connected to the proxy server. (Supports Placeholders, see below)
+#           remove: true            - this will remove any matches from the player's message.
+#           replace:                - this will replace the matched word with a random word from the list below. (Supports Placeholders, see below)
 #               - word1
 #               - word2
-#           lower:            - this will change any matches into lowercase
-#          pcommand: /(command)    - Proxy command, this will cause the player to send the (command) to the proxy server
-#          scommand: /(command)    - Server command this will cause the player to send the (command) to their current server
-#          ccommand: /(command)    - Console command, this will cause the proxy server console to execute the (command).
+#           lower: true             - this will change any matches into lowercase.
+#           pcommand: (command)     - Proxy command, this will cause the player to send the (command) to the proxy server. Do not include a /. (Supports Placeholders, see below)
+#           scommand: /(command)    - Server command this will cause the player to send the (command) to their current server. You must include a /. (Supports Placeholders, see below)
+#           ccommand: (command)     - Console command, this will cause the proxy server console to execute the (command). Do not include a /. (Supports Placeholders, see below)
 #                                      Note that there is currently no way to execute a command as the current server console.
 
+#Placeholders                       - These placeholders can be used in any action strings.
+#
+# {player}                          - Replaced with the display name of the player sending the message
+# {message}                         - Replaced with the original message as sent by the player
+# {arguments}                       - Intended for use with commands, this will be replaced by all of the arguments following the first word of the player's message.
+#                                       (for example a player sending "/send Zedwick Hello!" will return "Zedwick Hello!" in place of {arguments})
 
 rules:
 
@@ -155,12 +170,15 @@ rules:
         regex: /broadcast
         permission: "!bungeefilter.broadcast"
         actions:
-            alert: '&5[Broadcast]&a{player}&f:{arguments}'
+            alert:
+            - ''
+            - '&5[Broadcast] &a{player}&f: {arguments}'
+            - ''
             deny: true
 
 #Shortcut for website URL can use either /url or /website
     CreateCommand2:
         regex: (/url)|(/website)
         actions:
             message: "&l&6[Check it out]&3 This server's website is &6www.minecraftserver.com"
-            deny: true
+            deny: true

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>BungeeChatFilter</groupId>
     <artifactId>BungeeChatFilter</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.8</version>
     <packaging>jar</packaging>
 
     <name>BungeeChatFilter</name>
@@ -40,7 +40,7 @@
         </dependency>
     </dependencies>
     <build>
-        <finalName>${project.name}</finalName>
+        <finalName>${project.name}-${project.version}</finalName>
         <resources>
             <resource>
                 <directory>${project.basedir}/src/main/resources</directory>
@@ -56,8 +56,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <showWarnings>true</showWarnings>
                     <showDeprecation>true</showDeprecation>
                 </configuration>

src/main/java/com/minecraftdimensions/bungeechatfilter/BFReload.java

@@ -2,6 +2,7 @@
 
 import com.minecraftdimensions.bungeechatfilter.configlibrary.Config;
 import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.plugin.Command;
 
 import java.util.ArrayList;
@@ -30,6 +31,6 @@ public void execute( CommandSender sender, String[] args ) {
         Main.COMLIST = Main.c.getListString( "Commands", defaultList );
         Main.NOSPAM = Main.c.getBoolean( "AntiSpam", true );
         Main.loadRules();
-        sender.sendMessage( "BungeeFilter Reloaded" );
+        sender.sendMessage(new TextComponent(  "BungeeFilter Reloaded" ));
     }
 }

src/main/java/com/minecraftdimensions/bungeechatfilter/Main.java

@@ -12,6 +12,7 @@
 public class Main extends Plugin {
 
     public static long SPAMTIMER = 0;
+    public static long REPEATTIMER = 0;
     public static Boolean COMMANDS;
     public static List<String> COMLIST;
     public static ArrayList<Rule> RULES;
@@ -69,7 +70,8 @@ private void initialiseConfig() {
         COMLIST = c.getListString( "Commands", defaultList );
         NOSPAM = c.getBoolean( "AntiSpam", true );
         NOREPEAT = c.getBoolean( "AntiRepeat", true );
-        SPAMTIMER = c.getInt( "Minimum-Chat-Delay" ) ;
+        SPAMTIMER = c.getInt( "Minimum-Chat-Delay", 1500 ) ;
+        REPEATTIMER = c.getInt( "Minimum-Repeat-Delay", 60000 ) ;
         loadRules();
     }
 
@@ -89,13 +91,20 @@ public static void loadRules() {
             }
             String perm = c.getString( "rules." + node + ".permission" );
             String ignore = c.getString( "rules." + node + ".ignores" );
-            HashMap<String, String[]> actions = new HashMap<>();
+            HashMap<String, Object> actions = new HashMap<>();
             for ( String action : c.getSubNodes( "rules." + node + ".actions" ) ) {
+                Object obj = c.get( "rules." + node + ".actions." + action );
                 if ( action.equals( "replace" ) ) {
                     List<String> strlist = c.getListString( "rules." + node + ".actions.replace" );
                     actions.put( action, strlist.toArray( new String[strlist.size()] ) );
+                } else if ( obj instanceof List ) {
+                    actions.put( action, c.getListString("rules." + node + ".actions." + action ) );
+                } else if ( obj instanceof String ) {
+                    List<String> stringList = new ArrayList();
+                    stringList.add( c.getString("rules." + node + ".actions." + action ) );
+                    actions.put( action, stringList );
                 } else {
-                    actions.put( action, new String[] { c.getString( "rules." + node + ".actions." + action ) } );
+                    actions.put( action, c.get( "rules." + node + ".actions." + action ) );
                 }
             }
             RULES.add( new Rule( regex, actions, perm, ignore ) );
@@ -104,7 +113,4 @@ public static void loadRules() {
     }
 
 
-    public String color( String s ) {
-        return ChatColor.translateAlternateColorCodes( '&', s );
-    }
 }

src/main/java/com/minecraftdimensions/bungeechatfilter/PlayerChatListener.java

@@ -17,33 +17,34 @@ public void playerChat( ChatEvent e ) {
             if ( !player.hasPermission( "bungeefilter.bypass" ) ) {
                 if ( !Main.COMMANDS && isChatCommand( e.getMessage() ) ) {
                     return;
+                } else if( Main.COMMANDS && isChatCommand( e.getMessage() ) && !isMonitoredCommand( e.getMessage() )){
+                    return;
                 }
-                if(Main.NOREPEAT){
-                    if(repeatCheck(player.getName(), e.getMessage())){
+                if ( Main.NOSPAM && !player.hasPermission( "bungeefilter.bypass.spam" ) ) {
+                    if ( spamCheck( player, e.getMessage(), System.currentTimeMillis()) ) {
                         e.setCancelled( true );
-                        player.sendMessage( new TextComponent( ChatColor.RED + "Please do not spam" ) );
+                        player.sendMessage( new TextComponent( TextComponent.fromLegacyText(util.color( Main.c.getString("AntiSpamMessage", "&cPlease do not spam") ) ) ) );
                         return;
-                    }else{
-                        Main.ANTIREPEAT.put( player.getName(), e.getMessage() );
                     }
-
                 }
-                if ( Main.NOSPAM ) {
-                    if ( spamCheck( player, e.getMessage(), System.currentTimeMillis()) ) {
+                if(Main.NOREPEAT && !player.hasPermission( "bungeefilter.bypass.repeat" )){
+                    if(repeatCheck(player.getName(), e.getMessage(),System.currentTimeMillis())){
                         e.setCancelled( true );
-                        player.sendMessage( new TextComponent( ChatColor.RED + "Please do not spam" ) );
+                        player.sendMessage( new TextComponent( TextComponent.fromLegacyText(util.color( Main.c.getString("AntiRepeatMessage", "&cPlease do not spam") ) ) ) );
                         return;
-                    } else {
-                        Main.ANTISPAM.put( player.getName(),System.currentTimeMillis());
+                    }else{
+                        Main.ANTIREPEAT.put( player.getName(), e.getMessage() );
                     }
+
                 }
+                Main.ANTISPAM.put( player.getName(),System.currentTimeMillis());
                 for ( Rule r : Main.RULES ) {
                     if(r.hasPermission()){
                         if(!r.needsPerm && player.hasPermission( r.getPermission() )){
-                            return;
+                            continue;
                         }
                         if(r.needsPerm && !player.hasPermission( r.getPermission() )){
-                            return;
+                            continue;
                         }
                     }
                     if ( r.doesMessageContainRegex( e.getMessage() ) ) {
@@ -55,31 +56,31 @@ public void playerChat( ChatEvent e ) {
 
     }
 
-    private boolean repeatCheck( String name, String message ) {
-        if(isChatCommand( message ) && !isMonitoredCommand( message )){
-            return false;
-        }
-        if ( Main.ANTIREPEAT.containsKey( name ) ) {
-            return Main.ANTIREPEAT.get( name ).equals( message );
-        }
-        return false;
-    }
-
     private boolean spamCheck( ProxiedPlayer player,String message, long time ) {
-        if(isChatCommand( message ) && !isMonitoredCommand( message )){
-            return false;
-        }
         if ( Main.ANTISPAM.containsKey( player.getName() ) ) {
             Long diff = time-Main.ANTISPAM.get( player.getName() );
             return diff<Main.SPAMTIMER;
         }
         return false;
     }
+
+    private boolean repeatCheck( String name, String message, long time ) {
+        if ( Main.ANTISPAM.containsKey( name) && Main.ANTIREPEAT.containsKey( name ) ) {
+            Long diff = time-Main.ANTISPAM.get( name );
+            if ( diff<Main.REPEATTIMER ) {
+                return Main.ANTIREPEAT.get( name ).equals( message );
+            } else {
+                return false;
+            }
+        }
+        return false;
+    }
 
     @EventHandler
     public void playerLogOut( PlayerDisconnectEvent e ) {
           if(Main.ANTISPAM.containsKey( e.getPlayer().getName() )){
               Main.ANTISPAM.remove( e.getPlayer().getName() );
+              Main.ANTIREPEAT.remove( e.getPlayer().getName() );
           }
     }