Просмотр исходного кода

Remove 'chanset +meankicks'. You can customize your kicks in doc/responses.txt and recompile.

Bryan Drewery 14 лет назад
Родитель
Сommit
bb56f109a6

+ 1 - 0
doc/UPDATES

@@ -1,5 +1,6 @@
 maint
 maint
   * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
   * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
+  * Remove 'chanset +meankicks'. You can customize your kicks in doc/responses.txt and recompile.
 
 
 1.4.0 - http://wraith.botpack.net/milestone/1.4.0
 1.4.0 - http://wraith.botpack.net/milestone/1.4.0
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.

+ 0 - 1
doc/help.txt

@@ -483,7 +483,6 @@ See also: link%{+a}, newhub%{-}
                        can be useful to make the bot leave a channel without
                        can be useful to make the bot leave a channel without
                        losing its settings, channel-specific user flags,
                        losing its settings, channel-specific user flags,
                        channel bans, and without affecting sharing.
                        channel bans, and without affecting sharing.
-        $bmeankicks$b      Use mean/offensive kicks/bans in the channel.
         $bnodesynch$b      Allow non-ops to perform channel modes? This can stop
         $bnodesynch$b      Allow non-ops to perform channel modes? This can stop
                        the bot from fighting with services such as ChanServ, or
                        the bot from fighting with services such as ChanServ, or
                        from kicking IRCops when setting channel modes without
                        from kicking IRCops when setting channel modes without

+ 0 - 39
doc/responses.txt

@@ -5,45 +5,6 @@
  unwanted!
  unwanted!
  remember when you used to be able to join this channel?
  remember when you used to be able to join this channel?
  we're gonna need to go ahead and have you move your stuff down to the basement...
  we're gonna need to go ahead and have you move your stuff down to the basement...
-:banned_offensive
- cya around lewser
- see you in hell
- in a word... die
- kill yourself.
- fuck you
- fuck off cunt
- bitch
- eat my ass
- lick your mom's hairy vagina lips
- fucking whore
- slut.
- suck my cock
- s my d
- sit on a penis.
- eat some anal lube
- too bad you won't see the hot titties now.
- shit face cock master.
- the special of the day: RECTUM
- no pussy for you!
- fuck you titty suckin' two balled bitch with a fat green clit.
- fucking ass licking piss sucking cunt
- deez nuts on your lips
- go lick that big ass hairy mole between your pussy lips
- damn fucking diarrhea slut with hips
- punk ass bitch
- redneck
- queer
- buttslut
- dyke
- gutter whore 
- cock sucking bathroom queen
- boner wad
- try not yo fuck youre sister on the way out
- if you wanna bump lets go nig-ga
- UJAH IF YOU GOT COCONUTS ATTACK ME
- AHH CMON FUCK A GUY
- FUCK YOU. ID QUIT IRC BUT I STILL HAVE A SCORE TO SETTLE WITH YOU BOYO.
- Have a nice life.
 :kickban
 :kickban
  not wanted
  not wanted
  something tells me you're annoying
  something tells me you're annoying

+ 1 - 2
src/chan.h

@@ -289,7 +289,7 @@ struct chanset_t {
 #define CHAN_NOUSERINVITES  BIT21
 #define CHAN_NOUSERINVITES  BIT21
 #define CHAN_FLAGGED        BIT22	/* flagged during rehash for delete   */
 #define CHAN_FLAGGED        BIT22	/* flagged during rehash for delete   */
 #define CHAN_AUTOOP         BIT23
 #define CHAN_AUTOOP         BIT23
-#define CHAN_MEANKICKS      BIT24	/* use mean/offensive kicks/bans */
+//#define CHAN_MEANKICKS      BIT24	/* use mean/offensive kicks/bans */
 #define CHAN_VOICEBITCH     BIT25
 #define CHAN_VOICEBITCH     BIT25
 #define CHAN_FLOODBAN       BIT26
 #define CHAN_FLOODBAN       BIT26
 
 
@@ -343,7 +343,6 @@ struct chanset_t *findchan_by_dname(const char *name);
 #define channel_fastop(chan) (chan->status & CHAN_FASTOP)
 #define channel_fastop(chan) (chan->status & CHAN_FASTOP)
 #define channel_privchan(chan) (chan->status & CHAN_PRIVATE)
 #define channel_privchan(chan) (chan->status & CHAN_PRIVATE)
 #define channel_autoop(chan) (chan->status & CHAN_AUTOOP)
 #define channel_autoop(chan) (chan->status & CHAN_AUTOOP)
-#define channel_meankicks(chan) (chan->status & CHAN_MEANKICKS)
 #define channel_rbl(chan) (chan->status & CHAN_RBL)
 #define channel_rbl(chan) (chan->status & CHAN_RBL)
 #define channel_voicebitch(chan) (chan->status & CHAN_VOICEBITCH)
 #define channel_voicebitch(chan) (chan->status & CHAN_VOICEBITCH)
 #define channel_protect(chan) (chan->status & CHAN_PROTECT)
 #define channel_protect(chan) (chan->status & CHAN_PROTECT)

+ 1 - 1
src/chanprog.c

@@ -57,7 +57,7 @@
 #include <bdlib/src/Array.h>
 #include <bdlib/src/Array.h>
 #include <bdlib/src/String.h>
 #include <bdlib/src/String.h>
 
 
-char *def_chanset = "+enforcebans +dynamicbans +userbans -bitch +cycle -inactive +userexempts -dynamicexempts +userinvites -dynamicinvites -nodesynch -closed -take -voice -private -fastop +meankicks ban-type 3 protect-backup 1 groups { main } revenge react";
+char *def_chanset = "+enforcebans +dynamicbans +userbans -bitch +cycle -inactive +userexempts -dynamicexempts +userinvites -dynamicinvites -nodesynch -closed -take -voice -private -fastop ban-type 3 protect-backup 1 groups { main } revenge react";
 struct chanset_t 	*chanset = NULL;	/* Channel list			*/
 struct chanset_t 	*chanset = NULL;	/* Channel list			*/
 struct chanset_t	*chanset_default = NULL;	/* Default channel list */
 struct chanset_t	*chanset_default = NULL;	/* Default channel list */
 char 			admin[121] = "";	/* Admin info			*/
 char 			admin[121] = "";	/* Admin info			*/

+ 2 - 4
src/mod/channels.mod/chanmisc.c

@@ -716,10 +716,6 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
       chan->status |= CHAN_BOTBITCH;
       chan->status |= CHAN_BOTBITCH;
     else if (!strcmp(item[i], "-botbitch"))
     else if (!strcmp(item[i], "-botbitch"))
       chan->status &= ~CHAN_BOTBITCH;
       chan->status &= ~CHAN_BOTBITCH;
-    else if (!strcmp(item[i], "+meankicks"))
-      chan->status |= CHAN_MEANKICKS;
-    else if (!strcmp(item[i], "-meankicks"))
-      chan->status &= ~CHAN_MEANKICKS;
     else if (!strcmp(item[i], "+rbl"))
     else if (!strcmp(item[i], "+rbl"))
       chan->status |= CHAN_RBL;
       chan->status |= CHAN_RBL;
     else if (!strcmp(item[i], "-rbl"))
     else if (!strcmp(item[i], "-rbl"))
@@ -758,6 +754,8 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
     else if (!cmd && !HAVE_TAKE && !strcmp(item[i], "-take")) ;
     else if (!cmd && !HAVE_TAKE && !strcmp(item[i], "-take")) ;
     else if (!cmd && !strcmp(item[i], "stopnethack-mode")) ;
     else if (!cmd && !strcmp(item[i], "stopnethack-mode")) ;
     else if (!cmd && !strcmp(item[i], "revenge-mode")) ;
     else if (!cmd && !strcmp(item[i], "revenge-mode")) ;
+    else if (!cmd && !strcmp(item[i], "+meankicks")) ;
+    else if (!cmd && !strcmp(item[i], "-meankicks")) ;
     else if (!cmd && !strcmp(item[i], "+nomassjoin")) ;
     else if (!cmd && !strcmp(item[i], "+nomassjoin")) ;
     else if (!cmd && !strcmp(item[i], "-nomassjoin")) ;
     else if (!cmd && !strcmp(item[i], "-nomassjoin")) ;
     else if (!cmd && !strcmp(item[i], "+revenge")) ;
     else if (!cmd && !strcmp(item[i], "+revenge")) ;

+ 0 - 2
src/mod/channels.mod/channels.c

@@ -857,8 +857,6 @@ void channels_report(int idx, int details)
           i += my_strcpy(s + i, "voice ");
           i += my_strcpy(s + i, "voice ");
         if (channel_autoop(chan))
         if (channel_autoop(chan))
           i += my_strcpy(s + i, "autoop ");
           i += my_strcpy(s + i, "autoop ");
-        if (channel_meankicks(chan))
-          i += my_strcpy(s + i, "meankicks ");
         if (channel_rbl(chan))
         if (channel_rbl(chan))
           i += my_strcpy(s + i, "rbl ");
           i += my_strcpy(s + i, "rbl ");
         if (channel_voicebitch(chan))
         if (channel_voicebitch(chan))

+ 0 - 1
src/mod/channels.mod/cmdschan.c

@@ -1202,7 +1202,6 @@ static void cmd_chaninfo(int idx, char *par)
     SHOW_FLAG("fastop",		channel_fastop(chan));
     SHOW_FLAG("fastop",		channel_fastop(chan));
     SHOW_FLAG("floodban", channel_floodban(chan));
     SHOW_FLAG("floodban", channel_floodban(chan));
     SHOW_FLAG("inactive",	channel_inactive(chan));
     SHOW_FLAG("inactive",	channel_inactive(chan));
-    SHOW_FLAG("meankicks",	channel_meankicks(chan));
     SHOW_FLAG("nodesynch",	channel_nodesynch(chan));
     SHOW_FLAG("nodesynch",	channel_nodesynch(chan));
     SHOW_FLAG("private",	channel_privchan(chan));
     SHOW_FLAG("private",	channel_privchan(chan));
     SHOW_FLAG("protect",	channel_protect(chan));
     SHOW_FLAG("protect",	channel_protect(chan));

+ 1 - 2
src/mod/channels.mod/userchan.c

@@ -721,7 +721,7 @@ flood-mpub %d:%d flood-mbytes %d:%d flood-mctcp %d:%d \
 capslimit %d colorlimit %d closed-ban %d closed-invite %d closed-private %d closed-exempt %d ban-time %d \
 capslimit %d colorlimit %d closed-ban %d closed-invite %d closed-private %d closed-exempt %d ban-time %d \
 exempt-time %d invite-time %d voice-non-ident %d voice-moderate %d auto-delay %d \
 exempt-time %d invite-time %d voice-non-ident %d voice-moderate %d auto-delay %d \
 flood-exempt %d flood-lock-time %d knock %d fish-key { %s } \
 flood-exempt %d flood-lock-time %d knock %d fish-key { %s } \
-%cmeankicks %cenforcebans %cdynamicbans %cuserbans %cbitch %cfloodban \
+%cenforcebans %cdynamicbans %cuserbans %cbitch %cfloodban \
 %cprivate %ccycle %cinactive %cdynamicexempts %cuserexempts \
 %cprivate %ccycle %cinactive %cdynamicexempts %cuserexempts \
 %cdynamicinvites %cuserinvites %cnodesynch %cclosed %cvoice \
 %cdynamicinvites %cuserinvites %cnodesynch %cclosed %cvoice \
 %cfastop %cautoop %cbotbitch %cbackup %crbl %cvoicebitch %cprotect protect-backup %d %c%s",
 %cfastop %cautoop %cbotbitch %cbackup %crbl %cvoicebitch %cprotect protect-backup %d %c%s",
@@ -769,7 +769,6 @@ flood-exempt %d flood-lock-time %d knock %d fish-key { %s } \
         chan->flood_lock_time,
         chan->flood_lock_time,
         chan->knock_flags,
         chan->knock_flags,
         chan->fish_key,
         chan->fish_key,
- 	PLSMNS(channel_meankicks(chan)),
  	PLSMNS(channel_enforcebans(chan)),
  	PLSMNS(channel_enforcebans(chan)),
 	PLSMNS(channel_dynamicbans(chan)),
 	PLSMNS(channel_dynamicbans(chan)),
 	PLSMNS(!channel_nouserbans(chan)),
 	PLSMNS(!channel_nouserbans(chan)),

+ 1 - 7
src/response.c

@@ -48,11 +48,5 @@ response(response_t type)
 const char *
 const char *
 r_banned(struct chanset_t *chan)
 r_banned(struct chanset_t *chan)
 {
 {
-  if (channel_meankicks(chan))
-    return response(RES_BANNED);
-
-  if (randint(1))
-    return response(RES_BANNED);
-  else
-    return response(RES_BANNED_OFFENSIVE);
+  return response(RES_BANNED);
 }
 }