diff options
| author | dequis <dx@dxzone.com.ar> | 2015-09-22 00:01:04 -0300 |
|---|---|---|
| committer | dequis <dx@dxzone.com.ar> | 2015-09-22 00:01:04 -0300 |
| commit | bf36f71b99b18401dbc6105509b0285146b37286 (patch) | |
| tree | 335559b3d2d1419466361b915f00842876b94f0a /src/fe-common/irc/fe-events.c | |
| parent | 85223a9b6b0c8a68abba367756763e3fd641be89 (diff) | |
| download | irssi-bf36f71b99b18401dbc6105509b0285146b37286.zip | |
Fix #291, "/msg +#channel incorrectly shows up as Nick:@#channel"
Just passing the full target to the "message irc op_public" signal
handler and letting it do the cleanup.
The fe_channel_skip_prefix() call in event_privmsg() is kept because
recode_in() needs a real channel name, but
There was similar code in sig_message_own_wall(), but that one is
correct - the /wall command always sends NOTICE @#chan, so I added a
comment down there to make it clear.
Diffstat (limited to 'src/fe-common/irc/fe-events.c')
| -rw-r--r-- | src/fe-common/irc/fe-events.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c index 3a01b9eb..850174c5 100644 --- a/src/fe-common/irc/fe-events.c +++ b/src/fe-common/irc/fe-events.c @@ -56,11 +56,13 @@ static void event_privmsg(IRC_SERVER_REC *server, const char *data, if (fe_channel_is_opchannel(server, target)) { /* Hybrid 6 feature, send msg to all ops in channel */ - target = (char *)fe_channel_skip_prefix(server, target); - recoded = recode_in(SERVER(server), msg, target); + const char *cleantarget = fe_channel_skip_prefix(server, target); + recoded = recode_in(SERVER(server), msg, cleantarget); + + /* pass the original target to the signal, with the @+ here + * the other one is only needed for recode_in*/ signal_emit("message irc op_public", 5, - server, recoded, nick, addr, - get_visible_target(server, target)); + server, recoded, nick, addr, target); } else { recoded = recode_in(SERVER(server), msg, server_ischannel(SERVER(server), target) ? target : nick); signal_emit(server_ischannel(SERVER(server), target) ? |