mirror of
https://github.com/irssi/irssi.git
synced 2026-08-11 04:43:34 +02:00
Receive 'self messages' in the right query window
Original patch by hondza <sedaj2@gmail.com>, from FS#833. I applied several needed style changes, and rebased to current HEAD. This implements the IRCv3.2 self-message extension partially (we can't announce its support through CAP yet). This is also the format used by the 'privmsg' znc module, and is already implemented by several other clients.
This commit is contained in:
parent
65a2ff6459
commit
1edfcedda1
3 changed files with 38 additions and 15 deletions
|
|
@ -242,13 +242,16 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
|
|||
}
|
||||
|
||||
static void sig_message_private(SERVER_REC *server, const char *msg,
|
||||
const char *nick, const char *address)
|
||||
const char *nick, const char *address, const char *target)
|
||||
{
|
||||
QUERY_REC *query;
|
||||
char *freemsg = NULL;
|
||||
int level = MSGLEVEL_MSGS;
|
||||
|
||||
query = query_find(server, nick);
|
||||
/* own message returned by bouncer? */
|
||||
int own = (!strcmp(nick, server->nick));
|
||||
|
||||
query = query_find(server, own ? target : nick);
|
||||
|
||||
if (settings_get_bool("emphasis"))
|
||||
msg = freemsg = expand_emphasis((WI_ITEM_REC *) query, msg);
|
||||
|
|
@ -256,9 +259,15 @@ static void sig_message_private(SERVER_REC *server, const char *msg,
|
|||
if (ignore_check(server, nick, address, NULL, msg, level | MSGLEVEL_NO_ACT))
|
||||
level |= MSGLEVEL_NO_ACT;
|
||||
|
||||
printformat(server, nick, level,
|
||||
query == NULL ? TXT_MSG_PRIVATE :
|
||||
TXT_MSG_PRIVATE_QUERY, nick, address, msg);
|
||||
if (own) {
|
||||
printformat(server, target, level,
|
||||
query == NULL ? TXT_OWN_MSG_PRIVATE :
|
||||
TXT_OWN_MSG_PRIVATE_QUERY, target, msg, server->nick);
|
||||
} else {
|
||||
printformat(server, nick, level,
|
||||
query == NULL ? TXT_MSG_PRIVATE :
|
||||
TXT_MSG_PRIVATE_QUERY, nick, address, msg);
|
||||
}
|
||||
|
||||
g_free_not_null(freemsg);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue