philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wire up /FSET WHOIS_BOT for users on the userlist with the BOT flag

Browse Source 
This FSET has existed for a long while but has been unused for some time,
since before the userlist was reworked to use flags instead of levels.  This
means that the default value for the FSET also has to be updated.
This commit is contained in:
Kevin Easton
2016-05-25 23:19:24 +10:00
parent 95a422cd27
commit 23967ba5be
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,5 +1,7 @@
[Changes 1.2.2]
* Wire up /FSET WHOIS_BOT for users on the userlist with the BOT flag. (caf)
* Use /FSET RELSN to format /RELSN relayed messages instead of
/FSET SEND_NOTICE. (caf)

8
include/color.h
View File

@@ -298,9 +298,9 @@
/* Done WHOIS WHOLEFT WHOWAS */
#define DEFAULT_FORMAT_WHOIS_AWAY_FSET "%K<> %Wa%nway %K:%n $1-"
#define DEFAULT_FORMAT_WHOIS_BOT_FSET "%g<> %Wb%not %K:%n A:$0 P:$1 [$2] $3-"
#define DEFAULT_FORMAT_WHOIS_BOT_FSET "%g<> %Wb%not %K:%n F:$0 $1-"
#define DEFAULT_FORMAT_WHOIS_CHANNELS_FSET "%g<> %Wc%nhannels %K:%n $0-"
#define DEFAULT_FORMAT_WHOIS_FRIEND_FSET "%g<> %Wf%nriend %K:%n L:$0 A:$1 P:$2 $3-"
#define DEFAULT_FORMAT_WHOIS_FRIEND_FSET "%g<> %Wf%nriend %K:%n F:$0 $1-"
#define DEFAULT_FORMAT_WHOIS_HEADER_FSET "%G<><47><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>%g<>%G<><47>%g<><67>%G<>%g<><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>%K<>%g<><67>%K<><4B>%g<>%K<><4B><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D> <20><> <20> -"
#define DEFAULT_FORMAT_WHOIS_IDLE_FSET "%K. %Wi%ndle %K:%n $0 hours $1 mins $2 secs (signon: $stime($3))"
#define DEFAULT_FORMAT_WHOIS_SHIT_FSET "%g<> %Ws%nhit %K:%n L:$0 [$1] $2 $3-"
@@ -724,7 +724,7 @@
#ifdef ONLY_STD_CHARS
#define DEFAULT_FORMAT_WHOIS_AWAY_FSET ansi?"%K| %Wa%nway : $0 - $1-":"| away : $0 - $1-"
#define DEFAULT_FORMAT_WHOIS_BOT_FSET ansi?"%g| %Wb%not : A:$0 P:$1 [$2] $3-":"| bot : A:$0 P:$1 [$2] $3-"
#define DEFAULT_FORMAT_WHOIS_BOT_FSET ansi?"%g| %Wb%not : F:$0 $1-":"| bot : F:$0 $1-"
#define DEFAULT_FORMAT_WHOIS_CHANNELS_FSET ansi?"%g| %Wc%nhannels : $0-":"| channels : $0-"
#define DEFAULT_FORMAT_WHOIS_FRIEND_FSET ansi?"%g| %Wf%nriend : F:$0 $1-":"| friend : F:$0 $1-"
#define DEFAULT_FORMAT_WHOIS_HEADER_FSET ansi?"%G.--------%g-%G--%g--%G-%g---------%K-%g--%K--%g-%K------------ -- -":".----------------------------------------- -- -"
@@ -749,7 +749,7 @@
#define DEFAULT_FORMAT_WHOIS_LOGGEDIN_FSET ansi?"%K: %Wl%noggedin : $0 $2- %W$1%n":": loggedin : $0 $2- $1"
#else
#define DEFAULT_FORMAT_WHOIS_AWAY_FSET ansi?"%K| %Wa%nway : $0 - $1-":"| away : $0 - $1-"
#define DEFAULT_FORMAT_WHOIS_BOT_FSET ansi?"%g| %Wb%not : A:$0 P:$1 [$2] $3-":"| bot : A:$0 P:$1 [$2] $3-"
#define DEFAULT_FORMAT_WHOIS_BOT_FSET ansi?"%g| %Wb%not : F:$0 $1-":"| bot : F:$0 $1-"
#define DEFAULT_FORMAT_WHOIS_CHANNELS_FSET ansi?"%g| %Wc%nhannels : $0-":"| channels : $0-"
#define DEFAULT_FORMAT_WHOIS_FRIEND_FSET ansi?"%g| %Wf%nriend : F:$0 $1-":"| friend : F:$0 $1-"
#define DEFAULT_FORMAT_WHOIS_HEADER_FSET ansi?"%G<><47><EFBFBD><EFBFBD><EFBFBD><EFBFBD>---%g<>%G--%g<><67>%G-%g<><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD>---%K<>%g--%K<><4B>%g-%K<><4B><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>--- -- -":"<02><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>---<02>--<02><>-<02><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>---<02>--<02><>-<02><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>--- -- -"

2
source/numbers.c
View File

@@ -797,7 +797,7 @@ void numbered_command(char *from, int comm, char **ArgList)
malloc_sprintf(&userhost, "%s@%s", u1, host);
#ifdef WANT_USERLIST
if ((tmp = lookup_userlevelc("*", userhost, "*", NULL)))
put_it("%s", convert_output_format(fget_string_var(FORMAT_WHOIS_FRIEND_FSET), "%s %s", convert_flags_to_str(tmp->flags), tmp->host));
put_it("%s", convert_output_format(fget_string_var(tmp->flags & ADD_BOT ? FORMAT_WHOIS_BOT_FSET : FORMAT_WHOIS_FRIEND_FSET), "%s %s", convert_flags_to_str(tmp->flags), tmp->host));
if ((tmp1 = nickinshit(ArgList[0], userhost)))
put_it("%s", convert_output_format(fget_string_var(FORMAT_WHOIS_SHIT_FSET),"%d %s %s %s", tmp1->level, tmp1->channels, tmp1->filter, tmp1->reason));
if (tmp || tmp1)