From: Art Cancro Date: Sat, 28 Nov 2020 15:40:13 +0000 (-0500) Subject: New field in user record "lastproc_inboxrules" which keeps track of the most recent... X-Git-Tag: v939~208 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=5ab9791cc2471acde1d4ca210fcca951eb3354e2 New field in user record "lastproc_inboxrules" which keeps track of the most recent message processed by the inbox rules filter, since we're now going to make the ruleset something that is only written to when the user changes it. --- diff --git a/citadel/citadel.h b/citadel/citadel.h index fe109090c..f41cf272e 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -97,7 +97,7 @@ struct march { */ typedef struct ctdluser ctdluser; struct ctdluser { // User record - int version; // Cit vers. which created this rec + int version; // Citadel version which created this record uid_t uid; // Associate with a unix account? char password[32]; // password unsigned flags; // See US_ flags below @@ -112,6 +112,7 @@ struct ctdluser { // User record long msgnum_pic; // msgnum of user's avatar (photo) char emailaddrs[512]; // Internet email addresses long msgnum_inboxrules; // msgnum of user's inbox filtering rules + long lastproc_inboxrules; // msgnum of last message filtered }; diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c index d982dd2d2..ed3ea391c 100644 --- a/citadel/modules/migrate/serv_migrate.c +++ b/citadel/modules/migrate/serv_migrate.c @@ -137,6 +137,7 @@ void migr_export_users_backend(char *username, void *data) { cprintf("%ld\n", u.msgnum_pic); cprintf("%s\n", u.emailaddrs); cprintf("%ld\n", u.msgnum_inboxrules); + cprintf("%ld\n", u.lastproc_inboxrules); client_write(HKEY("\n")); } @@ -590,6 +591,7 @@ int migr_userrecord(void *data, const char *el) else if (!strcasecmp(el, "u_msgnum_pic")) usbuf.msgnum_pic = atol(ChrPtr(migr_chardata)); else if (!strcasecmp(el, "u_emailaddrs")) safestrncpy(usbuf.emailaddrs, ChrPtr(migr_chardata), sizeof usbuf.emailaddrs); else if (!strcasecmp(el, "u_msgnum_inboxrules")) usbuf.msgnum_inboxrules = atol(ChrPtr(migr_chardata)); + else if (!strcasecmp(el, "u_lastproc_inboxrules")) usbuf.lastproc_inboxrules = atol(ChrPtr(migr_chardata)); else return 0; return 1; }