Q: Removed the '!' at the end of the line directly giving the userpassword

S: Added the scoring system to the config

git-svn-id: https://svn.code.sf.net/p/borknet-dev-com/code/borknet_services/trunk@115 978df70f-ee2e-0410-be05-84fadda3e4e6

diff --git a/CHANGES b/CHANGES
index 6976ffe8bfddbe89b480030439b73f2c033ce018..3b7d7e6e17cb62bc961226bc9f9cb37aa6ae51a6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+05/06/2012 REV 115
+Q: Removed the '!' at the end of the line directly giving the userpassword
+S: Added the scoring system to the config
+
+??? REV 114
+???
+Profit!
+
 08/09/2011 REV 113
 P: small change to userhosts.
 P: added scan command.

diff --git a/compile.bat b/compile.bat
index c086b12ce2dcc3f97409c4e13c0f4d4a2c5f9cc1..1dbd166d5a5db05fc80b64d9e916c95ea67fa5bc 100644 (file)
--- a/compile.bat
+++ b/compile.bat
@@ -11,13 +11,13 @@ rem javac core/*.java
 rem javac core/commands/*.java\r
 rem javac core/modules/basic/*.java\r
 rem javac core/modules/bob/*.java\r
- javac core/modules/g/*.java\r
+rem javac core/modules/g/*.java\r
 rem javac core/modules/h/*.java\r
 rem javac core/modules/m/*.java\r
 rem javac core/modules/p/*.java\r
-rem javac core/modules/q/*.java\r
+ javac core/modules/q/*.java\r
 rem javac core/modules/r/*.java\r
-rem javac core/modules/s/*.java\r
+ javac core/modules/s/*.java\r
 rem javac core/modules/t/*.java\r
 rem javac core/modules/tutor/*.java\r
 rem javac core/modules/v/*.java\r

diff --git a/core/modules/q/Hello.class b/core/modules/q/Hello.class
index caa983dcae6a39e8b9e3aa6a64aebb77b2863904..df7a23f3e962f37d574cd1bdeffa45e08ed920a5 100644 (file)
Binary files a/core/modules/q/Hello.class and b/core/modules/q/Hello.class differ

diff --git a/core/modules/q/Hello.java b/core/modules/q/Hello.java
index 193ce1ec3471057240cbe61336268a3e1690f3e9..13c788fd8da0c154c7e03f1d2b0aa6e9e51498bc 100644 (file)
--- a/core/modules/q/Hello.java
+++ b/core/modules/q/Hello.java
@@ -128,7 +128,7 @@ public class Hello implements Command
                                }\r
                                else\r
                                {\r
-                                       C.cmd_notice(numeric, botnum, username, "Account created successfully, your new password is: " + userpass + "!");\r
+                                       C.cmd_notice(numeric, botnum, username, "Account created successfully, your new password is: " + userpass);\r
                                }\r
                                //we add his info to the active authed array\r
                                dbc.addAuth(userinfo[1],pass,mail1,1,false,Long.parseLong(C.get_time()),"0","0","0");\r

diff --git a/core/modules/s/Commands.class b/core/modules/s/Commands.class
index ef83b7cd888a3acab2818868e636ef0a4a148a0b..af803fa59567df1a4e877cef87c93d7111847d15 100644 (file)
Binary files a/core/modules/s/Commands.class and b/core/modules/s/Commands.class differ

diff --git a/core/modules/s/Commands.java b/core/modules/s/Commands.java
index 367bb75f01efb6ae55b8d8ca2c8315968f8ecfe1..3637e69ea88d56d688403f0e10709c7f6ca9f1b6 100644 (file)
--- a/core/modules/s/Commands.java
+++ b/core/modules/s/Commands.java
@@ -153,7 +153,7 @@ public class Commands
  }\r
        private void spamscan(String username, String msg)\r
        {\r
-               dbc.addPoints(username, 16);\r
+               dbc.addPoints(username, Bot.getSpamtext());\r
                if(msg.contains("#"))\r
                {\r
                        if(msg.indexOf("#",msg.indexOf("#")) > -1)\r
@@ -163,7 +163,7 @@ public class Commands
                                {\r
                                        if(chan.startsWith("#") && dbc.chanExists(chan))\r
                                        {\r
-                                               dbc.addPoints(username, 64);\r
+                                               dbc.addPoints(username, Bot.getSpamchan());\r
                                        }\r
                                }\r
                        }\r
@@ -176,25 +176,25 @@ public class Commands
                                }\r
                                if(dbc.chanExists(chan))\r
                                {\r
-                                       dbc.addPoints(username, 64);\r
+                                       dbc.addPoints(username, Bot.getSpamchan());\r
                                }\r
                        }\r
                }\r
                if(msg.contains("http://") || msg.contains("www."))\r
                {\r
-                       dbc.addPoints(username, 64);\r
+                       dbc.addPoints(username, Bot.getSpamweb());\r
                }\r
                if(dbc.repeat(username,msg))\r
                {\r
-                       dbc.addPoints(username, 24);\r
+                       dbc.addPoints(username, Bot.getSpamrepeat());\r
                }\r
   dbc.addPoints(username, spamwords.getPoints(msg));\r
                dbc.setMsg(username,msg);\r
-               if(dbc.getPoints(username) > 79)\r
+               if(dbc.getPoints(username) >= Bot.getSpamwarning())\r
                {\r
                        C.cmd_notice(numeric, botnum,username, "You are violating "+network+" rules. Please read "+rules+" and cease your abuse.");\r
                }\r
-               if(dbc.getPoints(username) > 100)\r
+               if(dbc.getPoints(username) >= Bot.getSpamkill())\r
                {\r
                        C.cmd_dis(username, "You are violating "+network+" rules. Please read "+rules+". ID: "+dbc.getID());\r
                }\r

diff --git a/core/modules/s/S.class b/core/modules/s/S.class
index 2cc4fbb9590df2409ca1dac2b6a681c734b963b3..0963811840249690feda23b47480dcd3f2579030 100644 (file)
Binary files a/core/modules/s/S.class and b/core/modules/s/S.class differ

diff --git a/core/modules/s/S.java b/core/modules/s/S.java
index 2205acb454dc3d57a1bf4e21a16620eb04663c24..26179cc5123351cb1418bd26883fc3adf8fec64f 100644 (file)
--- a/core/modules/s/S.java
+++ b/core/modules/s/S.java
@@ -43,6 +43,13 @@ public class S implements Modules
        private String rules = "";\r
        private ArrayList<Object> cmds = new ArrayList<Object>();\r
        private ArrayList<String> cmdn = new ArrayList<String>();\r
+ \r
+ private int spamtext=16;\r
+ private int spamchan=64;\r
+ private int spamweb=64;\r
+ private int spamrepeat=24;\r
+ private int spamwarning=80;\r
+ private int spamkill=100;\r
 \r
        public S()\r
        {\r
@@ -113,6 +120,12 @@ public class S implements Modules
                        pass = dataSrc.getProperty("pass");\r
                        num = dataSrc.getProperty("numeric");\r
                        rules = dataSrc.getProperty("rules");\r
+   spamtext=Integer.parseInt(dataSrc.getProperty("spamtext"));\r
+   spamchan=Integer.parseInt(dataSrc.getProperty("spamchan"));\r
+   spamweb=Integer.parseInt(dataSrc.getProperty("spamweb"));\r
+   spamrepeat=Integer.parseInt(dataSrc.getProperty("spamrepeat"));\r
+   spamwarning=Integer.parseInt(dataSrc.getProperty("spamwarning"));\r
+   spamkill=Integer.parseInt(dataSrc.getProperty("spamkill"));\r
                }\r
                catch(Exception e)\r
                {\r
@@ -154,6 +167,32 @@ public class S implements Modules
        {\r
                return rules;\r
        }\r
+ \r
+       public int getSpamtext()\r
+       {\r
+               return spamtext;\r
+       }\r
+       public int getSpamchan()\r
+       {\r
+               return spamchan;\r
+       }\r
+       public int getSpamweb()\r
+       {\r
+               return spamweb;\r
+       }\r
+       public int getSpamrepeat()\r
+       {\r
+               return spamrepeat;\r
+       }\r
+       public int getSpamwarning()\r
+       {\r
+               return spamwarning;\r
+       }\r
+       public int getSpamkill()\r
+       {\r
+               return spamkill;\r
+       }\r
+ \r
        public DBControl getDBC()\r
        {\r
                return dbc;\r

diff --git a/core/modules/s/s.conf b/core/modules/s/s.conf
index 941745490213e8317029155c22abebf630737fd6..fa945a16734e4f8b533af22afcf6db440443e07e 100644 (file)
--- a/core/modules/s/s.conf
+++ b/core/modules/s/s.conf
@@ -37,4 +37,23 @@ numeric=AAB
 
 # Rules page
 rules=http://www.borknet.org/rules.php
+
+# Scoring system:
+# Users get points added for every line they post, points will add up,
+# someone that says a textline containing an existing channel will get
+# a total of 80 points. Every 10 seconds 20 points are substracted from
+# the user's total.
+# text:
+spamtext=16
+# channel advertising:
+spamchan=64
+# website advertising:
+spamweb=64
+# repeating:
+spamrepeat=24
+# warning:
+spamwarning=80
+# kill:
+spamkill=100
+
 # 01000010 01101111 01110010 01101011 01001110 01100101 01110100
\ No newline at end of file