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

Add /FSET WHOIS_LOGGEDIN to format RPL_WHOISLOGGEDIN, used by hybrid, ratbox, ircu and derivatives.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@506 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2014-10-10 12:56:09 +00:00
parent 4d14d35d1a
commit 5126d21126
5 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@@ -1,5 +1,8 @@
[Changes 1.2c01]
* Add /FSET WOHIS_LOGGEDIN for services login info on hybrid, ratbox and
ircu. (caf)
* Add sanity checking of incoming nicknames. (caf)
* /MV (massvoice) shouldn't send +v for already-voiced users. (caf)

3
include/color.h
View File

@@ -322,6 +322,7 @@
#define DEFAULT_FORMAT_WHOIS_SERVICE_FSET "%K| %Ws%nervice : $0 - $1-"
#define DEFAULT_FORMAT_WHOIS_HELP_FSET "%K| %Wh%nelp : $0 - $1-"
#define DEFAULT_FORMAT_WHOIS_REGISTER_FSET "%K| %Wr%negister : $0 - $1-"
#define DEFAULT_FORMAT_WHOIS_LOGGEDIN_FSET "%K: %Wl%noggedin : $0 $2- %W$1%n"
#define DEFAULT_FORMAT_WIDELIST_FSET "$1-"
#define DEFAULT_FORMAT_WINDOW_SET_FSET "$0-"
@@ -746,6 +747,7 @@
#define DEFAULT_FORMAT_WHOIS_SERVICE_FSET ansi?"%K| %Ws%nervice : $0 - $1-":"| service : $0 - $1-"
#define DEFAULT_FORMAT_WHOIS_HELP_FSET ansi?"%K| %Wh%nelp : $0 - $1-":"| help : $0 - $1-"
#define DEFAULT_FORMAT_WHOIS_REGISTER_FSET ansi?"%K| %Wr%negister : $0 - $1-":"| register : $0 - $1-"
#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-"
@@ -770,6 +772,7 @@
#define DEFAULT_FORMAT_WHOIS_SERVICE_FSET ansi?"%K| %Ws%nervice : $0 - $1-":"| service : $0 - $1-"
#define DEFAULT_FORMAT_WHOIS_HELP_FSET ansi?"%K| %Wh%nelp : $0 - $1-":"| help : $0 - $1-"
#define DEFAULT_FORMAT_WHOIS_REGISTER_FSET ansi?"%K| %Wr%negister : $0 - $1-":"| register : $0 - $1-"
#define DEFAULT_FORMAT_WHOIS_LOGGEDIN_FSET ansi?"%K: %Wl%noggedin : $0 $2- %W$1%n":": loggedin : $0 $2- $1"
#endif
#define DEFAULT_FORMAT_WIDELIST_FSET "$1-"

1
include/cset.h
View File

@@ -372,6 +372,7 @@ FORMAT_WHOIS_FRIEND_FSET,
FORMAT_WHOIS_HEADER_FSET,
FORMAT_WHOIS_HELP_FSET,
FORMAT_WHOIS_IDLE_FSET,
FORMAT_WHOIS_LOGGEDIN_FSET,
FORMAT_WHOIS_NAME_FSET,
FORMAT_WHOIS_NICK_FSET,
FORMAT_WHOIS_OPER_FSET,

2
source/fset.c
View File

@@ -249,6 +249,7 @@ IrcVariable fset_array[] =
{ "WHOIS_HEADER", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_HELP", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_IDLE", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_LOGGEDIN", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_NAME", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_NICK", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "WHOIS_OPER", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
@@ -751,6 +752,7 @@ void create_fsets(Window *win, int ansi)
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_LOGGEDIN_FSET, DEFAULT_FORMAT_WHOIS_LOGGEDIN_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_NAME_FSET, DEFAULT_FORMAT_WHOIS_NAME_FSET);

6
source/numbers.c
View File

@@ -913,6 +913,12 @@ void numbered_command(char *from, int comm, char **ArgList)
funny_mode(from, ArgList);
break;
}
case 330: /* #define RPL_WHOISLOGGEDIN 330 (hybrid, ratbox, ircu) */
{
if (do_hook(current_numeric, "%s %s %s %s", from, ArgList[0], ArgList[1], ArgList[2]))
put_it("%s", convert_output_format(fget_string_var(FORMAT_WHOIS_LOGGEDIN_FSET),"%s %s %s", ArgList[0], ArgList[1], ArgList[2]));
break;
}
case 338: /* #define RPL_WHOISACTUALLY 338 (hybrid, ratbox, bahamut) */
case 378: /* #define RPL_WHOISHOST 378 (unreal, freenode) */