mirror of
https://github.com/irssi/irssi.git
synced 2025-02-02 15:08:01 -05:00
Merge pull request #248 from LemonBoy/chantypes
Implement CHANTYPES support
This commit is contained in:
commit
7b46dae182
@ -18,7 +18,7 @@
|
||||
(SERVER_CONNECT(conn) ? TRUE : FALSE)
|
||||
|
||||
#define server_ischannel(server, channel) \
|
||||
(server)->ischannel(server, channel)
|
||||
((server)->ischannel(server, channel))
|
||||
|
||||
/* all strings should be either NULL or dynamically allocated */
|
||||
/* address and nick are mandatory, rest are optional */
|
||||
|
@ -44,7 +44,7 @@ static void dcc_request(CHAT_DCC_REC *dcc)
|
||||
if (!IS_DCC_CHAT(dcc)) return;
|
||||
|
||||
printformat(dcc->server, NULL, MSGLEVEL_DCC,
|
||||
ischannel(*dcc->target) ? IRCTXT_DCC_CHAT_CHANNEL :
|
||||
server_ischannel(SERVER(dcc->server), dcc->target) ? IRCTXT_DCC_CHAT_CHANNEL :
|
||||
IRCTXT_DCC_CHAT, dcc->id, dcc->addrstr,
|
||||
dcc->port, dcc->target);
|
||||
}
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include "module.h"
|
||||
#include "signals.h"
|
||||
#include "levels.h"
|
||||
#include "servers.h"
|
||||
|
||||
#include "irc.h"
|
||||
#include "dcc-file.h"
|
||||
@ -35,12 +36,12 @@ static void dcc_request(GET_DCC_REC *dcc)
|
||||
{
|
||||
char *sizestr;
|
||||
|
||||
if (!IS_DCC_GET(dcc)) return;
|
||||
if (!IS_DCC_GET(dcc)) return;
|
||||
|
||||
sizestr = dcc_get_size_str(dcc->size);
|
||||
|
||||
printformat(dcc->server, NULL, MSGLEVEL_DCC,
|
||||
ischannel(*dcc->target) ? IRCTXT_DCC_SEND_CHANNEL :
|
||||
server_ischannel(SERVER(dcc->server), dcc->target) ? IRCTXT_DCC_SEND_CHANNEL :
|
||||
IRCTXT_DCC_SEND, dcc->nick, dcc->addrstr,
|
||||
dcc->port, dcc->arg, sizestr, dcc->target);
|
||||
|
||||
|
@ -28,13 +28,11 @@
|
||||
|
||||
#include "themes.h"
|
||||
#include "fe-irc-server.h"
|
||||
#include "fe-irc-channels.h"
|
||||
|
||||
void fe_irc_modules_init(void);
|
||||
void fe_irc_modules_deinit(void);
|
||||
|
||||
void fe_irc_channels_init(void);
|
||||
void fe_irc_channels_deinit(void);
|
||||
|
||||
void fe_irc_queries_init(void);
|
||||
void fe_irc_queries_deinit(void);
|
||||
|
||||
|
@ -49,7 +49,7 @@ static void ctcp_default_msg(IRC_SERVER_REC *server, const char *data,
|
||||
data = p+1;
|
||||
}
|
||||
|
||||
printformat(server, ischannel(*target) ? target : nick, MSGLEVEL_CTCPS,
|
||||
printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
|
||||
IRCTXT_CTCP_REQUESTED_UNKNOWN,
|
||||
nick, addr, cmd, data, target);
|
||||
g_free(cmd);
|
||||
@ -113,8 +113,8 @@ static void ctcp_default_reply(IRC_SERVER_REC *server, const char *data,
|
||||
ctcpdata = ptr+1;
|
||||
}
|
||||
|
||||
printformat(server, ischannel(*target) ? target : nick, MSGLEVEL_CTCPS,
|
||||
ischannel(*target) ? IRCTXT_CTCP_REPLY_CHANNEL :
|
||||
printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
|
||||
server_ischannel(SERVER(server), target) ? IRCTXT_CTCP_REPLY_CHANNEL :
|
||||
IRCTXT_CTCP_REPLY, ctcp, nick, ctcpdata, target);
|
||||
g_free(ctcp);
|
||||
}
|
||||
@ -137,7 +137,7 @@ static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data,
|
||||
|
||||
g_get_current_time(&tv);
|
||||
usecs = get_timeval_diff(&tv, &tv2);
|
||||
printformat(server, ischannel(*target) ? target : nick, MSGLEVEL_CTCPS,
|
||||
printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
|
||||
IRCTXT_CTCP_PING_REPLY, nick, usecs/1000, usecs%1000);
|
||||
}
|
||||
|
||||
|
@ -400,7 +400,7 @@ static void event_target_unavailable(IRC_SERVER_REC *server, const char *data,
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 2, NULL, &target);
|
||||
if (!ischannel(*target)) {
|
||||
if (!server_ischannel(SERVER(server), target)) {
|
||||
/* nick unavailable */
|
||||
printformat(server, NULL, MSGLEVEL_CRAP,
|
||||
IRCTXT_NICK_UNAVAILABLE, target);
|
||||
@ -583,7 +583,7 @@ static void print_event_received(IRC_SERVER_REC *server, const char *data,
|
||||
return;
|
||||
ptr++;
|
||||
|
||||
if (ischannel(*data)) /* directed at channel */
|
||||
if (server_ischannel(SERVER(server), data)) /* directed at channel */
|
||||
target = g_strndup(data, (int)(ptr - data - 1));
|
||||
else if (!target_param || *ptr == ':' || (ptr2 = strchr(ptr, ' ')) == NULL)
|
||||
target = NULL;
|
||||
|
@ -52,15 +52,17 @@ static void event_privmsg(IRC_SERVER_REC *server, const char *data,
|
||||
params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &msg);
|
||||
if (nick == NULL) nick = server->real_address;
|
||||
if (addr == NULL) addr = "";
|
||||
if (*target == '@' && ischannel(target[1])) {
|
||||
|
||||
if (fe_channel_is_opchannel(server, target)) {
|
||||
/* Hybrid 6 feature, send msg to all ops in channel */
|
||||
recoded = recode_in(SERVER(server), msg, target+1);
|
||||
target = (char *)fe_channel_skip_prefix(server, target);
|
||||
recoded = recode_in(SERVER(server), msg, target);
|
||||
signal_emit("message irc op_public", 5,
|
||||
server, recoded, nick, addr,
|
||||
get_visible_target(server, target+1));
|
||||
get_visible_target(server, target));
|
||||
} else {
|
||||
recoded = recode_in(SERVER(server), msg, ischannel(*target) ? target : nick);
|
||||
signal_emit(ischannel(*target) ?
|
||||
recoded = recode_in(SERVER(server), msg, server_ischannel(SERVER(server), target) ? target : nick);
|
||||
signal_emit(server_ischannel(SERVER(server), target) ?
|
||||
"message public" : "message private", 5,
|
||||
server, recoded, nick, addr,
|
||||
get_visible_target(server, target));
|
||||
|
@ -31,6 +31,51 @@
|
||||
#include "fe-windows.h"
|
||||
#include "window-items.h"
|
||||
|
||||
int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target)
|
||||
{
|
||||
const char *statusmsg;
|
||||
|
||||
/* Quick check */
|
||||
if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
|
||||
return FALSE;
|
||||
|
||||
statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
|
||||
if (statusmsg == NULL)
|
||||
statusmsg = "@+";
|
||||
|
||||
return strchr(statusmsg, *target) != NULL;
|
||||
}
|
||||
|
||||
const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target)
|
||||
{
|
||||
const char *statusmsg;
|
||||
|
||||
/* Quick check */
|
||||
if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
|
||||
return target;
|
||||
|
||||
/* Exit early if target doesn't name a channel */
|
||||
if (server_ischannel(SERVER(server), target) == FALSE)
|
||||
return FALSE;
|
||||
|
||||
statusmsg = g_hash_table_lookup(server->isupport, "statusmsg");
|
||||
|
||||
/* Hack: for bahamut 1.4 which sends neither STATUSMSG nor
|
||||
* WALLCHOPS in 005, accept @#chan and @+#chan (but not +#chan) */
|
||||
if (statusmsg == NULL && *target != '@')
|
||||
return target;
|
||||
|
||||
if (statusmsg == NULL)
|
||||
statusmsg = "@+";
|
||||
|
||||
/* Strip the leading statusmsg prefixes */
|
||||
while (strchr(statusmsg, *target) != NULL) {
|
||||
target++;
|
||||
}
|
||||
|
||||
return target;
|
||||
}
|
||||
|
||||
static void sig_channel_rejoin(SERVER_REC *server, REJOIN_REC *rec)
|
||||
{
|
||||
g_return_if_fail(rec != NULL);
|
||||
@ -46,7 +91,7 @@ static void sig_event_forward(SERVER_REC *server, const char *data,
|
||||
char *params, *from, *to;
|
||||
|
||||
params = event_get_params(data, 3, NULL, &from, &to);
|
||||
if (from != NULL && to != NULL && ischannel(*from) && ischannel(*to)) {
|
||||
if (from != NULL && to != NULL && server_ischannel(server, from) && server_ischannel(server, to)) {
|
||||
channel = irc_channel_find(server, from);
|
||||
if (channel != NULL && irc_channel_find(server, to) == NULL) {
|
||||
window_bind_add(window_item_window(channel),
|
||||
|
10
src/fe-common/irc/fe-irc-channels.h
Normal file
10
src/fe-common/irc/fe-irc-channels.h
Normal file
@ -0,0 +1,10 @@
|
||||
#ifndef __FE_IRC_CHANNELS_H
|
||||
#define __FE_IRC_CHANNELS_H
|
||||
|
||||
int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target);
|
||||
const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target);
|
||||
|
||||
void fe_irc_channels_init(void);
|
||||
void fe_irc_channels_deinit(void);
|
||||
|
||||
#endif
|
@ -37,32 +37,6 @@
|
||||
#include "fe-queries.h"
|
||||
#include "window-items.h"
|
||||
|
||||
static const char *skip_target(IRC_SERVER_REC *server, const char *target)
|
||||
{
|
||||
int i = 0;
|
||||
const char *val, *chars;
|
||||
|
||||
/* Quick check */
|
||||
if (server == NULL || 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;
|
||||
}
|
||||
|
||||
static void sig_message_own_public(SERVER_REC *server, const char *msg,
|
||||
const char *target, const char *origtarget)
|
||||
{
|
||||
@ -72,7 +46,7 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
|
||||
if (!IS_IRC_SERVER(server))
|
||||
return;
|
||||
oldtarget = target;
|
||||
target = skip_target(IRC_SERVER(server), target);
|
||||
target = fe_channel_skip_prefix(IRC_SERVER(server), target);
|
||||
if (target != oldtarget) {
|
||||
/* Hybrid 6 / Bahamut feature, send msg to all
|
||||
ops / ops+voices in channel */
|
||||
@ -135,8 +109,8 @@ static void sig_message_own_action(IRC_SERVER_REC *server, const char *msg,
|
||||
char *freemsg = NULL;
|
||||
|
||||
oldtarget = target;
|
||||
target = skip_target(IRC_SERVER(server), target);
|
||||
if (ischannel(*target))
|
||||
target = fe_channel_skip_prefix(IRC_SERVER(server), target);
|
||||
if (server_ischannel(SERVER(server), target))
|
||||
item = irc_channel_find(server, target);
|
||||
else
|
||||
item = irc_query_find(server, target);
|
||||
@ -146,7 +120,7 @@ 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),
|
||||
(server_ischannel(SERVER(server), target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS),
|
||||
item != NULL && oldtarget == target ? IRCTXT_OWN_ACTION : IRCTXT_OWN_ACTION_TARGET,
|
||||
server->nick, msg, oldtarget);
|
||||
g_free_not_null(freemsg);
|
||||
@ -163,10 +137,10 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
|
||||
int own = FALSE;
|
||||
|
||||
oldtarget = target;
|
||||
target = skip_target(IRC_SERVER(server), target);
|
||||
target = fe_channel_skip_prefix(IRC_SERVER(server), target);
|
||||
|
||||
level = MSGLEVEL_ACTIONS |
|
||||
(ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
|
||||
(server_ischannel(SERVER(server), target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
|
||||
|
||||
if (ignore_check(SERVER(server), nick, address, target, msg, level))
|
||||
return;
|
||||
@ -175,7 +149,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
|
||||
level | MSGLEVEL_NO_ACT))
|
||||
level |= MSGLEVEL_NO_ACT;
|
||||
|
||||
if (ischannel(*target)) {
|
||||
if (server_ischannel(SERVER(server), target)) {
|
||||
item = irc_channel_find(server, target);
|
||||
} else {
|
||||
own = (!g_strcmp0(nick, server->nick));
|
||||
@ -185,7 +159,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
|
||||
if (settings_get_bool("emphasis"))
|
||||
msg = freemsg = expand_emphasis(item, msg);
|
||||
|
||||
if (ischannel(*target)) {
|
||||
if (server_ischannel(SERVER(server), target)) {
|
||||
/* channel action */
|
||||
if (window_item_is_active(item) && target == oldtarget) {
|
||||
/* message to active channel in window */
|
||||
@ -219,7 +193,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
|
||||
static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg,
|
||||
const char *target)
|
||||
{
|
||||
printformat(server, skip_target(server, target), MSGLEVEL_NOTICES |
|
||||
printformat(server, fe_channel_skip_prefix(server, target), MSGLEVEL_NOTICES |
|
||||
MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
|
||||
IRCTXT_OWN_NOTICE, target, msg);
|
||||
}
|
||||
@ -232,7 +206,7 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
|
||||
int level = MSGLEVEL_NOTICES;
|
||||
|
||||
oldtarget = target;
|
||||
target = skip_target(IRC_SERVER(server), target);
|
||||
target = fe_channel_skip_prefix(IRC_SERVER(server), target);
|
||||
|
||||
if (address == NULL || *address == '\0') {
|
||||
/* notice from server */
|
||||
@ -245,16 +219,16 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
|
||||
}
|
||||
|
||||
if (ignore_check(server, nick, address,
|
||||
ischannel(*target) ? target : NULL,
|
||||
server_ischannel(SERVER(server), target) ? target : NULL,
|
||||
msg, level))
|
||||
return;
|
||||
|
||||
if (ignore_check(server, nick, address,
|
||||
ischannel(*target) ? target : NULL,
|
||||
server_ischannel(SERVER(server), target) ? target : NULL,
|
||||
msg, level | MSGLEVEL_NO_ACT))
|
||||
level |= MSGLEVEL_NO_ACT;
|
||||
|
||||
if (ischannel(*target)) {
|
||||
if (server_ischannel(SERVER(server), target)) {
|
||||
/* notice in some channel */
|
||||
printformat(server, target, level,
|
||||
IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg);
|
||||
@ -270,7 +244,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, skip_target(server, target), MSGLEVEL_CTCPS |
|
||||
printformat(server, fe_channel_skip_prefix(server, target), MSGLEVEL_CTCPS |
|
||||
MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
|
||||
IRCTXT_OWN_CTCP, target, cmd, data);
|
||||
}
|
||||
@ -282,8 +256,8 @@ static void sig_message_irc_ctcp(IRC_SERVER_REC *server, const char *cmd,
|
||||
const char *oldtarget;
|
||||
|
||||
oldtarget = target;
|
||||
target = skip_target(server, target);
|
||||
printformat(server, ischannel(*target) ? target : nick, MSGLEVEL_CTCPS,
|
||||
target = fe_channel_skip_prefix(server, target);
|
||||
printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
|
||||
IRCTXT_CTCP_REQUESTED, nick, addr, cmd, data, oldtarget);
|
||||
}
|
||||
|
||||
|
@ -63,7 +63,7 @@ static void event_privmsg(SERVER_REC *server, const char *data,
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
if (nick == NULL || address == NULL || ischannel(*data) ||
|
||||
if (nick == NULL || address == NULL || server_ischannel(server, data) ||
|
||||
!settings_get_bool("query_track_nick_changes"))
|
||||
return;
|
||||
|
||||
|
@ -168,7 +168,7 @@ static void sig_message_mode(IRC_SERVER_REC *server, const char *channel,
|
||||
mode, MSGLEVEL_MODES))
|
||||
return;
|
||||
|
||||
if (!ischannel(*channel)) {
|
||||
if (!server_ischannel(SERVER(server), channel)) {
|
||||
/* user mode change */
|
||||
printformat(server, NULL, MSGLEVEL_MODES,
|
||||
IRCTXT_USERMODE_CHANGE, mode, channel);
|
||||
|
@ -400,7 +400,7 @@ static void msg_mode(IRC_SERVER_REC *server, const char *channel,
|
||||
int show;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
if (!ischannel(*channel) || addr != NULL)
|
||||
if (!server_ischannel(SERVER(server), channel) || addr != NULL)
|
||||
return;
|
||||
|
||||
params = event_get_params(data, 2 | PARAM_FLAG_GETREST,
|
||||
|
@ -186,7 +186,7 @@ static void command_set_ban(const char *data, IRC_SERVER_REC *server,
|
||||
|
||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST,
|
||||
item, &channel, &nicks)) return;
|
||||
if (!ischannel(*channel)) cmd_param_error(CMDERR_NOT_JOINED);
|
||||
if (!server_ischannel(SERVER(server), channel)) cmd_param_error(CMDERR_NOT_JOINED);
|
||||
if (*nicks == '\0') {
|
||||
if (g_strcmp0(data, "*") != 0)
|
||||
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
|
||||
|
@ -149,7 +149,7 @@ static void event_target_unavailable(IRC_SERVER_REC *server, const char *data)
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 2, NULL, &channel);
|
||||
if (ischannel(*channel)) {
|
||||
if (server_ischannel(SERVER(server), channel)) {
|
||||
chanrec = irc_channel_find(server, channel);
|
||||
if (chanrec != NULL && chanrec->joined) {
|
||||
/* dalnet event - can't change nick while
|
||||
|
@ -99,7 +99,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
|
||||
tmp = chanlist;
|
||||
for (;; tmp++) {
|
||||
if (*tmp != NULL) {
|
||||
channel = ischannel(**tmp) ? g_strdup(*tmp) :
|
||||
channel = server_ischannel(SERVER(server), *tmp) ? g_strdup(*tmp) :
|
||||
g_strdup_printf("#%s", *tmp);
|
||||
|
||||
chanrec = irc_channel_find(server, channel);
|
||||
@ -134,7 +134,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
|
||||
if (use_keys)
|
||||
cmdlen += outkeys->len;
|
||||
if (*tmpstr != NULL)
|
||||
cmdlen += ischannel(**tmpstr) ? strlen(*tmpstr) :
|
||||
cmdlen += server_ischannel(SERVER(server), *tmpstr) ? strlen(*tmpstr) :
|
||||
strlen(*tmpstr)+1;
|
||||
if (*tmpkey != NULL)
|
||||
cmdlen += strlen(*tmpkey);
|
||||
|
@ -191,7 +191,7 @@ static void cmd_kick(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
|
||||
return;
|
||||
|
||||
if (*channame == '\0' || *nicks == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
|
||||
if (!ischannel(*channame)) cmd_param_error(CMDERR_NOT_JOINED);
|
||||
if (!server_ischannel(SERVER(server), channame)) cmd_param_error(CMDERR_NOT_JOINED);
|
||||
|
||||
recoded = recode_out(SERVER(server), reason, channame);
|
||||
g_string_printf(tmpstr, "KICK %s %s :%s", channame, nicks, recoded);
|
||||
|
@ -394,7 +394,7 @@ static void event_target_unavailable(IRC_SERVER_REC *server, const char *data)
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 2, NULL, &channel);
|
||||
if (!ischannel(*channel)) {
|
||||
if (!server_ischannel(SERVER(server), channel)) {
|
||||
/* nick is unavailable. */
|
||||
event_nick_in_use(server, data);
|
||||
}
|
||||
|
@ -60,8 +60,8 @@ static void check_query_changes(IRC_SERVER_REC *server, const char *nick,
|
||||
{
|
||||
QUERY_REC *query;
|
||||
|
||||
if (ischannel(*target))
|
||||
return;
|
||||
if (server_ischannel(SERVER(server), target))
|
||||
return;
|
||||
|
||||
query = irc_query_find(server, nick);
|
||||
if (query == NULL)
|
||||
|
@ -72,13 +72,20 @@ static int isnickflag_func(SERVER_REC *server, char flag)
|
||||
|
||||
static int ischannel_func(SERVER_REC *server, const char *data)
|
||||
{
|
||||
if (*data == '@') {
|
||||
/* @#channel, @+#channel */
|
||||
IRC_SERVER_REC *irc_server = (IRC_SERVER_REC *) server;
|
||||
char *chantypes, *statusmsg;
|
||||
|
||||
chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes");
|
||||
if (chantypes == NULL)
|
||||
chantypes = "#&!+"; /* normal, local, secure, modeless */
|
||||
statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
|
||||
if (statusmsg == NULL)
|
||||
statusmsg = "@+";
|
||||
|
||||
while (strchr(statusmsg, *data) != NULL)
|
||||
data++;
|
||||
if (*data == '+' && ischannel(data[1]))
|
||||
return 1;
|
||||
}
|
||||
return ischannel(*data);
|
||||
|
||||
return strchr(chantypes, *data) != NULL;
|
||||
}
|
||||
|
||||
static char **split_line(const SERVER_REC *server, const char *line,
|
||||
|
@ -22,12 +22,6 @@ typedef struct _REDIRECT_REC REDIRECT_REC;
|
||||
#define isnickflag(server, a) \
|
||||
(server->prefix[(int)(unsigned char) a] != '\0')
|
||||
|
||||
#define ischannel(a) \
|
||||
((a) == '#' || /* normal */ \
|
||||
(a) == '&' || /* local */ \
|
||||
(a) == '!' || /* secure */ \
|
||||
(a) == '+') /* modeless */
|
||||
|
||||
#define IS_IRC_ITEM(rec) (IS_IRC_CHANNEL(rec) || IS_IRC_QUERY(rec))
|
||||
#define IRC_PROTOCOL (chat_protocol_lookup("IRC"))
|
||||
|
||||
|
@ -488,7 +488,7 @@ static void event_mode(IRC_SERVER_REC *server, const char *data,
|
||||
params = event_get_params(data, 2 | PARAM_FLAG_GETREST,
|
||||
&channel, &mode);
|
||||
|
||||
if (!ischannel(*channel)) {
|
||||
if (!server_ischannel(SERVER(server), channel)) {
|
||||
/* user mode change */
|
||||
parse_user_mode(server, mode);
|
||||
} else {
|
||||
@ -536,7 +536,7 @@ static void sig_req_usermode_change(IRC_SERVER_REC *server, const char *data,
|
||||
|
||||
params = event_get_params(data, 2 | PARAM_FLAG_GETREST,
|
||||
&target, &mode);
|
||||
if (!ischannel(*target)) {
|
||||
if (!server_ischannel(SERVER(server), target)) {
|
||||
/* we requested a user mode change, save this */
|
||||
mode = modes_join(NULL, server->wanted_usermode, mode, FALSE);
|
||||
g_free_not_null(server->wanted_usermode);
|
||||
@ -856,7 +856,7 @@ static void cmd_mode(const char *data, IRC_SERVER_REC *server,
|
||||
target = chanrec->name;
|
||||
|
||||
irc_send_cmdv(server, "MODE %s", target);
|
||||
} else if (ischannel(*target))
|
||||
} else if (server_ischannel(SERVER(server), target))
|
||||
channel_set_mode(server, target, mode);
|
||||
else {
|
||||
if (g_ascii_strcasecmp(target, server->nick) == 0) {
|
||||
|
@ -51,7 +51,7 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
|
||||
|
||||
/* Unless specifically said in dcc_autoget_masks, don't do autogets
|
||||
sent to channels. */
|
||||
if (*masks == '\0' && dcc->target != NULL && ischannel(*dcc->target))
|
||||
if (*masks == '\0' && dcc->target != NULL && server_ischannel(SERVER(dcc->server), dcc->target))
|
||||
return;
|
||||
|
||||
/* don't autoget files beginning with a dot, if download dir is
|
||||
|
@ -250,7 +250,7 @@ static void flood_privmsg(IRC_SERVER_REC *server, const char *data,
|
||||
|
||||
params = event_get_params(data, 2, &target, &text);
|
||||
|
||||
level = ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS;
|
||||
level = server_ischannel(SERVER(server), target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS;
|
||||
if (addr != NULL && !ignore_check(SERVER(server), nick, addr, target, text, level))
|
||||
flood_newmsg(server, level, nick, addr, target);
|
||||
|
||||
@ -287,7 +287,7 @@ static void flood_ctcp(IRC_SERVER_REC *server, const char *data,
|
||||
return;
|
||||
|
||||
level = g_ascii_strncasecmp(data, "ACTION ", 7) != 0 ? MSGLEVEL_CTCPS :
|
||||
(ischannel(*target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
|
||||
(server_ischannel(SERVER(server), target) ? MSGLEVEL_PUBLIC : MSGLEVEL_MSGS);
|
||||
if (!ignore_check(SERVER(server), nick, addr, target, data, level))
|
||||
flood_newmsg(server, level, nick, addr, target);
|
||||
}
|
||||
|
@ -262,7 +262,7 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
|
||||
|
||||
ignore_next = TRUE;
|
||||
if (*msg != '\001' || msg[strlen(msg)-1] != '\001') {
|
||||
signal_emit(ischannel(*target) ?
|
||||
signal_emit(server_ischannel(SERVER(client->server), target) ?
|
||||
"message own_public" : "message own_private", 4,
|
||||
client->server, msg, target, target);
|
||||
} else if (strncmp(msg+1, "ACTION ", 7) == 0) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user