*
* x3 is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* notices. Make sure you grep for them if you ever add args
* to the notice.
*/
- { "DEFCON_NETWORK_CHANGED", "Network DefCon level has changed to level %d" }, /* opserv.c */
- { "DEFCON_OPER_LEVEL_CHANGE", "%s is changing the DefCon level to %d" }, /* opserv.c */
- { "DEFCON_TIMEOUT_LEVEL_CHANGE", "The DefCon has changed back to level %d (timeout)" }, /* opserv.c */
+ /* chanserv.c */
+ { "CSMSG_REGISTERED_TO", "%s registered to %s by %s." },
+ { "CSMSG_CHANNEL_MOVED", "%s moved to %s by %s." },
+ { "CSMSG_SUSPENSION_MODIFIED", "%s suspension modified by %s." },
+ { "CSMSG_SUSPENDED_BY", "%s suspended by %s." },
+ { "CSMSG_UNSUSPENDED_BY", "%s unsuspended by %s." },
+ { "CSMSG_OWNERSHIP_TRANSFERRED", "%s ownership transferred to %s by %s." },
+
+ /* mod-helpserv.c */
+ { "HSMSG_BOT_RENAMED", "HelpServ bot %s (in %s) renamed to %s by %s." },
+ { "HSMSG_BOT_MOVED", "HelpServ %s (%s) moved to %s by %s." },
+ { "HSMSG_BOT_REGISTERED", "HelpServ %s (%s) registered to %s by %s." },
+ { "HSMSG_BOT_EXPIRED", "HelpServ %s (%s) expired at request of %s." },
+ { "HSMSG_BOT_UNREGISTERED", "HelpServ %s (%s) unregistered by %s." },
+ { "HSMSG_SUSPENDED_BY", "%s suspended by %s. (HelpServ)" },
+ { "HSMSG_UNSUSPENDED_BY", "%s unsuspended by %s. (HelpServ)" },
+
+ /* nickserv.c */
+ { "NSMSG_ACCOUNT_RENAMED", "%s renamed account %s to %s." },
+ { "NSMSG_ACCOUNT_MERGED", "%s (%s) merged account %s into %s." },
+
+ /* opserv.c */
+ { "DEFCON_NETWORK_CHANGED", "Network DefCon level has changed to level %d" },
+ { "DEFCON_OPER_LEVEL_CHANGE", "%s is changing the DefCon level to %d" },
+ { "DEFCON_TIMEOUT_LEVEL_CHANGE", "The DefCon has changed back to level %d (timeout)" },
+ { "OSMSG_CHANNEL_ACTIVITY_WARN", "Channel activity warning for channel %s: %s" },
+
+ /* spamserv.c */
+ { "SSMSG_CHANNEL_MERGED", "$X (channel %s) merged into %s by %s." },
+ { "SSMSG_CHANNEL_MOVED", "$X (channel %s) moved into %s by %s." },
+ { "SSMSG_UNREG_MANUAL", "$X (channel %s) %s by %s." },
+ { "SSMSG_REG_EXPIRED", "$X (channel %s) registration expired." },
+ { "SSMSG_LOST_ALL_USERS", "$X (channel %s) lost all users." },
+ { "SSMSG_REGISTERED_BY", "$X (channel %s) registered by %s." },
+ { "SSMSG_UNREGISTERED_BY", "$X (channel %s) unregistered by %s." },
{ NULL, NULL }
};
unsigned int announcements_default : 1;
} global_conf;
-#define global_notice(target, format...) send_message(target , global , ## format)
+#if defined(GCC_VARMACROS)
+# define global_notice(target, ARGS...) send_message(target, global, ARGS)
+#elif defined(C99_VARMACROS)
+# define global_notice(target, ...) send_message(target, global, __VA_ARGS__)
+#endif
void message_expire(void *data);
if(!irccasecmp(argv[i], "all")) {
flags |= MESSAGE_RECIPIENT_ALL;
+ } else if(!irccasecmp(argv[i], "authed")) {
+ flags |= MESSAGE_RECIPIENT_AUTHED;
} else if(!irccasecmp(argv[i], "users")) {
flags |= MESSAGE_RECIPIENT_LUSERS;
} else if(!irccasecmp(argv[i], "helpers")) {
flags |= MESSAGE_RECIPIENT_STAFF;
} else if(!irccasecmp(argv[i], "channels")) {
flags |= MESSAGE_RECIPIENT_CHANNELS;
+ } else if(!irccasecmp(argv[i], "rchannels")) {
+ flags |= MESSAGE_RECIPIENT_RCHANNELS;
} else if(!irccasecmp(argv[i], "announcement") || !irccasecmp(argv[i], "announce")) {
flags |= MESSAGE_RECIPIENT_ANNOUNCE;
} else {
{
return "users";
}
+ else if(message->flags & MESSAGE_RECIPIENT_AUTHED)
+ {
+ return "authed";
+ }
+ else if(message->flags & MESSAGE_RECIPIENT_RCHANNELS)
+ {
+ return "rchannels";
+ }
else
{
return "channels";
if(message->flags & MESSAGE_RECIPIENT_CHANNELS)
{
- dict_foreach(channels, notice_channel, message);
+ dict_iterator_t it;
+
+ for (it = dict_first(channels); it; it = iter_next(it)) {
+ struct chanNode *chan = iter_data(it);
+
+ notice_target(chan->name, message);
+ }
+ }
+
+ if(message->flags & MESSAGE_RECIPIENT_RCHANNELS)
+ {
+ dict_iterator_t it;
+
+ for (it = dict_first(channels); it; it = iter_next(it)) {
+ struct chanNode *chan = iter_data(it);
+
+ if (chan->channel_info)
+ notice_target(chan->name, message);
+ }
}
if(message->flags & MESSAGE_RECIPIENT_LUSERS)
notice_target(user->nick, message);
}
}
+
+ if(message->flags & MESSAGE_RECIPIENT_AUTHED)
+ {
+ dict_iterator_t it;
+ for (it = dict_first(clients); it; it = iter_next(it)) {
+ struct userNode *luser = iter_data(it);
+ if (luser->handle_info)
+ notice_target(luser->nick, message);
+ }
+ }
}
void
global_message_args(long targets, const char *language_entry, ...)
{
- struct globalMessage *message;
+ struct globalMessage *message = NULL;
va_list arg_list;
dict_iterator_t it;
char response[MAXLEN];
vsnprintf(response, MAXLEN-2, language_entry, arg_list);
response[MAXLEN-1] = 0;
+ if (message)
+ message_del(message);
+
message = message_add(targets | MESSAGE_OPTION_SOURCELESS, now, 0, "", response);
if (!message)
continue;
if(luser->uplink != self)
notice_target(luser->nick, message);
- if ((message->flags & MESSAGE_RECIPIENT_LUSERS) || (message->flags & MESSAGE_RECIPIENT_HELPERS))
+ if ((message->flags & MESSAGE_RECIPIENT_LUSERS) || (message->flags & MESSAGE_RECIPIENT_HELPERS) ||
+ (message->flags & MESSAGE_RECIPIENT_AUTHED))
continue;
}
if (message->flags & MESSAGE_RECIPIENT_HELPERS && IsHelper(luser)) {
notice_target(luser->nick, message);
- if (message->flags & MESSAGE_RECIPIENT_LUSERS)
+ if ((message->flags & MESSAGE_RECIPIENT_LUSERS) || (message->flags & MESSAGE_RECIPIENT_AUTHED))
continue;
}
+ /* authed */
+ if ((message->flags & MESSAGE_RECIPIENT_AUTHED) && luser->handle_info) {
+ notice_target(luser->nick, message);
+
+ if (message->flags & MESSAGE_RECIPIENT_LUSERS)
+ continue;
+ }
+
/* users */
- if (message->flags & MESSAGE_RECIPIENT_LUSERS)
+ if (message->flags & MESSAGE_RECIPIENT_LUSERS) {
notice_target(luser->nick, message);
+
+ }
}
message_del(message);
target = MESSAGE_RECIPIENT_ALL;
} else if(!irccasecmp(argv[1], "users")) {
target = MESSAGE_RECIPIENT_LUSERS;
+ } else if(!irccasecmp(argv[1], "authed")) {
+ target = MESSAGE_RECIPIENT_AUTHED;
} else if(!irccasecmp(argv[1], "helpers")) {
target = MESSAGE_RECIPIENT_HELPERS;
} else if(!irccasecmp(argv[1], "opers")) {
target |= MESSAGE_RECIPIENT_ANNOUNCE;
} else if(!irccasecmp(argv[1], "channels")) {
target = MESSAGE_RECIPIENT_CHANNELS;
+ } else if(!irccasecmp(argv[1], "rchannels")) {
+ target = MESSAGE_RECIPIENT_RCHANNELS;
} else {
global_notice(user, "GMSG_INVALID_TARGET", argv[1]);
return 0;
static GLOBAL_FUNC(cmd_messages)
{
- long mask = MESSAGE_RECIPIENT_LUSERS | MESSAGE_RECIPIENT_CHANNELS;
+ long mask = MESSAGE_RECIPIENT_AUTHED | MESSAGE_RECIPIENT_LUSERS | MESSAGE_RECIPIENT_CHANNELS | MESSAGE_RECIPIENT_RCHANNELS;
unsigned int count;
if(IsOper(user))
if(nick)
{
const char *modes = conf_get_data("services/global/modes", RECDB_QSTRING);
- global = AddService(nick, modes ? modes : NULL, "Global Services", NULL);
+ global = AddLocalUser(nick, nick, NULL, "Global Services", modes);
global_service = service_register(global);
}
projects / irc / evilnet / x3.git / blobdiff