* Combined kick reasons for +k and .kickban

svn: 2007

doc/UPDATES

@@ -73,6 +73,7 @@ Lines prefixxed with '-' were disabled before release and are not finishsed, or
 * cmd_find now optional takes a username instead of a nick!user@host to search for.
 * Fixed unsetting a global ban when the same ban is local to a chan causes the bots to unban it. (#24)
 * +O now implies +o
+* Combined kick reasons for +k and .kickban
 
 1.2.2
 * Don't sanity check flags for users on DCC CHAT if they are on the bot via .botcmd.

misc/responses.txt

@@ -39,20 +39,16 @@
  gutter whore 
  cock sucking bathroom queen
  boner wad
-:kuser
+:kickban
  not wanted
  something tells me you're annoying
  don't bug me lewser
  creep
-:kickban
  you are not banned
  gone
  stupid
  lewser
  ...
- retard
- nigger
- jew
 :massdeop
  spammer!
  easy on the modes now

src/mod/irc.mod/chan.c

@@ -975,7 +975,7 @@ static void check_this_member(struct chanset_t *chan, char *nick, struct flag_re
 
       check_exemptlist(chan, s);
       quickban(chan, m->userhost);
-      dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick, bankickprefix, p ? p : response(RES_KUSER));
+      dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick, bankickprefix, p ? p : response(RES_KICKBAN));
       m->flags |= SENTKICK;
     }
   }
@@ -1652,7 +1652,7 @@ static int got352or4(struct chanset_t *chan, char *user, char *host, char *nick,
            /* && target_priority(chan, m, 0) */
       /* cya later! */
       quickban(chan, userhost);
-      dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, nick, bankickprefix, response(RES_KUSER));
+      dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, nick, bankickprefix, response(RES_KICKBAN));
       m->flags |= SENTKICK;
     }
   }
@@ -2409,7 +2409,7 @@ static int gotjoin(char *from, char *chname)
 	    check_exemptlist(chan, from);
 	    quickban(chan, from);
 	    p = (char *) get_user(&USERENTRY_COMMENT, m->user);
-            dprintf(DP_MODE, "KICK %s %s :%s%s\n", chname, nick, bankickprefix, response(RES_KUSER));
+            dprintf(DP_MODE, "KICK %s %s :%s%s\n", chname, nick, bankickprefix, response(RES_KICKBAN));
 	    m->flags |= SENTKICK;
 	  }
 	}