summaryrefslogtreecommitdiff
path: root/src/irc/core
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2001-06-04 19:50:16 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2001-06-04 19:50:16 +0000
commit3609f6f2438f0064968e39739b9f119b0c718605 (patch)
tree4601b5fdf1fa1111c502bae0046bef41bdf739ef /src/irc/core
parentf079263035a71e3f97cc7f3c5ebe96ffdba51483 (diff)
downloadirssi-3609f6f2438f0064968e39739b9f119b0c718605.zip
Added support for bahamut @+#channel notices. Removed notice_public_ops
format, notice_public is just fine if the channel just contains @ or @+ at the beginning. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1538 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/irc/core')
-rw-r--r--src/irc/core/irc-servers.c8
-rw-r--r--src/irc/core/irc.h4
2 files changed, 7 insertions, 5 deletions
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 966ddf5e..a2d281ed 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -71,7 +71,13 @@ static int isnickflag_func(char flag)
static int ischannel_func(const char *data)
{
- return ischannel_target(data);
+ if (*data == '@') {
+ /* @#channel, @+#channel */
+ data++;
+ if (*data == '+' && ischannel(data[1]))
+ return 1;
+ }
+ return ischannel(*data);
}
static void send_message(SERVER_REC *server, const char *target,
diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h
index 17a18635..46051d9e 100644
--- a/src/irc/core/irc.h
+++ b/src/irc/core/irc.h
@@ -25,10 +25,6 @@
(a) == '!' || /* secure */ \
(a) == '+') /* modeless */
-#define ischannel_target(a) \
- (ischannel((a)[0]) || \
- ((a)[0] == '@' && ischannel((a)[1]))) /* hybrid6 @#channel */
-
#define IS_IRC_ITEM(rec) (IS_IRC_CHANNEL(rec) || IS_IRC_QUERY(rec))
extern char *current_server_event; /* current server event being processed */