X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/1b4a47cad203f5a56600d0dd597fb151db0f9bcb..6ae87c778f13932abfb77376082d33cb1d59aa4d:/src/mod-memoserv.c diff --git a/src/mod-memoserv.c b/src/mod-memoserv.c index 2fde9f5..2e78e0c 100644 --- a/src/mod-memoserv.c +++ b/src/mod-memoserv.c @@ -6,7 +6,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, @@ -35,14 +35,16 @@ * Restart srvx with the updated conf file (as above, butwith "bot" * "MemoServ"), and bind the commands to it: * /msg opserv bind memoserv * *memoserv.* - * /msg opserv bind memoserv set *modcmd.joiner + * /msg opserv bind memoserv set *memoserv.set */ #include "chanserv.h" #include "conf.h" #include "modcmd.h" #include "nickserv.h" +#include "opserv.h" #include "saxdb.h" +#include "mail.h" #include "timeq.h" #define KEY_MAIN_ACCOUNTS "accounts" @@ -62,10 +64,12 @@ static const struct message_entry msgtab[] = { { "MSMSG_CANNOT_SEND", "You cannot send to account $b%s$b." }, + { "MSMSG_UNKNOWN_SEND_FLAG", "Unreccognised send flag '%c', message not sent." }, { "MSMSG_MEMO_SENT", "Message sent to $b%s$b (ID# %d)." }, { "MSMSG_NO_MESSAGES", "You have no messages." }, - { "MSMSG_MEMOS_FOUND", "Found $b%d$b matches.\nUse /msg $S READ to read a message." }, - { "MSMSG_CLEAN_INBOX", "You have $b%d$b or more messages, please clean out your inbox.\nUse /msg $S READ to read a message." }, + { "MSMSG_MEMOS_FOUND", "Found $b%d$b matches." }, + { "MSMSG_HOWTO_READ", "Use READ to read a message." }, + { "MSMSG_CLEAN_INBOX", "You have $b%d$b or more messages, please clean out your inbox.\nUse READ to read a message." }, { "MSMSG_LIST_HEAD", "$bID$b $bFrom$b $bTime Sent$b" }, { "MSMSG_LIST_FORMAT", "%-2u %s $b%s$b %s" }, { "MSMSG_HISTORY_HEADER", "$bID$b $bTo$b $bTime Sent$b" }, @@ -82,11 +86,11 @@ static const struct message_entry msgtab[] = { { "MSMSG_EXPIRY_OFF", "I am currently not expiring messages. (turned off)" }, { "MSMSG_EXPIRY", "Messages will be expired when they are %s old (%d seconds)." }, { "MSMSG_MESSAGES_EXPIRED", "$b%lu$b message(s) expired." }, - { "MSMSG_MEMOS_INBOX", "You have $b%d$b new message(s) in your inbox and %d old messages. Use /msg $S LIST to list them." }, - { "MSMSG_NEW_MESSAGE", "You have a new message from $b%s$b. /msg $S LIST" }, + { "MSMSG_MEMOS_INBOX", "You have $b%d$b new message(s) in your inbox and %d old messages. Use LIST to list them." }, + { "MSMSG_NEW_MESSAGE", "You have a new message from $b%s$b. Use LIST to see your messages." }, { "MSMSG_FULL_INBOX", "$b%s$b cannot recieve anymore memos as their inbox is full" }, { "MSMSG_DELETED_ALL", "Deleted all of your messages." }, - { "MSMSG_USE_CONFIRM", "Please use /msg $S DELETE * $bCONFIRM$b to delete $uall$u of your messages." }, + { "MSMSG_USE_CONFIRM", "Please use DELETE * $bCONFIRM$b to delete $uall$u of your messages." }, { "MSMSG_STATUS_HIST_TOTAL", "I have $b%u$b history entries in my database." }, { "MSMSG_STATUS_TOTAL", "I have $b%u$b memos in my database." }, @@ -95,18 +99,24 @@ static const struct message_entry msgtab[] = { { "MSMSG_INVALID_OPTION", "$b%s$b is not a valid option." }, { "MSMSG_INVALID_BINARY", "$b%s$b is an invalid binary value." }, - { "MSMSG_SET_NOTIFY", "$bNotify: $b %s" }, - { "MSMSG_SET_AUTHNOTIFY", "$bAuthNotify: $b %s" }, - { "MSMSG_SET_PRIVATE", "$bPrivate: $b %s" }, - { "MSMSG_SET_IGNORERECIEPTS", "$bIgnoreReciepts:$b %s" }, - { "MSMSG_SET_SENDRECIEPTS", "$bSendReciepts: $b %s" }, - { "MSMSG_SET_LIMIT", "$bLimit: $b %d" }, + { "MSMSG_SET_AUTHNOTIFY", "$bAuthNotify$b: %s" }, + { "MSMSG_SET_NEWNOTIFY", "$bNewNotify$b: %s" }, + { "MSMSG_SET_PRIVMSG", "$bPrivmsg$b: %s" }, + { "MSMSG_SET_PRIVATE", "$bPrivate$b: %s" }, + { "MSMSG_SET_IGNORERECIEPTS", "$bIgnoreReciepts$b: %s" }, + { "MSMSG_SET_SENDRECIEPTS", "$bSendReciepts$b: %s" }, + { "MSMSG_SET_LIMIT", "$bLimit$b: %d" }, { "MSMSG_SET_OPTIONS", "$bMessaging Options$b" }, { "MSMSG_SET_OPTIONS_END", "-------------End of Options-------------" }, { "MSMSG_LIST_END", "--------------End of Memos--------------" }, { "MSMSG_BAR", "----------------------------------------"}, + { "MSEMAIL_NEWMEMO_SUBJECT", "New %s %s message from %s" }, + { "MSEMAIL_NEWMEMO_BODY", "This email has been sent to let you know that %s has sent you a message via %s.\n\n The message is: %s.\n\nTo delete this message just type in /msg %s delete %d when on %s next." }, + + { "MSMSG_DEFCON_NO_NEW_MEMOS", "You cannot send new memos at this time, please try again soon." }, + { NULL, NULL } }; @@ -127,10 +137,19 @@ struct history { unsigned long id; }; +struct userNode *memoserv; + +#define MEMOSERV_FUNC(NAME) MODCMD_FUNC(NAME) +#define MEMOSERV_SYNTAX() svccmd_send_help_brief(user, memoserv, cmd) +#define MEMOSERV_MIN_PARAMS(N) if(argc < (N)) { \ + reply("MSG_MISSING_PARAMS", argv[0]); \ + MEMOSERV_SYNTAX(); \ + return 0; } + DECLARE_LIST(memoList, struct memo*); -DEFINE_LIST(memoList, struct memo*); +DEFINE_LIST(memoList, struct memo*) DECLARE_LIST(historyList, struct history*); -DEFINE_LIST(historyList, struct history*); +DEFINE_LIST(historyList, struct history*) /* memo_account.flags fields */ #define MEMO_NOTIFY_NEW 0x00000001 @@ -138,10 +157,11 @@ DEFINE_LIST(historyList, struct history*); #define MEMO_DENY_NONCHANNEL 0x00000004 #define MEMO_IGNORE_RECIEPTS 0x00000008 #define MEMO_ALWAYS_RECIEPTS 0x00000010 +#define MEMO_USE_PRIVMSG 0x00000020 struct memo_account { struct handle_info *handle; - unsigned int flags; + unsigned int flags : 6; unsigned int limit; struct memoList sent; struct memoList recvd; @@ -156,7 +176,7 @@ static struct { } memoserv_conf; #define MEMOSERV_FUNC(NAME) MODCMD_FUNC(NAME) -#define OPTION_FUNC(NAME) int NAME(struct userNode *user, struct handle_info *hi, UNUSED_ARG(unsigned int override), unsigned int argc, char *argv[]) +#define OPTION_FUNC(NAME) int NAME(struct svccmd *cmd, struct userNode *user, struct handle_info *hi, UNUSED_ARG(unsigned int override), unsigned int argc, char *argv[]) typedef OPTION_FUNC(option_func_t); unsigned long memo_id; @@ -165,7 +185,9 @@ extern struct string_list *autojoin_channels; const char *memoserv_module_deps[] = { NULL }; static struct module *memoserv_module; static struct log_type *MS_LOG; -static unsigned long memosSent, memosExpired; +static unsigned long memoCount; +static unsigned long memosSent; +static unsigned long memosExpired; static struct dict *memos; /* memo_account->handle->handle -> memo_account */ static struct dict *historys; static dict_t memoserv_opt_dict; /* contains option_func_t* */ @@ -183,7 +205,7 @@ memoserv_get_account(struct handle_info *hi) if (!ma) return ma; ma->handle = hi; - ma->flags = MEMO_NOTIFY_NEW | MEMO_NOTIFY_LOGIN; + ma->flags = MEMO_NOTIFY_NEW | MEMO_NOTIFY_LOGIN | MEMO_USE_PRIVMSG; ma->limit = memoserv_conf.limit; dict_insert(memos, ma->handle->handle, ma); dict_insert(historys, ma->handle->handle, ma); @@ -197,6 +219,7 @@ delete_memo(struct memo *memo) memoList_remove(&memo->sender->sent, memo); free(memo->message); free(memo); + memoCount--; } static void @@ -233,10 +256,10 @@ do_expire(void) { dict_iterator_t it; for (it = dict_first(memos); it; it = iter_next(it)) { - struct memo_account *acct = iter_data(it); + struct memo_account *account = iter_data(it); unsigned int ii; - for (ii = 0; ii < acct->sent.used; ++ii) { - struct memo *memo = acct->sent.list[ii]; + for (ii = 0; ii < account->sent.used; ++ii) { + struct memo *memo = account->sent.list[ii]; if ((now - memo->sent) > memoserv_conf.message_expiry) { delete_memo(memo); memosExpired++; @@ -246,10 +269,10 @@ do_expire(void) } for (it = dict_first(historys); it; it = iter_next(it)) { - struct memo_account *acct = iter_data(it); + struct memo_account *account = iter_data(it); unsigned int ii; - for (ii = 0; ii < acct->hsent.used; ++ii) { - struct history *history = acct->hsent.list[ii]; + for (ii = 0; ii < account->hsent.used; ++ii) { + struct history *history = account->hsent.list[ii]; if ((now - history->sent) > memoserv_conf.message_expiry) { delete_history(history); memosExpired++; @@ -310,6 +333,7 @@ add_memo(time_t sent, struct memo_account *recipient, struct memo_account *sende memo->sent = sent; memo->message = strdup(message); memosSent++; + memoCount++; if (nfrom_read) history = add_history(sent, recipient, sender, memo->id); @@ -340,7 +364,7 @@ memoserv_can_send(struct userNode *bot, struct userNode *user, struct memo_accou if (acct->handle->ignores->used) { for (i=0; i < acct->handle->ignores->used; i++) { - if (user_matches_glob(user, acct->handle->ignores->list[i], MATCH_USENICK)) { + if (user_matches_glob(user, acct->handle->ignores->list[i], MATCH_USENICK, 0)) { match = 1; break; } @@ -384,11 +408,20 @@ static struct memo *find_memo(struct userNode *user, struct svccmd *cmd, struct static MODCMD_FUNC(cmd_send) { char *message; - int s = 0, brk = 0; - int reciept = 0, inc = 2; + int reciept = 0, inc = 2, email = 0; struct handle_info *hi; struct memo_account *ma, *sender; struct memo *memo; + char subject[128], body[4096]; + char *estr; + const char *netname, *fmt; + + MEMOSERV_MIN_PARAMS(3); + + if (checkDefCon(DEFCON_NO_NEW_MEMOS) && !IsOper(user)) { + reply("MSMSG_DEFCON_NO_NEW_MEMOS"); + return 0; + } if (!(hi = modcmd_get_handle_info(user, argv[1]))) return 0; @@ -402,33 +435,25 @@ static MODCMD_FUNC(cmd_send) if (!(memoserv_can_send(cmd->parent->bot, user, ma))) return 0; - char *flags = argv[2]; - while (*flags) { - switch (*flags) { - case '-': - if (s != 0) - brk = 1; - break; - - case 'r': - if (s > 0) + inc = 2; /* Start of message on 3rd ([2]) word */ + if(argv[2][0] == '-' && argv[2][1] != '-') { /* first word is flags ('-r')*/ + char *flags = argv[2]; + inc++; /* Start of message is now 1 word later */ + for(flags++;*flags;flags++) { + switch (*flags) { + case 'r': reciept = 1; break; default: - break; - } - - if (brk == 1) - break; - else { - s++; - flags++; + /* Unknown mode. Give an error */ + reply("MSMSG_UNKNOWN_SEND_FLAG", *flags); + return 0; + } } } - - if (s > 0) - inc = 3; + else + inc = 2; /* Start of message is word 2 */ message = unsplit_string(argv + inc, argc - inc, NULL); memo = add_memo(now, ma, sender, message, 1); @@ -439,7 +464,20 @@ static MODCMD_FUNC(cmd_send) struct userNode *other; for (other = ma->handle->users; other; other = other->next_authed) - send_message(other, cmd->parent->bot, "MSMSG_NEW_MESSAGE", user->nick); + send_message_type((ma->flags & MEMO_USE_PRIVMSG)? MSG_TYPE_PRIVMSG : MSG_TYPE_NOTICE, other, memoserv ? memoserv : cmd->parent->bot, "MSMSG_NEW_MESSAGE", user->nick); + } + + estr = conf_get_data("services/nickserv/email_enabled", RECDB_QSTRING); + netname = conf_get_data("server/network", RECDB_QSTRING); + email = atoi(estr); + if (email && (ma->flags & MEMO_NOTIFY_NEW)) { + fmt = handle_find_message(hi, "MSEMAIL_NEWMEMO_SUBJECT"); + snprintf(subject, sizeof(subject), fmt, netname, memoserv->nick, user->nick); + + fmt = handle_find_message(hi, "MSEMAIL_NEWMEMO_BODY"); + snprintf(body, sizeof(body), fmt, user->nick, memoserv->nick, message, memoserv->nick, memo_id, netname); + + mail_send(memoserv, hi, subject, body, 0); } reply("MSMSG_MEMO_SENT", ma->handle->handle, memo_id); @@ -472,8 +510,10 @@ static MODCMD_FUNC(cmd_list) reply("MSG_NONE"); else if (ii == 15) reply("MSMSG_CLEAN_INBOX", ii); - else + else { reply("MSMSG_MEMOS_FOUND", ii); + reply("MSMSG_HOWTO_READ"); + } reply("MSMSG_LIST_END"); @@ -531,12 +571,7 @@ static MODCMD_FUNC(cmd_read) char posted[24]; struct tm tm; - if (!(ma = memoserv_get_account(user->handle_info))) - return 0; - if (!(memo = find_memo(user, cmd, ma, argv[1], &memoid))) - return 0; - - if (argv[2]) { + if (argc > 2) { char *argtwo = argv[2]; while (*argtwo) { switch (*argtwo) { @@ -562,6 +597,12 @@ static MODCMD_FUNC(cmd_read) } } + if (!(ma = memoserv_get_account(user->handle_info))) + return 0; + + if (!(memo = find_memo(user, cmd, ma, argv[1], &memoid))) + return 0; + localtime_r(&memo->sent, &tm); strftime(posted, sizeof(posted), "%I:%M %p, %m/%d/%Y", &tm); @@ -593,7 +634,7 @@ static MODCMD_FUNC(cmd_read) struct userNode *other; for (other = sender->handle->users; other; other = other->next_authed) - send_message(other, cmd->parent->bot, "MSMSG_NEW_MESSAGE", ma->handle->handle); + send_message_type((ma->flags & MEMO_USE_PRIVMSG)? MSG_TYPE_PRIVMSG : MSG_TYPE_NOTICE, other, cmd->parent->bot, "MSMSG_NEW_MESSAGE", ma->handle->handle); } @@ -608,6 +649,8 @@ static MODCMD_FUNC(cmd_delete) struct memo *memo; unsigned int memoid; + MEMOSERV_MIN_PARAMS(2); + if (!(ma = memoserv_get_account(user->handle_info))) return 0; if (!irccasecmp(argv[1], "*") || !irccasecmp(argv[1], "all")) { @@ -636,6 +679,8 @@ static MODCMD_FUNC(cmd_cancel) struct memo *memo; struct memo_account *ma; + MEMOSERV_MIN_PARAMS(2); + if (isdigit(argv[1][0])) { id = strtoul(argv[1], NULL, 0); } else { @@ -694,21 +739,21 @@ static MODCMD_FUNC(cmd_expiry) static void -set_list(struct userNode *user, struct handle_info *hi, int override) +set_list(struct svccmd *cmd, struct userNode *user, struct handle_info *hi, int override) { option_func_t *opt; unsigned int i; - char *set_display[] = {"AUTHNOTIFY", "NOTIFY", "PRIVATE", "LIMIT", + char *set_display[] = {"AUTHNOTIFY", "NEWNOTIFY", "PRIVMSG", "PRIVATE", "LIMIT", "IGNORERECIEPTS", "SENDRECIEPTS"}; - send_message(user, memoserv_conf.bot, "MSMSG_SET_OPTIONS"); - send_message(user, memoserv_conf.bot, "MSMSG_BAR"); + reply("MSMSG_SET_OPTIONS"); + reply("MSMSG_BAR"); /* Do this so options are presented in a consistent order. */ for (i = 0; i < ArrayLength(set_display); ++i) if ((opt = dict_find(memoserv_opt_dict, set_display[i], NULL))) - opt(user, hi, override, 0, NULL); - send_message(user, memoserv_conf.bot, "MSMSG_SET_OPTIONS_END"); + opt(cmd, user, hi, override, 0, NULL); + reply("MSMSG_SET_OPTIONS_END"); } static MODCMD_FUNC(cmd_set) @@ -718,7 +763,7 @@ static MODCMD_FUNC(cmd_set) hi = user->handle_info; if (argc < 2) { - set_list(user, hi, 0); + set_list(cmd, user, hi, 0); return 1; } @@ -727,7 +772,7 @@ static MODCMD_FUNC(cmd_set) return 0; } - return opt(user, hi, 0, argc-1, argv+1); + return opt(cmd, user, hi, 0, argc-1, argv+1); } static MODCMD_FUNC(cmd_oset) @@ -735,11 +780,13 @@ static MODCMD_FUNC(cmd_oset) struct handle_info *hi; option_func_t *opt; + MEMOSERV_MIN_PARAMS(2); + if (!(hi = get_victim_oper(user, argv[1]))) return 0; if (argc < 3) { - set_list(user, hi, 0); + set_list(cmd, user, hi, 0); return 1; } @@ -748,10 +795,10 @@ static MODCMD_FUNC(cmd_oset) return 0; } - return opt(user, hi, 1, argc-2, argv+2); + return opt(cmd, user, hi, 1, argc-2, argv+2); } -static OPTION_FUNC(opt_notify) +static OPTION_FUNC(opt_newnotify) { struct memo_account *ma; char *choice; @@ -765,13 +812,36 @@ static OPTION_FUNC(opt_notify) } else if (disabled_string(choice)) { ma->flags &= ~MEMO_NOTIFY_NEW; } else { - send_message(user, memoserv_conf.bot, "MSMSG_INVALID_BINARY", choice); + reply("MSMSG_INVALID_BINARY", choice); return 0; } } choice = (ma->flags & MEMO_NOTIFY_NEW) ? "on" : "off"; - send_message(user, memoserv_conf.bot, "MSMSG_SET_NOTIFY", choice); + reply("MSMSG_SET_NEWNOTIFY", choice); + return 1; +} + +static OPTION_FUNC(opt_privmsg) +{ + struct memo_account *ma; + char *choice; + + if (!(ma = memoserv_get_account(hi))) + return 0; + if (argc > 1) { + choice = argv[1]; + if (enabled_string(choice)) { + ma->flags |= MEMO_USE_PRIVMSG; + } else if (disabled_string(choice)) { + ma->flags &= ~MEMO_USE_PRIVMSG; + } else { + reply("MSMSG_INVALID_BINARY", choice); + return 0; + } + } + choice = (ma->flags & MEMO_USE_PRIVMSG) ? "on" : "off"; + reply("MSMSG_SET_PRIVMSG", choice); return 1; } @@ -789,13 +859,13 @@ static OPTION_FUNC(opt_authnotify) } else if (disabled_string(choice)) { ma->flags &= ~MEMO_NOTIFY_LOGIN; } else { - send_message(user, memoserv_conf.bot, "MSMSG_INVALID_BINARY", choice); + reply("MSMSG_INVALID_BINARY", choice); return 0; } } choice = (ma->flags & MEMO_NOTIFY_LOGIN) ? "on" : "off"; - send_message(user, memoserv_conf.bot, "MSMSG_SET_AUTHNOTIFY", choice); + reply("MSMSG_SET_AUTHNOTIFY", choice); return 1; } @@ -813,13 +883,13 @@ static OPTION_FUNC(opt_ignorereciepts) } else if (disabled_string(choice)) { ma->flags &= ~MEMO_IGNORE_RECIEPTS; } else { - send_message(user, memoserv_conf.bot, "MSMSG_INVALID_BINARY", choice); + reply("MSMSG_INVALID_BINARY", choice); return 0; } } choice = (ma->flags & MEMO_IGNORE_RECIEPTS) ? "on" : "off"; - send_message(user, memoserv_conf.bot, "MSMSG_SET_IGNORERECIEPTS", choice); + reply("MSMSG_SET_IGNORERECIEPTS", choice); return 1; } @@ -837,13 +907,13 @@ static OPTION_FUNC(opt_sendreciepts) } else if (disabled_string(choice)) { ma->flags &= ~MEMO_ALWAYS_RECIEPTS; } else { - send_message(user, memoserv_conf.bot, "MSMSG_INVALID_BINARY", choice); + reply("MSMSG_INVALID_BINARY", choice); return 0; } } choice = (ma->flags & MEMO_ALWAYS_RECIEPTS) ? "on" : "off"; - send_message(user, memoserv_conf.bot, "MSMSG_SET_SENDRECIEPTS", choice); + reply("MSMSG_SET_SENDRECIEPTS", choice); return 1; } @@ -861,13 +931,13 @@ static OPTION_FUNC(opt_private) } else if (disabled_string(choice)) { ma->flags &= ~MEMO_DENY_NONCHANNEL; } else { - send_message(user, memoserv_conf.bot, "MSMSG_INVALID_BINARY", choice); + reply("MSMSG_INVALID_BINARY", choice); return 0; } } choice = (ma->flags & MEMO_DENY_NONCHANNEL) ? "on" : "off"; - send_message(user, memoserv_conf.bot, "MSMSG_SET_PRIVATE", choice); + reply("MSMSG_SET_PRIVATE", choice); return 1; } @@ -886,7 +956,7 @@ static OPTION_FUNC(opt_limit) ma->limit = choice; } - send_message(user, memoserv_conf.bot, "MSMSG_SET_LIMIT", ma->limit); + reply("MSMSG_SET_LIMIT", ma->limit); return 1; } @@ -910,7 +980,7 @@ static MODCMD_FUNC(cmd_status) } reply("MSMSG_STATUS_HIST_TOTAL", hc); - reply("MSMSG_STATUS_TOTAL", mc); + reply("MSMSG_STATUS_TOTAL", memoCount); reply("MSMSG_STATUS_EXPIRED", memosExpired); reply("MSMSG_STATUS_SENT", memosSent); return 1; @@ -1122,9 +1192,10 @@ memoserv_write_users(struct saxdb_context *ctx, struct memo_account *ma) static int memoserv_write_memos(struct saxdb_context *ctx, struct memo *memo) { - char str[7]; + char str[20]; - saxdb_start_record(ctx, inttobase64(str, memo->id, sizeof(str)), 0); + memset(str, '\0', sizeof(str)); + saxdb_start_record(ctx, inttobase64(str, memo->id, sizeof(str)-1), 0); saxdb_write_int(ctx, KEY_SENT, memo->sent); saxdb_write_int(ctx, KEY_ID, memo->id); @@ -1145,9 +1216,10 @@ memoserv_write_memos(struct saxdb_context *ctx, struct memo *memo) static int memoserv_write_history(struct saxdb_context *ctx, struct history *history) { - char str[7]; + char str[20]; - saxdb_start_record(ctx, inttobase64(str, history->id, sizeof(str)), 0); + memset(str, '\0', sizeof(str)); + saxdb_start_record(ctx, inttobase64(str, history->id, sizeof(str)-1), 0); saxdb_write_int(ctx, KEY_SENT, history->sent); saxdb_write_int(ctx, KEY_ID, history->id); @@ -1223,8 +1295,8 @@ memoserv_check_messages(struct userNode *user, UNUSED_ARG(struct handle_info *ol if (!memo->is_read) unseen++; } - if (ma->recvd.used && memoserv_conf.bot) - if(unseen) send_message(user, memoserv_conf.bot, "MSMSG_MEMOS_INBOX", unseen, ma->recvd.used - unseen); + if (ma->recvd.used && memoserv) + if(unseen) send_message_type((ma->flags & MEMO_USE_PRIVMSG)? 1 : 0, user, memoserv, "MSMSG_MEMOS_INBOX", unseen, ma->recvd.used - unseen); } } @@ -1277,7 +1349,8 @@ memoserv_init(void) memoserv_opt_dict = dict_new(); dict_insert(memoserv_opt_dict, "AUTHNOTIFY", opt_authnotify); - dict_insert(memoserv_opt_dict, "NOTIFY", opt_notify); + dict_insert(memoserv_opt_dict, "NEWNOTIFY", opt_newnotify); + dict_insert(memoserv_opt_dict, "PRIVMSG", opt_privmsg); dict_insert(memoserv_opt_dict, "PRIVATE", opt_private); dict_insert(memoserv_opt_dict, "IGNORERECIEPTS", opt_ignorereciepts); dict_insert(memoserv_opt_dict, "SENDRECIEPTS", opt_sendreciepts); @@ -1305,13 +1378,19 @@ memoserv_finalize(void) { } str = database_get_data(conf_node, "bot", RECDB_QSTRING); - if (str) - memoserv_conf.bot = GetUserH(str); + if (str) { + memoserv = memoserv_conf.bot; + const char *modes = conf_get_data("modules/memoserv/modes", RECDB_QSTRING); + memoserv = AddLocalUser(str, str, NULL, "User-User Memorandum Services", modes); + } else { + log_module(MS_LOG, LOG_ERROR, "database_get_data for memoserv_conf.bot failed!"); + exit(1); + } - if (autojoin_channels && memoserv_conf.bot) { + if (autojoin_channels && memoserv) { for (i = 0; i < autojoin_channels->used; i++) { chan = AddChannel(autojoin_channels->list[i], now, "+nt", NULL, NULL); - AddChannelUser(memoserv_conf.bot, chan)->modes |= MODE_CHANOP; + AddChannelUser(memoserv, chan)->modes |= MODE_CHANOP; } }