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

2
Changelog
View File

@@ -1,5 +1,7 @@
[Changes 1.2c01]
* Add /FSET WHOIS_CALLERID for +g mode notification on hybrid & ratbox. (caf)
* Build script fix to allow plugins to build on x86-64. (caf)
* Correct count in /CLONES (reported by t3gah), and format output nicely

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,

27
source/fset.c
View File

@@ -236,9 +236,11 @@ IrcVariable fset_array[] =
{ "WATCH_SIGNON", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WATCH_SIGNOFF", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHO", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_ACTUALLY", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_ADMIN", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_AWAY", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_BOT", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_CALLERID", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_CHANNELS", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_FOOTER", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_FRIEND", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
@@ -253,7 +255,6 @@ IrcVariable fset_array[] =
{ "WHOIS_SERVICE", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_SHIT", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_SIGNON", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_ACTUALLY", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOLEFT_FOOTER", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOLEFT_HEADER", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOLEFT_USER", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
@@ -741,36 +742,16 @@ void create_fsets(Window *win, int ansi)
fset_string_var(FORMAT_WALL_AR_FSET, DEFAULT_FORMAT_WALL_AR_FSET);
fset_string_var(FORMAT_WALLOP_FSET, DEFAULT_FORMAT_WALLOP_FSET);
fset_string_var(FORMAT_WHO_FSET, DEFAULT_FORMAT_WHO_FSET);
fset_string_var(FORMAT_WHOIS_ACTUALLY_FSET, DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET);
fset_string_var(FORMAT_WHOIS_AWAY_FSET, DEFAULT_FORMAT_WHOIS_AWAY_FSET);
fset_string_var(FORMAT_WHOIS_BOT_FSET, DEFAULT_FORMAT_WHOIS_BOT_FSET);
fset_string_var(FORMAT_WHOIS_CALLERID_FSET, DEFAULT_FORMAT_WHOIS_CALLERID_FSET);
fset_string_var(FORMAT_WHOIS_CHANNELS_FSET, DEFAULT_FORMAT_WHOIS_CHANNELS_FSET);
fset_string_var(FORMAT_WHOIS_FRIEND_FSET, DEFAULT_FORMAT_WHOIS_FRIEND_FSET);
fset_string_var(FORMAT_WHOIS_HEADER_FSET, DEFAULT_FORMAT_WHOIS_HEADER_FSET);
fset_string_var(FORMAT_WHOIS_IDLE_FSET, DEFAULT_FORMAT_WHOIS_IDLE_FSET);
fset_string_var(FORMAT_WHOIS_SHIT_FSET, DEFAULT_FORMAT_WHOIS_SHIT_FSET);
fset_string_var(FORMAT_WHOIS_SIGNON_FSET, DEFAULT_FORMAT_WHOIS_SIGNON_FSET);
fset_string_var(FORMAT_WHOIS_ACTUALLY_FSET, DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET);
fset_string_var(FORMAT_WHOIS_NAME_FSET, DEFAULT_FORMAT_WHOIS_NAME_FSET);
fset_string_var(FORMAT_WHOIS_NICK_FSET, DEFAULT_FORMAT_WHOIS_NICK_FSET);
fset_string_var(FORMAT_WHOIS_OPER_FSET, DEFAULT_FORMAT_WHOIS_OPER_FSET);
fset_string_var(FORMAT_WHOIS_SERVER_FSET, DEFAULT_FORMAT_WHOIS_SERVER_FSET);
fset_string_var(FORMAT_WHOLEFT_HEADER_FSET, DEFAULT_FORMAT_WHOLEFT_HEADER_FSET);
fset_string_var(FORMAT_WHOLEFT_USER_FSET, DEFAULT_FORMAT_WHOLEFT_USER_FSET);
fset_string_var(FORMAT_WHOWAS_HEADER_FSET, DEFAULT_FORMAT_WHOWAS_HEADER_FSET);
fset_string_var(FORMAT_WHOWAS_NICK_FSET, DEFAULT_FORMAT_WHOWAS_NICK_FSET);
fset_string_var(FORMAT_WHOIS_ADMIN_FSET, DEFAULT_FORMAT_WHOIS_ADMIN_FSET);
fset_string_var(FORMAT_WHOIS_SERVICE_FSET, DEFAULT_FORMAT_WHOIS_SERVICE_FSET);
fset_string_var(FORMAT_WHOIS_HELP_FSET, DEFAULT_FORMAT_WHOIS_HELP_FSET);
fset_string_var(FORMAT_WHOIS_REGISTER_FSET, DEFAULT_FORMAT_WHOIS_REGISTER_FSET);
fset_string_var(FORMAT_WHOIS_AWAY_FSET, DEFAULT_FORMAT_WHOIS_AWAY_FSET);
fset_string_var(FORMAT_WHOIS_BOT_FSET, DEFAULT_FORMAT_WHOIS_BOT_FSET);
fset_string_var(FORMAT_WHOIS_CHANNELS_FSET, DEFAULT_FORMAT_WHOIS_CHANNELS_FSET);
fset_string_var(FORMAT_WHOIS_FRIEND_FSET, DEFAULT_FORMAT_WHOIS_FRIEND_FSET);
fset_string_var(FORMAT_WHOIS_HEADER_FSET, DEFAULT_FORMAT_WHOIS_HEADER_FSET);
fset_string_var(FORMAT_WHOIS_IDLE_FSET, DEFAULT_FORMAT_WHOIS_IDLE_FSET);
fset_string_var(FORMAT_WHOIS_SHIT_FSET, DEFAULT_FORMAT_WHOIS_SHIT_FSET);
fset_string_var(FORMAT_WHOIS_SIGNON_FSET, DEFAULT_FORMAT_WHOIS_SIGNON_FSET);
fset_string_var(FORMAT_WHOIS_ACTUALLY_FSET, DEFAULT_FORMAT_WHOIS_ACTUALLY_FSET);
fset_string_var(FORMAT_WHOIS_NAME_FSET, DEFAULT_FORMAT_WHOIS_NAME_FSET);
fset_string_var(FORMAT_WHOIS_NICK_FSET, DEFAULT_FORMAT_WHOIS_NICK_FSET);
fset_string_var(FORMAT_WHOIS_OPER_FSET, DEFAULT_FORMAT_WHOIS_OPER_FSET);

7
source/numbers.c
View File

@@ -1301,6 +1301,13 @@ void numbered_command(char *from, int comm, char **ArgList)
display_msg(from, ArgList);
}
break;
case 716: /* #define RPL_TARGUMODEG 716 */
{
/* hybrid / ratbox: <nick> :is in +g mode (server side ignore) */
if (do_hook(current_numeric, "%s %s %s", from, ArgList[0], ArgList[1]))
put_it("%s", convert_output_format(fget_string_var(FORMAT_WHOIS_CALLERID_FSET),"%s %s", ArgList[0], ArgList[1]));
break;
}
case 365: /* #define RPL_ENDOFLINKS 365 */
{
if (get_int_var(LLOOK_VAR) && (get_server_linklook(from_server) == 1))