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

Add /FSET CHANNEL_URL to format the RPL_CHANNELURL (328) numeric sent by dalnet and atheme services.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@142 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2011-10-04 12:47:01 +00:00
parent 89b77f68fe
commit b355145d69
5 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,5 +1,7 @@
[Changes 1.2c01] [Changes 1.2c01]
* Add /FSET CHANNEL_URL for services channel URL numeric. (caf)
* Fix crash bug in $mircansi() scripting function. (caf) * Fix crash bug in $mircansi() scripting function. (caf)
* Add half-op support to /topic and /untopic. (caf) * Add half-op support to /topic and /untopic. (caf)

2
include/color.h
View File

@@ -67,6 +67,7 @@
#define DEFAULT_FORMAT_BWALL_FSET "%K[%cWallOp%K/%c$2%K] %n$4-" #define DEFAULT_FORMAT_BWALL_FSET "%K[%cWallOp%K/%c$2%K] %n$4-"
#define DEFAULT_FORMAT_CHANNEL_SIGNOFF_FSET "$G %nSignOff%K: %W$1 %K(%n$4-%K)" #define DEFAULT_FORMAT_CHANNEL_SIGNOFF_FSET "$G %nSignOff%K: %W$1 %K(%n$4-%K)"
#define DEFAULT_FORMAT_CHANNEL_URL_FSET "$G URL for %c$1%K:%n $2-"
#define DEFAULT_FORMAT_CONNECT_FSET "$G Connecting to server $1/%c$2%n" #define DEFAULT_FORMAT_CONNECT_FSET "$G Connecting to server $1/%c$2%n"
/* Done CTCP */ /* Done CTCP */
@@ -499,6 +500,7 @@
#define DEFAULT_FORMAT_BWALL_FSET "[%GBX-Wall%n/%W$1:$2%n] $4-" #define DEFAULT_FORMAT_BWALL_FSET "[%GBX-Wall%n/%W$1:$2%n] $4-"
#define DEFAULT_FORMAT_CHANNEL_SIGNOFF_FSET "$G %nSignOff %W$1%n: $3 %K(%n$4-%K)" #define DEFAULT_FORMAT_CHANNEL_SIGNOFF_FSET "$G %nSignOff %W$1%n: $3 %K(%n$4-%K)"
#define DEFAULT_FORMAT_CHANNEL_URL_FSET "$G URL %K(%c$1%K):%n $2-"
#define DEFAULT_FORMAT_CONNECT_FSET "$G Connecting to server $1/%c$2%n" #define DEFAULT_FORMAT_CONNECT_FSET "$G Connecting to server $1/%c$2%n"
#define DEFAULT_FORMAT_COMPLETE_FSET "%K[%n$[15]0%K] [%n$[15]1%K] [%n$[15]2%K] [%n$[15]3%K]" #define DEFAULT_FORMAT_COMPLETE_FSET "%K[%n$[15]0%K] [%n$[15]1%K] [%n$[15]2%K] [%n$[15]3%K]"

1
include/cset.h
View File

@@ -165,6 +165,7 @@ FORMAT_BOT_HEADER_FSET,
FORMAT_BWALL_FSET, FORMAT_BWALL_FSET,
FORMAT_CHANNEL_SIGNOFF_FSET, FORMAT_CHANNEL_SIGNOFF_FSET,
FORMAT_CHANNEL_URL_FSET,
FORMAT_COMPLETE_FSET, FORMAT_COMPLETE_FSET,
FORMAT_CONNECT_FSET, FORMAT_CONNECT_FSET,

2
source/fset.c
View File

@@ -47,6 +47,7 @@ IrcVariable fset_array[] =
{ "BWALL", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0}, { "BWALL", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "CHANNEL_SIGNOFF", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0}, { "CHANNEL_SIGNOFF", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "CHANNEL_URL", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "COMPLETE", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0}, { "COMPLETE", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
{ "CONNECT", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0}, { "CONNECT", 0,STR_TYPE_VAR, 0, NULL, NULL, 0, 0},
@@ -574,6 +575,7 @@ void create_fsets(Window *win, int ansi)
fset_string_var(FORMAT_BOT_FSET, DEFAULT_FORMAT_BOT_FSET); fset_string_var(FORMAT_BOT_FSET, DEFAULT_FORMAT_BOT_FSET);
fset_string_var(FORMAT_BWALL_FSET, DEFAULT_FORMAT_BWALL_FSET); fset_string_var(FORMAT_BWALL_FSET, DEFAULT_FORMAT_BWALL_FSET);
fset_string_var(FORMAT_CHANNEL_SIGNOFF_FSET, DEFAULT_FORMAT_CHANNEL_SIGNOFF_FSET); fset_string_var(FORMAT_CHANNEL_SIGNOFF_FSET, DEFAULT_FORMAT_CHANNEL_SIGNOFF_FSET);
fset_string_var(FORMAT_CHANNEL_URL_FSET, DEFAULT_FORMAT_CHANNEL_URL_FSET);
fset_string_var(FORMAT_CONNECT_FSET, DEFAULT_FORMAT_CONNECT_FSET); fset_string_var(FORMAT_CONNECT_FSET, DEFAULT_FORMAT_CONNECT_FSET);
fset_string_var(FORMAT_COMPLETE_FSET, DEFAULT_FORMAT_COMPLETE_FSET); fset_string_var(FORMAT_COMPLETE_FSET, DEFAULT_FORMAT_COMPLETE_FSET);
fset_string_var(FORMAT_CTCP_FSET, DEFAULT_FORMAT_CTCP_FSET); fset_string_var(FORMAT_CTCP_FSET, DEFAULT_FORMAT_CTCP_FSET);

11
source/numbers.c
View File

@@ -1509,6 +1509,17 @@ void numbered_command(char *from, int comm, char **ArgList)
put_it("%s Your user mode is [%s]", numeric_banner(), ArgList?ArgList[0]:space); put_it("%s Your user mode is [%s]", numeric_banner(), ArgList?ArgList[0]:space);
break; break;
case 328: /* #define RPL_CHANNELURL 328 (atheme, bahamut, freenode) */
{
const char *channel = ArgList[0];
const char *url = ArgList[1] ? ArgList[1] : empty_string;
set_display_target(channel, LOG_CRAP);
put_it("%s", convert_output_format(fget_string_var(FORMAT_CHANNEL_URL_FSET), "%s %s %s", update_clock(GET_TIME), channel, url));
reset_display_target();
break;
}
case 329: /* #define CREATION_TIME 329 */ case 329: /* #define CREATION_TIME 329 */
{ {
unsigned long ts; unsigned long ts;