svsnick and 1 param auth

[irc/evilnet/x3.git] / src / mod-memoserv.c

diff --git a/src/mod-memoserv.c b/src/mod-memoserv.c
index ce3542b155b38c393e484464e77e5d53649ab827..62c99d77d452c726534db3e0a10c8165e3c3ab6e 100644 (file)
--- a/src/mod-memoserv.c
+++ b/src/mod-memoserv.c
@@ -56,7 +56,6 @@
 #define KEY_RECIPIENT "to"
 #define KEY_FROM "from"
 #define KEY_MESSAGE "msg"
-#undef KEY_READ /* thanks microsoft! */
 #define KEY_READ "read"
 #define KEY_RECIEPT "reciept"
 #define KEY_ID "id"
@@ -548,11 +547,6 @@ 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 (argc > 2) {
         char *argtwo = argv[2];
         while (*argtwo) {
@@ -579,6 +573,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);
 
@@ -1357,7 +1357,7 @@ memoserv_finalize(void) {
     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 ? modes : NULL);
+        memoserv = AddService(str, modes ? modes : NULL, "User-User Memorandum Services", NULL);
 
     } else {
         log_module(MS_LOG, LOG_ERROR, "database_get_data for memoserv_conf.bot failed!");