X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/35ca8140ebc28aaf75772e1d1fa1aa4b667ab435..4a2a9a4e6a8fccd440da203bdfb8bba3f0b973a9:/src/mod-memoserv.c

diff --git a/src/mod-memoserv.c b/src/mod-memoserv.c
index ea245fc..4c9011f 100644
--- a/src/mod-memoserv.c
+++ b/src/mod-memoserv.c
@@ -42,6 +42,7 @@
 #include "conf.h"
 #include "modcmd.h"
 #include "nickserv.h"
+#include "opserv.h"
 #include "saxdb.h"
 #include "timeq.h"
 
@@ -49,6 +50,7 @@
 #define KEY_FLAGS "flags"
 #define KEY_LIMIT "limit"
 
+#define KEY_MAIN_HISTORY "history"
 #define KEY_MAIN_MEMOS "memos"
 #define KEY_SENT "sent"
 #define KEY_RECIPIENT "to"
@@ -58,8 +60,10 @@
 #define KEY_RECIEPT "reciept"
 #define KEY_ID "id"
 
+
 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 <ID> to read a message." },
@@ -86,6 +90,7 @@ static const struct message_entry msgtab[] = {
     { "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_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." },
     { "MSMSG_STATUS_EXPIRED", "$b%ld$b memos expired during the time I am awake." },
     { "MSMSG_STATUS_SENT",    "$b%ld$b memos have been sent." },
@@ -104,6 +109,8 @@ static const struct message_entry msgtab[] = {
     { "MSMSG_LIST_END",        "--------------End of Memos--------------" },
     { "MSMSG_BAR",             "----------------------------------------"},
 
+    { "MSMSG_DEFCON_NO_NEW_MEMOS", "You cannot send new memos at this time, please try again soon." },
+
     { NULL, NULL }
 };
 
@@ -117,8 +124,26 @@ struct memo {
     unsigned int reciept : 1;
 };
 
+struct history {
+    struct memo_account *recipient;
+    struct memo_account *sender;
+    time_t sent;
+    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*);
+DECLARE_LIST(historyList, struct history*);
+DEFINE_LIST(historyList, struct history*);
 
 /* memo_account.flags fields */
 #define MEMO_NOTIFY_NEW      0x00000001
@@ -133,6 +158,8 @@ struct memo_account {
     unsigned int limit;
     struct memoList sent;
     struct memoList recvd;
+    struct historyList hsent;
+    struct historyList hrecvd;
 };
 
 static struct {
@@ -142,7 +169,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;
@@ -153,6 +180,7 @@ static struct module *memoserv_module;
 static struct log_type *MS_LOG;
 static unsigned long memosSent, 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* */
 
 static struct memo_account *
@@ -171,6 +199,7 @@ memoserv_get_account(struct handle_info *hi)
     ma->flags = MEMO_NOTIFY_NEW | MEMO_NOTIFY_LOGIN;
     ma->limit = memoserv_conf.limit;
     dict_insert(memos, ma->handle->handle, ma);
+    dict_insert(historys, ma->handle->handle, ma);
     return ma;
 }
 
@@ -183,6 +212,14 @@ delete_memo(struct memo *memo)
     free(memo);
 }
 
+static void
+delete_history(struct history *history)
+{
+    historyList_remove(&history->recipient->hrecvd, history);
+    historyList_remove(&history->sender->hsent, history);
+    free(history);
+}
+
 static void
 delete_memo_account(void *data)
 {
@@ -194,6 +231,13 @@ delete_memo_account(void *data)
         delete_memo(ma->sent.list[0]);
     memoList_clean(&ma->recvd);
     memoList_clean(&ma->sent);
+
+    while (ma->hrecvd.used)
+        delete_history(ma->hrecvd.list[0]);
+    while (ma->hsent.used)
+        delete_history(ma->hsent.list[0]);
+    historyList_clean(&ma->hrecvd);
+    historyList_clean(&ma->hsent);
     free(ma);
 }
 
@@ -213,6 +257,19 @@ do_expire(void)
             }
         }
     }
+
+    for (it = dict_first(historys); it; it = iter_next(it)) {
+        struct memo_account *acct = iter_data(it);
+        unsigned int ii;
+        for (ii = 0; ii < acct->hsent.used; ++ii) {
+            struct history *history = acct->hsent.list[ii];
+            if ((now - history->sent) > memoserv_conf.message_expiry) {
+                delete_history(history);
+                memosExpired++;
+                ii--;
+            }
+        }
+    }
 }
 
 static void
@@ -224,10 +281,31 @@ expire_memos(UNUSED_ARG(void *data))
     }
 }
 
+static struct history*
+add_history(time_t sent, struct memo_account *recipient, struct memo_account *sender, unsigned long id)
+{
+    struct history *history;
+
+    history = calloc(1, sizeof(*history));
+    if (!history)
+        return NULL;
+
+    history->id = id;
+    history->recipient = recipient;
+    historyList_append(&recipient->hrecvd, history);
+    history->sender = sender;
+    historyList_append(&sender->hsent, history);
+    history->sent = sent;
+
+    return history;
+}
+
+
 static struct memo*
 add_memo(time_t sent, struct memo_account *recipient, struct memo_account *sender, char *message, int nfrom_read)
 {
     struct memo *memo;
+    struct history *history;
 
     memo = calloc(1, sizeof(*memo));
     if (!memo)
@@ -245,6 +323,10 @@ add_memo(time_t sent, struct memo_account *recipient, struct memo_account *sende
     memo->sent = sent;
     memo->message = strdup(message);
     memosSent++;
+
+    if (nfrom_read)
+        history = add_history(sent, recipient, sender, memo->id);
+
     return memo;
 }
 
@@ -315,12 +397,18 @@ 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;
     struct handle_info *hi;
     struct memo_account *ma, *sender;
     struct memo *memo;
 
+    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;
 
@@ -333,33 +421,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);
@@ -414,7 +494,7 @@ static MODCMD_FUNC(cmd_list)
 static MODCMD_FUNC(cmd_history)
 {
     struct memo_account *ma;
-    struct memo *memo;
+    struct history *history;
     dict_iterator_t it;
     unsigned int ii = 0;
     unsigned int cc = 0;
@@ -429,15 +509,15 @@ static MODCMD_FUNC(cmd_history)
     if(user->handle_info && user->handle_info->userlist_style != HI_STYLE_CLEAN)
         reply("MSMSG_BAR");
 
-    for (it = dict_first(memos); it; it = iter_next(it)) {
+    for (it = dict_first(historys); it; it = iter_next(it)) {
         ma = iter_data(it);
-        for (ii = 0; ii < ma->recvd.used; ++ii) {
-            memo = ma->recvd.list[ii];
-            if (!strcasecmp(memo->sender->handle->handle, user->handle_info->handle)) {
+        for (ii = 0; ii < ma->hrecvd.used; ++ii) {
+            history = ma->hrecvd.list[ii];
+            if (!strcasecmp(history->sender->handle->handle, user->handle_info->handle)) {
                 cc++;
-                localtime_r(&memo->sent, &tm);
+                localtime_r(&history->sent, &tm);
                 strftime(posted, sizeof(posted), "%I:%M %p, %m/%d/%Y", &tm);
-                reply("MSMSG_HISTORY_FORMAT", memo->id, memo->sender->handle->handle, posted);
+                reply("MSMSG_HISTORY_FORMAT", history->id, history->recipient->handle->handle, posted);
             }
         }
     }
@@ -467,7 +547,7 @@ static MODCMD_FUNC(cmd_read)
     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) {
@@ -539,6 +619,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")) {
@@ -567,6 +649,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 {
@@ -625,21 +709,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",
                            "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)
@@ -649,7 +733,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;
     }
 
@@ -658,7 +742,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)
@@ -666,11 +750,13 @@ static MODCMD_FUNC(cmd_oset)
     struct handle_info *hi;
     option_func_t *opt;
 
-    if (!(hi = get_victim_oper(user, argv[1])))
+    MEMOSERV_MIN_PARAMS(2);
+
+    if (!(hi = get_victim_oper(cmd, user, argv[1])))
         return 0;
 
     if (argc < 3) {
-        set_list(user, hi, 0);
+        set_list(cmd, user, hi, 0);
         return 1;
     }
 
@@ -679,7 +765,7 @@ 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)
@@ -696,13 +782,13 @@ 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_NOTIFY", choice);
     return 1;
 }
 
@@ -720,13 +806,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;
 }
 
@@ -744,13 +830,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;
 }
 
@@ -768,13 +854,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;
 }
 
@@ -792,13 +878,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;
 }
 
@@ -817,13 +903,31 @@ 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;
 }
 
 static MODCMD_FUNC(cmd_status)
 {
-    reply("MSMSG_STATUS_TOTAL", dict_size(memos));
+    struct memo_account *ma;
+    dict_iterator_t it;
+    int mc = 0, hc = 0;
+    unsigned int ii;
+
+    for (it = dict_first(memos); it; it = iter_next(it)) {
+        ma = iter_data(it);
+        for (ii = 0; ii < ma->recvd.used; ++ii)
+            mc++;
+    }
+
+    for (it = dict_first(historys); it; it = iter_next(it)) {
+        ma = iter_data(it);
+        for (ii = 0; ii < ma->hrecvd.used; ++ii)
+            hc++;
+    }
+
+    reply("MSMSG_STATUS_HIST_TOTAL", hc);
+    reply("MSMSG_STATUS_TOTAL", mc);
     reply("MSMSG_STATUS_EXPIRED", memosExpired);
     reply("MSMSG_STATUS_SENT", memosSent);
     return 1;
@@ -884,6 +988,7 @@ memoserv_user_read(const char *key, struct record_data *hir)
     ma->limit = strtoul(str, NULL, 0);
 
     dict_insert(memos, ma->handle->handle, ma);
+    dict_insert(historys, ma->handle->handle, ma);
 
     return 0;
 }
@@ -950,6 +1055,54 @@ memoserv_memo_read(const char *key, struct record_data *hir)
     return 0;
 }
 
+static int
+memoserv_history_read(const char *key, struct record_data *hir)
+{
+    char *str;
+    struct handle_info *sender, *recipient;
+    struct history *history;
+    unsigned long id;
+    time_t sent;
+
+    if (hir->type != RECDB_OBJECT) {
+        log_module(MS_LOG, LOG_WARNING, "Unexpected rectype %d for %s.", hir->type, key);
+        return 0;
+    }
+
+    if (!(str = database_get_data(hir->d.object, KEY_SENT, RECDB_QSTRING))) {
+        log_module(MS_LOG, LOG_ERROR, "Date sent not present in history %s; skipping", key);
+        return 0;
+    }
+
+    sent = atoi(str);
+
+    if (!(str = database_get_data(hir->d.object, KEY_ID, RECDB_QSTRING))) {
+        log_module(MS_LOG, LOG_ERROR, "ID sent not present in history %s; skipping", key);
+        return 0;
+    }
+    id = strtoul(str, NULL, 0);
+
+    if (!(str = database_get_data(hir->d.object, KEY_RECIPIENT, RECDB_QSTRING))) {
+        log_module(MS_LOG, LOG_ERROR, "Recipient not present in history %s; skipping", key);
+        return 0;
+    } else if (!(recipient = get_handle_info(str))) {
+        log_module(MS_LOG, LOG_ERROR, "Invalid recipient %s in history %s; skipping", str, key);
+        return 0;
+    }
+
+    if (!(str = database_get_data(hir->d.object, KEY_FROM, RECDB_QSTRING))) {
+        log_module(MS_LOG, LOG_ERROR, "Sender not present in history %s; skipping", key);
+        return 0;
+    } else if (!(sender = get_handle_info(str))) {
+        log_module(MS_LOG, LOG_ERROR, "Invalid sender %s in history %s; skipping", str, key);
+        return 0;
+    }
+
+    history = add_history(sent, memoserv_get_account(recipient), memoserv_get_account(sender), id);
+
+    return 0;
+}
+
 static int
 memoserv_saxdb_read(struct dict *database)
 {
@@ -964,6 +1117,10 @@ memoserv_saxdb_read(struct dict *database)
         for(it = dict_first(section); it; it = iter_next(it))
             memoserv_memo_read(iter_key(it), iter_data(it));
 
+    if((section = database_get_data(database, KEY_MAIN_HISTORY, RECDB_OBJECT)))
+        for(it = dict_first(section); it; it = iter_next(it))
+            memoserv_history_read(iter_key(it), iter_data(it));
+
     return 0;
 }
 
@@ -1002,12 +1159,29 @@ memoserv_write_memos(struct saxdb_context *ctx, struct memo *memo)
     return 0;
 }
 
+static int
+memoserv_write_history(struct saxdb_context *ctx, struct history *history)
+{
+    char str[7];
+
+    saxdb_start_record(ctx, inttobase64(str, history->id, sizeof(str)), 0);
+
+    saxdb_write_int(ctx, KEY_SENT, history->sent);
+    saxdb_write_int(ctx, KEY_ID, history->id);
+    saxdb_write_string(ctx, KEY_RECIPIENT, history->recipient->handle->handle);
+    saxdb_write_string(ctx, KEY_FROM, history->sender->handle->handle);
+
+    saxdb_end_record(ctx);
+    return 0;
+}
+
 static int
 memoserv_saxdb_write(struct saxdb_context *ctx)
 {
     dict_iterator_t it;
     struct memo_account *ma;
     struct memo *memo;
+    struct history *history;
     unsigned int ii;
 
     /* Accounts */
@@ -1018,7 +1192,7 @@ memoserv_saxdb_write(struct saxdb_context *ctx)
     }
     saxdb_end_record(ctx);
 
-    /* Channels */
+    /* Memos */
     saxdb_start_record(ctx, KEY_MAIN_MEMOS, 1);
     for (it = dict_first(memos); it; it = iter_next(it)) {
         ma = iter_data(it);
@@ -1029,6 +1203,17 @@ memoserv_saxdb_write(struct saxdb_context *ctx)
     }
     saxdb_end_record(ctx);
 
+    /* History */
+    saxdb_start_record(ctx, KEY_MAIN_HISTORY, 1);
+    for (it = dict_first(historys); it; it = iter_next(it)) {
+        ma = iter_data(it);
+        for (ii = 0; ii < ma->hrecvd.used; ++ii) {
+            history = ma->hrecvd.list[ii];
+            memoserv_write_history(ctx, history);
+        }
+    }
+    saxdb_end_record(ctx);
+
     return 0;
 }
 
@@ -1036,6 +1221,7 @@ static void
 memoserv_cleanup(void)
 {
     dict_delete(memos);
+    dict_delete(historys);
 }
 
 static void
@@ -1054,8 +1240,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(user, memoserv, "MSMSG_MEMOS_INBOX", unseen, ma->recvd.used - unseen);
     }
 }
 
@@ -1067,12 +1253,16 @@ memoserv_rename_account(struct handle_info *hi, const char *old_handle)
         return;
     dict_remove2(memos, old_handle, 1);
     dict_insert(memos, hi->handle, ma);
+
+    dict_remove2(historys, old_handle, 1);
+    dict_insert(historys, hi->handle, ma);
 }
 
 static void
 memoserv_unreg_account(UNUSED_ARG(struct userNode *user), struct handle_info *handle)
 {
     dict_remove(memos, handle->handle);
+    dict_remove(historys, handle->handle);
 }
 
 int
@@ -1080,6 +1270,7 @@ memoserv_init(void)
 {
     MS_LOG = log_register_type("MemoServ", "file:memoserv.log");
     memos = dict_new();
+    historys = dict_new();
     dict_set_free_data(memos, delete_memo_account);
     reg_auth_func(memoserv_check_messages);
     reg_handle_rename_func(memoserv_rename_account);
@@ -1131,13 +1322,17 @@ 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;
+    } 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;
         }
     }