X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/d76ed9a966ee3d955c8ef00ecc02e643c2005e2e..4ec2950270b838a0d2e2d8127dfd68319616e594:/src/mod-helpserv.c diff --git a/src/mod-helpserv.c b/src/mod-helpserv.c index 1a8efc5..cc71c22 100644 --- a/src/mod-helpserv.c +++ b/src/mod-helpserv.c @@ -1,7 +1,7 @@ /* mod-helpserv.c - Support Helper assistant service * Copyright 2002-2003 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -218,6 +218,7 @@ static const struct message_entry msgtab[] = { { "HSMSG_REQ_PERSIST_PART", "Everything you tell me until you are helped (or you leave %s) will be recorded. If you part %s, your request will be lost." }, { "HSMSG_REQ_PERSIST_HANDLE", "Everything you tell me until you are helped will be recorded." }, { "HSMSG_REQ_MAXLEN", "Sorry, but your request has reached the maximum number of lines. Please wait to be assigned to a helper and continue explaining your request to them." }, + { "HSMSQ_REQ_TEXT_ADDED", "Message from $b%s:$b %s" }, { "HSMSG_REQ_FOUND_ANOTHER", "Request ID#%lu has been closed. $S detected that you also have request ID#%lu open. If you send $S a message, it will be associated with that request." }, /* Messages that are inserted into request text */ @@ -958,7 +959,7 @@ static struct helpserv_request * create_request(struct userNode *user, struct he else send_message_type(4, user, hs->helpserv, "%s %s %s", lbuf[0], lbuf[1], lbuf[2]); - if (hs->req_on_join && req == hs->unhandled && hs->helpchan_empty) { + if (hs->req_on_join && req == hs->unhandled && hs->helpchan_empty && !user->uplink->burst) { timeq_del(0, run_empty_interval, hs, TIMEQ_IGNORE_WHEN); run_empty_interval(hs); } @@ -1085,7 +1086,22 @@ static void helpserv_usermsg(struct userNode *user, struct helpserv_bot *hs, cha req->updated = now; if (!hs->req_maxlen || req->text->used < hs->req_maxlen) + { string_list_append(req->text, strdup(text)); + + struct userNode *likely_helper; + /* Find somebody likely to be the helper */ + if (!req->helper) + likely_helper = NULL; + else if ((likely_helper = req->helper->handle->users) && !likely_helper->next_authed) { + /* only one user it could be :> */ + } else for (likely_helper = req->helper->handle->users; likely_helper; likely_helper = likely_helper->next_authed) + if (GetUserMode(hs->helpchan, likely_helper)) + break; + + if(likely_helper) + send_target_message(1, likely_helper->nick, hs->helpserv, "HSMSQ_REQ_TEXT_ADDED", user->nick, text); + } else helpserv_msguser(user, "HSMSG_REQ_MAXLEN"); } @@ -1550,7 +1566,7 @@ static void free_request(void *data) { /* Logging */ if (shutting_down && (req->hs->persist_types[PERSIST_T_REQUEST] != PERSIST_CLOSE || !req->handle)) { - helpserv_log_request(req, "srvx shutdown"); + helpserv_log_request(req, "X3 shutdown"); } /* Clean up from the unhandled queue */ @@ -1676,7 +1692,7 @@ static HELPSERV_FUNC(cmd_close) { mod_chanmode_init(&change); change.argc = 1; change.args[0].mode = MODE_REMOVE | MODE_VOICE; - change.args[0].member = mn; + change.args[0].u.member = mn; mod_chanmode_announce(hs->helpserv, hs->helpchan, &change); } } @@ -1880,7 +1896,7 @@ static int helpserv_assign(int from_opserv, struct helpserv_bot *hs, struct user mod_chanmode_init(&change); change.argc = 1; change.args[0].mode = MODE_VOICE; - if ((change.args[0].member = GetUserMode(hs->helpchan, req->user))) + if ((change.args[0].u.member = GetUserMode(hs->helpchan, req->user))) mod_chanmode_announce(hs->helpserv, hs->helpchan, &change); } @@ -1904,8 +1920,6 @@ static HELPSERV_FUNC(cmd_show) { REQUIRE_PARMS(2); - assert(hs_user); - if (!(req = smart_get_request(hs, hs_user, argv[1], &num_requests))) { helpserv_notice(user, "HSMSG_REQ_INVALID", argv[1]); return 0; @@ -1990,8 +2004,6 @@ static HELPSERV_FUNC(cmd_addnote) { REQUIRE_PARMS(3); - assert(hs_user); - if (!(req = smart_get_request(hs, hs_user, argv[1], &num_requests))) { helpserv_notice(user, "HSMSG_REQ_INVALID", argv[1]); return 0; @@ -2250,14 +2262,14 @@ static HELPSERV_FUNC(cmd_move) { } if (!(hs->helpchan = GetChannel(newchan))) { - hs->helpchan = AddChannel(newchan, now, NULL, NULL); + hs->helpchan = AddChannel(newchan, now, NULL, NULL, NULL); AddChannelUser(hs->helpserv, hs->helpchan)->modes |= MODE_CHANOP; } else if (!helpserv_in_channel(hs, old_helpchan)) { struct mod_chanmode change; mod_chanmode_init(&change); change.argc = 1; change.args[0].mode = MODE_CHANOP; - change.args[0].member = AddChannelUser(hs->helpserv, hs->helpchan); + change.args[0].u.member = AddChannelUser(hs->helpserv, hs->helpchan); mod_chanmode_announce(hs->helpserv, hs->helpchan, &change); } @@ -2336,7 +2348,7 @@ static void helpserv_page_helper_gone(struct helpserv_bot *hs, struct helpserv_r mod_chanmode_init(&change); change.argc = 1; change.args[0].mode = MODE_REMOVE | MODE_VOICE; - change.args[0].member = mn; + change.args[0].u.member = mn; mod_chanmode_announce(hs->helpserv, hs->helpchan, &change); } if(req->handle) @@ -2603,7 +2615,7 @@ static struct helpserv_bot *register_helpserv(const char *nick, const char *help * it's a harmless default */ hs = calloc(1, sizeof(struct helpserv_bot)); - if (!(hs->helpserv = AddService(nick, helpserv_conf.description, NULL))) { + if (!(hs->helpserv = AddService(nick, "+iok", helpserv_conf.description, NULL))) { free(hs); return NULL; } @@ -2611,14 +2623,14 @@ static struct helpserv_bot *register_helpserv(const char *nick, const char *help reg_privmsg_func(hs->helpserv, helpserv_botmsg); if (!(hs->helpchan = GetChannel(help_channel))) { - hs->helpchan = AddChannel(help_channel, now, NULL, NULL); + hs->helpchan = AddChannel(help_channel, now, NULL, NULL, NULL); AddChannelUser(hs->helpserv, hs->helpchan)->modes |= MODE_CHANOP; } else { struct mod_chanmode change; mod_chanmode_init(&change); change.argc = 1; change.args[0].mode = MODE_CHANOP; - change.args[0].member = AddChannelUser(hs->helpserv, hs->helpchan); + change.args[0].u.member = AddChannelUser(hs->helpserv, hs->helpchan); mod_chanmode_announce(hs->helpserv, hs->helpchan, &change); } @@ -2858,7 +2870,7 @@ static void set_page_target(struct helpserv_bot *hs, enum page_source idx, const } new_target = GetChannel(target); if (!new_target) { - new_target = AddChannel(target, now, NULL, NULL); + new_target = AddChannel(target, now, NULL, NULL, NULL); AddChannelUser(hs->helpserv, new_target); } } else { @@ -2875,7 +2887,7 @@ static void set_page_target(struct helpserv_bot *hs, enum page_source idx, const mod_chanmode_init(&change); change.argc = 1; change.args[0].mode = MODE_CHANOP; - change.args[0].member = AddChannelUser(hs->helpserv, new_target); + change.args[0].u.member = AddChannelUser(hs->helpserv, new_target); mod_chanmode_announce(hs->helpserv, new_target, &change); } hs->page_targets[idx] = new_target; @@ -3652,7 +3664,7 @@ static void helpserv_conf_read(void) { helpserv_conf.db_backup_frequency = str ? ParseInterval(str) : 7200; str = database_get_data(conf_node, "description", RECDB_QSTRING); - helpserv_conf.description = str; + helpserv_conf.description = str ? str : "Help Queue Manager"; str = database_get_data(conf_node, "reqlogfile", RECDB_QSTRING); if (str && strlen(str)) @@ -3906,7 +3918,7 @@ static void associate_requests_bybot(struct helpserv_bot *hs, struct userNode *u mod_chanmode_init(&change); change.argc = 1; change.args[0].mode = MODE_VOICE; - if ((change.args[0].member = GetUserMode(hs->helpchan, user))) + if ((change.args[0].u.member = GetUserMode(hs->helpchan, user))) mod_chanmode_announce(hs->helpserv, hs->helpchan, &change); } }