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

Add ENCRYPTED_PUBLIC and ENCRYPTED_PUBLIC_NOTICE formats

Browse Source 
Encrypted messages to a channel need to use their own format.  This also fixes the use of ENCRYPTED_PRIVMSG
and ENCRYPTED_NOTICE - they were being called with too many arguments so the destination nick was being prepended
to the message text.
This commit is contained in:
Kevin Easton
2017-06-27 14:15:10 +10:00
parent 0c51ac19d4
commit ed597221f2
5 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/color.h
View File

@@ -96,6 +96,8 @@
#define DEFAULT_FORMAT_DISCONNECT_FSET "$G Use %G/Server%n to connect to a server"
#define DEFAULT_FORMAT_ENCRYPTED_NOTICE_FSET "%K-%Y$1%K(%p$2%K)-%n $3-"
#define DEFAULT_FORMAT_ENCRYPTED_PRIVMSG_FSET "%K[%Y$1%K(%p$2%K)]%n $3-"
#define DEFAULT_FORMAT_ENCRYPTED_PUBLIC_FSET "%Y<%n$1%K/%n$3%Y>%n $4-"
#define DEFAULT_FORMAT_ENCRYPTED_PUBLIC_NOTICE_FSET "%Y-%n$1%K/%n$3%Y-%n $4-"
#define DEFAULT_FORMAT_FLOOD_FSET "%Y$1%n flood detected from %G$2%K(%g$3%K)%n on %K[%G$4%K]"
#define DEFAULT_FORMAT_FRIEND_JOIN_FSET "$G %R$1 %K[%c$2%K]%n has joined $3"
#define DEFAULT_FORMAT_HELP_FSET "$0-"
@@ -529,6 +531,8 @@
#define DEFAULT_FORMAT_DISCONNECT_FSET "$G Use %G/Server%n to connect to a server"
#define DEFAULT_FORMAT_ENCRYPTED_NOTICE_FSET "%@%K-%Y$1%K(%p$2%K)-%n $3-"
#define DEFAULT_FORMAT_ENCRYPTED_PRIVMSG_FSET "%@%K[%Y$1%K(%p$2%K)]%n $3-"
#define DEFAULT_FORMAT_ENCRYPTED_PUBLIC_FSET "%@%Y<%n$1%K/%n$3%Y>%n $4-"
#define DEFAULT_FORMAT_ENCRYPTED_PUBLIC_NOTICE_FSET "%@%Y-%n$1%K/%n$3%Y-%n $4-"
#define DEFAULT_FORMAT_FLOOD_FSET "%Y$1%n flood detected from %G$2%K(%g$3%K)%n on %K[%G$4%K]"
#define DEFAULT_FORMAT_FRIEND_JOIN_FSET "$G %R$1 %K[%c$2%K]%n has joined $3"
#define DEFAULT_FORMAT_HELP_FSET "$0-"