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

Use /FSET RELSN to format /RELSN relayed messages

Browse Source 
The RELSN format already existed but wasn't used - instead it used SEND_NOTICE.  The other relay
types already used similar formats for their relayed messages.

The default /FSET RELSN looks just like the default /FSET SEND_NOTICE so this shouldn't be
noticeable to anyone using the defaults.

This required updating the NOTICE-sending code to correctly stash the 'to' in the right place.
This commit is contained in:
Kevin Easton
2016-05-15 22:05:16 +10:00
parent 9fb317b07d
commit 2c805c096f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@@ -1,5 +1,8 @@
[Changes 1.2.2] [Changes 1.2.2]
* Use /FSET RELSN to format /RELSN relayed messages instead of
/FSET SEND_NOTICE. (caf)
* Change formatting of /FSETs SERVER_NOTICE_KLINE and SERVER_NOTICE_GLINE * Change formatting of /FSETs SERVER_NOTICE_KLINE and SERVER_NOTICE_GLINE
to show the ban type, and improve formatting of SERVER_NOTICE_CLIENT_CONNECT to show the ban type, and improve formatting of SERVER_NOTICE_CLIENT_CONNECT
and SERVER_NOTICE_CLIENT_EXIT. (caf) and SERVER_NOTICE_CLIENT_EXIT. (caf)

2
source/commands.c
View File

@@ -4010,7 +4010,7 @@ struct target_type target[4] =
add_last_type(&last_sent_msg[0], MAX_LAST_MSG, NULL, NULL, target[i].nick_list, copy); add_last_type(&last_sent_msg[0], MAX_LAST_MSG, NULL, NULL, target[i].nick_list, copy);
} }
else if ((i == 2) || (i == 3)) else if ((i == 2) || (i == 3))
add_last_type(&last_sent_notice[0], MAX_LAST_MSG, target[i].nick_list, NULL, get_server_nickname(from_server), copy); add_last_type(&last_sent_notice[0], MAX_LAST_MSG, get_server_nickname(from_server), NULL, target[i].nick_list, copy);
send_to_server("%s %s :%s", target[i].command, target[i].nick_list, copy); send_to_server("%s %s :%s", target[i].command, target[i].nick_list, copy);
new_free(&copy); new_free(&copy);

6
source/misc.c
View File

@@ -1391,9 +1391,9 @@ BUILT_IN_COMMAND(do_dirlasttype)
{ {
/* ??? */ /* ??? */
t = &last_sent_notice[0]; size = MAX_LAST_MSG; t = &last_sent_notice[0]; size = MAX_LAST_MSG;
form = fget_string_var(FORMAT_SEND_NOTICE_FSET); form = fget_string_var(FORMAT_RELSN_FSET);
sform = "%s %s %s %s"; sform = "%s %s %s";
numargs = 4; numargs = 2;
if (len > 5 && command[len-1] == 'T') if (len > 5 && command[len-1] == 'T')
what = TOPIC; what = TOPIC;
} }