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

Add /FSET WHOIS_CALLERID for +g mode notification on hybrid & ratbox.

Browse Source 
This is numeric 716.  Hybrid shows it in WHOIS, and both show it when you
try to PRIVMSG someone who is +g (similar to AWAY).  So I've formatted it
to match the WHOIS block.

I also took the chance to fix up the ordering of the fsets, and remove
a bunch of redundant setting of default values.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@103 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2010-09-30 12:48:28 +00:00
parent 5430be4c78
commit 7a59da1f2e
5 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/color.h
View File

@@ -305,6 +305,7 @@
#define DEFAULT_FORMAT_WHOIS_SHIT_FSET "%g<> %Ws%nhit %K:%n L:$0 [$1] $2 $3-"
#define DEFAULT_FORMAT_WHOIS_SIGNON_FSET "%K: %Ws%nignon %K:%n $0-"
#define DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET "%K| %Wa%nctually %K:%n $0-"
#define DEFAULT_FORMAT_WHOIS_CALLERID_FSET "%K! %Wc%nallerid %K:%n $0-"
#define DEFAULT_FORMAT_WHOIS_NAME_FSET "%G<> %Wi%nrcname %K:%n $0-"
#define DEFAULT_FORMAT_WHOIS_NICK_FSET "%G<> %W$0 %K(%n$1@$2%K) (%n$3-%K)"
#define DEFAULT_FORMAT_WHOIS_OPER_FSET "%K| %Wo%nperator %K:%n $0 $1-"
@@ -726,6 +727,7 @@
#define DEFAULT_FORMAT_WHOIS_SHIT_FSET ansi?"%g| %Ws%nhit : L:$0 [$1] $2 $3-":"| shit : L:$0 [$1] $2 $3-"
#define DEFAULT_FORMAT_WHOIS_SIGNON_FSET ansi?"%K| %Ws%nignon : $0-":"| signon : $0-"
#define DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET ansi?"%K: %Wa%nctually : $0-":": actually : $0-"
#define DEFAULT_FORMAT_WHOIS_CALLERID_FSET ansi?"%K! %Wc%nallerid : $0-":"! callerid : $0-"
#define DEFAULT_FORMAT_WHOIS_NAME_FSET ansi?"%G: %Wi%nrcname : $0-":": ircname : $0-"
#define DEFAULT_FORMAT_WHOIS_NICK_FSET ansi?"%G| %W$0 %K(%n$1@$2%K) %K(%W$3-%K)":"| $0 ($1@$2) ($3-)"
#define DEFAULT_FORMAT_WHOIS_OPER_FSET ansi?"%K| %Wo%nperator : $0 $1-":"| operator : $0 $1-"
@@ -748,6 +750,7 @@
#define DEFAULT_FORMAT_WHOIS_SHIT_FSET ansi?"%g| %Ws%nhit : L:$0 [$1] $2 $3-":"| shit : L:$0 [$1] $2 $3-"
#define DEFAULT_FORMAT_WHOIS_SIGNON_FSET ansi?"%K %Ws%nignon : $0-":" signon : $0-"
#define DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET ansi?"%K| %Wa%nctually : $0-":"| actually : $0-"
#define DEFAULT_FORMAT_WHOIS_CALLERID_FSET ansi?"%K! %Wc%nallerid : $0-":"! callerid : $0-"
#define DEFAULT_FORMAT_WHOIS_NAME_FSET ansi?"%G<> %Wi%nrcname : $0-":"<02> ircname : $0-"
#define DEFAULT_FORMAT_WHOIS_NICK_FSET ansi?"%G| %W$0 %K(%n$1@$2%K) %K(%W$3-%K)":"| $0 ($1@$2) ($3-)"
#define DEFAULT_FORMAT_WHOIS_OPER_FSET ansi?"%K| %Wo%nperator : $0 $1-":"| operator : $0 $1-"

3
include/cset.h
View File

@@ -359,9 +359,11 @@ FORMAT_WALL_AR_FSET,
FORMAT_WATCH_SIGNOFF_FSET,
FORMAT_WATCH_SIGNON_FSET,
FORMAT_WHO_FSET,
FORMAT_WHOIS_ACTUALLY_FSET,
FORMAT_WHOIS_ADMIN_FSET,
FORMAT_WHOIS_AWAY_FSET,
FORMAT_WHOIS_BOT_FSET,
FORMAT_WHOIS_CALLERID_FSET,
FORMAT_WHOIS_CHANNELS_FSET,
FORMAT_WHOIS_FOOTER_FSET,
FORMAT_WHOIS_FRIEND_FSET,
@@ -376,7 +378,6 @@ FORMAT_WHOIS_SERVER_FSET,
FORMAT_WHOIS_SERVICE_FSET,
FORMAT_WHOIS_SHIT_FSET,
FORMAT_WHOIS_SIGNON_FSET,
FORMAT_WHOIS_ACTUALLY_FSET,
FORMAT_WHOLEFT_FOOTER_FSET,
FORMAT_WHOLEFT_HEADER_FSET,
FORMAT_WHOLEFT_USER_FSET,