mirror of
https://github.com/irssi/irssi.git
synced 2024-10-13 05:03:45 -04:00
- Make notices to +#channel (and all other STATUSMSG=)
appear in the channel window. - Make actions and ctcp to @#channel etc appear in the channel window. - Clean up the code a little. This fixes bug #46 apart from incoming msg to +#channel. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4589 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Jilles Tjoelker
jilles
parent
21dee70141
commit
5a639efef3
@ -41,19 +41,6 @@
|
||||
#include "printtext.h"
|
||||
#include "keyboard.h"
|
||||
|
||||
static const char *skip_target(const char *target)
|
||||
{
|
||||
if (*target == '@') {
|
||||
/* @#channel, @+#channel - Hybrid6 / Bahamut features */
|
||||
if (target[1] == '+' && ischannel(target[2]))
|
||||
target += 2;
|
||||
else if (ischannel(target[1]))
|
||||
target++;
|
||||
}
|
||||
|
||||
return target;
|
||||
}
|
||||
|
||||
/* SYNTAX: ME <message> */
|
||||
static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
|
||||
{
|
||||
@ -103,7 +90,6 @@ static void cmd_action(const char *data, IRC_SERVER_REC *server)
|
||||
recoded = recode_out(SERVER(server), text, target);
|
||||
irc_send_cmdv(server, "PRIVMSG %s :\001ACTION %s\001", target, recoded);
|
||||
|
||||
target = skip_target(target);
|
||||
signal_emit("message irc own_action", 3, server, recoded, target);
|
||||
|
||||
g_free(recoded);
|
||||
@ -158,8 +144,6 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server,
|
||||
return;
|
||||
}
|
||||
|
||||
target = skip_target(target);
|
||||
|
||||
g_strup(ctcpcmd);
|
||||
signal_emit("message irc own_ctcp", 4,
|
||||
server, ctcpcmd, ctcpdata, target);
|
||||
@ -183,7 +167,6 @@ static void cmd_nctcp(const char *data, IRC_SERVER_REC *server,
|
||||
if (*target == '\0' || *text == '\0')
|
||||
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
|
||||
|
||||
target = skip_target(target);
|
||||
signal_emit("message irc own_notice", 3, server, text, target);
|
||||
cmd_params_free(free_arg);
|
||||
}
|
||||
|
||||
@ -38,15 +38,28 @@
|
||||
#include "fe-queries.h"
|
||||
#include "window-items.h"
|
||||
|
||||
static const char *skip_target(const char *target)
|
||||
static const char *skip_target(IRC_SERVER_REC *server, const char *target)
|
||||
{
|
||||
if (target != NULL && *target == '@') {
|
||||
/* @#channel, @+#channel - Hybrid6 / Bahamut features */
|
||||
if (target[1] == '+' && ischannel(target[2]))
|
||||
target += 2;
|
||||
else if (ischannel(target[1]))
|
||||
target++;
|
||||
}
|
||||
int i = 0;
|
||||
const char *val, *chars;
|
||||
|
||||
/* Quick check */
|
||||
if (server->prefix[(int)(unsigned char)*target] == 0)
|
||||
return target;
|
||||
|
||||
/* Hack: for bahamut 1.4 which sends neither STATUSMSG nor
|
||||
* WALLCHOPS in 005, accept @#chan and @+#chan (but not +#chan) */
|
||||
val = g_hash_table_lookup(server->isupport, "STATUSMSG");
|
||||
if (val == NULL && *target != '@')
|
||||
return target;
|
||||
chars = val ? val : "@+";
|
||||
for(i = 0; target[i] != '\0'; i++) {
|
||||
if (strchr(chars, target[i]) == NULL)
|
||||
break;
|
||||
};
|
||||
|
||||
if(ischannel(target[i]))
|
||||
target += i;
|
||||
|
||||
return target;
|
||||
}
|
||||
@ -58,7 +71,7 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
|
||||
char *nickmode, *recoded;
|
||||
|
||||
oldtarget = target;
|
||||
target = skip_target(target);
|
||||
target = skip_target(IRC_SERVER(server), target);
|
||||
if (IS_IRC_SERVER(server) && target != oldtarget) {
|
||||
/* Hybrid 6 / Bahamut feature, send msg to all
|
||||
ops / ops+voices in channel */
|
||||
@ -123,8 +136,11 @@ static void sig_message_own_action(IRC_SERVER_REC *server, const char *msg,
|
||||
const char *target)
|
||||
{
|
||||
void *item;
|
||||
const char *oldtarget;
|
||||
char *freemsg = NULL, *recoded;
|
||||
|
||||
oldtarget = target;
|
||||
target = skip_target(IRC_SERVER(server), target);
|
||||
if (ischannel(*target))
|
||||
item = irc_channel_find(server, target);
|
||||
else
|
||||
@ -139,8 +155,8 @@ static void sig_message_own_action(IRC_SERVER_REC *server, const char *msg,
|
||||
printformat(server, target,
|
||||
MSGLEVEL_ACTIONS | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT |
|
||||
(ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS),
|
||||
item != NULL ? IRCTXT_OWN_ACTION : IRCTXT_OWN_ACTION_TARGET,
|
||||
server->nick, recoded, target);
|
||||
item != NULL && oldtarget == target ? IRCTXT_OWN_ACTION : IRCTXT_OWN_ACTION_TARGET,
|
||||
server->nick, recoded, oldtarget);
|
||||
g_free(recoded);
|
||||
g_free_not_null(freemsg);
|
||||
}
|
||||
@ -150,9 +166,13 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
|
||||
const char *target)
|
||||
{
|
||||
void *item;
|
||||
const char *oldtarget;
|
||||
char *freemsg = NULL;
|
||||
int level;
|
||||
|
||||
oldtarget = target;
|
||||
target = skip_target(IRC_SERVER(server), target);
|
||||
|
||||
level = MSGLEVEL_ACTIONS |
|
||||
(ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
|
||||
|
||||
@ -169,15 +189,15 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
|
||||
|
||||
if (ischannel(*target)) {
|
||||
/* channel action */
|
||||
if (window_item_is_active(item)) {
|
||||
if (window_item_is_active(item) && target == oldtarget) {
|
||||
/* message to active channel in window */
|
||||
printformat(server, target, level,
|
||||
IRCTXT_ACTION_PUBLIC, nick, msg);
|
||||
} else {
|
||||
/* message to not existing/active channel */
|
||||
/* message to not existing/active channel, or to @/+ */
|
||||
printformat(server, target, level,
|
||||
IRCTXT_ACTION_PUBLIC_CHANNEL,
|
||||
nick, target, msg);
|
||||
nick, oldtarget, msg);
|
||||
}
|
||||
} else {
|
||||
/* private action */
|
||||
@ -195,7 +215,7 @@ static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg,
|
||||
{
|
||||
/* ugly: recode the sent message back for printing */
|
||||
char *recoded = recode_in(SERVER(server), msg, target);
|
||||
printformat(server, skip_target(target), MSGLEVEL_NOTICES |
|
||||
printformat(server, skip_target(server, target), MSGLEVEL_NOTICES |
|
||||
MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
|
||||
IRCTXT_OWN_NOTICE, target, recoded);
|
||||
g_free(recoded);
|
||||
@ -208,7 +228,7 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
|
||||
const char *oldtarget;
|
||||
|
||||
oldtarget = target;
|
||||
target = skip_target(target);
|
||||
target = skip_target(IRC_SERVER(server), target);
|
||||
|
||||
if (address == NULL || *address == '\0') {
|
||||
/* notice from server */
|
||||
@ -241,7 +261,7 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
|
||||
static void sig_message_own_ctcp(IRC_SERVER_REC *server, const char *cmd,
|
||||
const char *data, const char *target)
|
||||
{
|
||||
printformat(server, target, MSGLEVEL_CTCPS |
|
||||
printformat(server, skip_target(server, target), MSGLEVEL_CTCPS |
|
||||
MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
|
||||
IRCTXT_OWN_CTCP, target, cmd, data);
|
||||
}
|
||||
@ -250,8 +270,12 @@ static void sig_message_irc_ctcp(IRC_SERVER_REC *server, const char *cmd,
|
||||
const char *data, const char *nick,
|
||||
const char *addr, const char *target)
|
||||
{
|
||||
const char *oldtarget;
|
||||
|
||||
oldtarget = target;
|
||||
target = skip_target(server, target);
|
||||
printformat(server, ischannel(*target) ? target : nick, MSGLEVEL_CTCPS,
|
||||
IRCTXT_CTCP_REQUESTED, nick, addr, cmd, data, target);
|
||||
IRCTXT_CTCP_REQUESTED, nick, addr, cmd, data, oldtarget);
|
||||
}
|
||||
|
||||
void fe_irc_messages_init(void)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user