X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/18757dc0abae6c3e92027135b110b3cc8c0a6d80..37e08c82c2958b3b96ada2bf76a9578f1dbbb2b3:/src/helpfile.c
diff --git a/src/helpfile.c b/src/helpfile.c
index 37a51e1..caee976 100644
--- a/src/helpfile.c
+++ b/src/helpfile.c
@@ -5,7 +5,7 @@
*
* 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,
@@ -48,7 +48,7 @@ struct userNode *message_source;
struct language *lang_C;
struct dict *languages;
-static void language_cleanup(void)
+static void language_cleanup(UNUSED_ARG(void *extra))
{
dict_delete(languages);
}
@@ -206,7 +206,7 @@ static struct language *language_read(const char *name)
/* Read all the translations from the directory. */
while ((dirent = readdir(dir))) {
snprintf(filename, sizeof(filename), "languages/%s/%s", name, dirent->d_name);
- if (!strcmp(dirent->d_name,"parent")) {
+ if (!strcmp(dirent->d_name, "parent")) {
continue;
} else if (!strcmp(dirent->d_name, "strings.db")) {
dict = parse_database(filename);
@@ -236,6 +236,9 @@ static void language_read_list(void)
if (dirent->d_name[0] == '.')
continue;
snprintf(namebuf, sizeof(namebuf), "languages/%s", dirent->d_name);
+ if (!strcmp(dirent->d_name, "strings.db")) {
+ continue;
+ }
if (stat(namebuf, &sbuf) < 0) {
log_module(MAIN_LOG, LOG_INFO, "Skipping language entry '%s' (unable to stat).", dirent->d_name);
continue;
@@ -244,7 +247,8 @@ static void language_read_list(void)
log_module(MAIN_LOG, LOG_INFO, "Skipping language entry '%s' (not directory).", dirent->d_name);
continue;
}
- language_alloc(dirent->d_name);
+ if (!dict_find(languages, dirent->d_name, NULL))
+ language_alloc(dirent->d_name);
}
closedir(dir);
}
@@ -308,10 +312,18 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu
if (irc_send)
{} /* use that function */
- else if (hi)
+ else if(IsChannelName(to)) {
+ irc_send = irc_privmsg;
+ }
+ else if (message_dest->no_notice) {
+ irc_send = irc_privmsg;
+ }
+ else if (hi) {
irc_send = HANDLE_FLAGGED(hi, USE_PRIVMSG) ? irc_privmsg : irc_notice;
- else
- irc_send = IsChannelName(to) ? irc_privmsg : irc_notice;
+ }
+ else {
+ irc_send = irc_notice;
+ }
/* Limit size to how much we can show at once */
if (size > sizeof(line))
@@ -381,9 +393,13 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu
/* Send the table. */
for (jj=0, pos=0, reps=0; ii
no_notice)
+ irc_send = irc_privmsg;
+ else
+ irc_send = irc_notice;
break;
case 2:
irc_send = irc_wallchops;
@@ -491,10 +513,10 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle
* that requires a very big intermediate buffer.
*/
expand_ipos = newline_ipos = ipos = 0;
- expand_pos = pos = 0;
+ pos = 0;
chars_sent = 0;
while (input.list[ipos]) {
- char ch, *value, *free_value;
+ char ch, *value = NULL, *free_value;
while ((ch = input.list[ipos]) && (ch != '$') && (ch != '\n') && (pos < size)) {
line[pos++] = ch;
@@ -548,6 +570,9 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle
case 'b':
value = use_color ? "\002" : "";
break;
+ case 'k':
+ value = use_color ? "\003" : "";
+ break;
case 'o':
value = use_color ? "\017" : "";
break;
@@ -579,9 +604,23 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle
case 's':
value = self->name;
break;
+#ifdef HAVE_HELPSERV
+ case 'i':
+ value = strdup(get_helpserv_id(dest, src));
+ break;
+#endif
case 'H':
value = handle ? handle->handle : "Account";
break;
+ case '!': /* Command Char for chanserv */
+ if(!trigger)
+ trigger = calloc(sizeof(*trigger), 2);
+ if(chanserv && (service = service_find(chanserv->nick)))
+ trigger[0] = service->trigger;
+ else
+ trigger[0] = '!';
+ value = trigger;
+ break;
#define SEND_LINE(TRUNCED) do { \
line[pos] = 0; \
if (pos > 0) { \
@@ -636,7 +675,7 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle
break;
default:
value = "";
- log_module(MAIN_LOG, LOG_ERROR, "Invalid exp.type %d from expansion function %p.", exp.type, expand_f);
+ log_module(MAIN_LOG, LOG_ERROR, "Invalid exp.type %d from expansion function %p.", exp.type, (void*)expand_f);
break;
}
ipos = name_end - input.list;
@@ -691,12 +730,10 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle
free(free_value);
pos += length;
if ((pos < size-1) && input.list[ipos]) {
- expand_pos = pos;
expand_ipos = ipos;
continue;
}
send_line:
- expand_pos = pos;
expand_ipos = ipos;
SEND_LINE(0);
#undef SEND_LINE
@@ -710,7 +747,7 @@ send_message(struct userNode *dest, struct userNode *src, const char *format, ..
int res;
va_list ap;
- if (IsLocal(dest)) return 0;
+ if (IsLocal(dest) && !IsDummy(dest)) return 0;
va_start(ap, format);
res = vsend_message(dest->nick, src, dest->handle_info, 0, NULL, format, ap);
va_end(ap);
@@ -722,7 +759,7 @@ send_message_type(int msg_type, struct userNode *dest, struct userNode *src, con
int res;
va_list ap;
- if (IsLocal(dest)) return 0;
+ if (IsLocal(dest) && !IsDummy(dest)) return 0;
va_start(ap, format);
res = vsend_message(dest->nick, src, dest->handle_info, msg_type, NULL, format, ap);
va_end(ap);
@@ -1131,10 +1168,27 @@ void helpfile_init(void)
language_read_list();
}
-void helpfile_finalize(void)
+static void helpfile_read_languages(void)
{
dict_iterator_t it;
+ dict_t dict;
+
+ language_read_list();
for (it = dict_first(languages); it; it = iter_next(it))
language_read(iter_key(it));
- reg_exit_func(language_cleanup);
+
+ /* If the user has a strings.db in their languages directory,
+ * allow that to override C language strings.
+ */
+ dict = parse_database("languages/strings.db");
+ if (dict) {
+ language_set_messages(lang_C, dict);
+ free_database(dict);
+ }
+}
+
+void helpfile_finalize(void)
+{
+ conf_register_reload(helpfile_read_languages);
+ reg_exit_func(language_cleanup, NULL);
}