midb: synchronize \Flagged between MAPI and IMAP

References: GXH-122

Author: jengelh

exch/midb/mail_engine.cpp

@@ -102,6 +102,7 @@ struct syncmessage_entry {
 	uint64_t mod_time = 0, recv_time = 0;
 	uint32_t msg_flags = 0;
 	std::string midstr;
+	bool flagged = false;
 };
 
 using syncfolder_list = std::unordered_map<uint64_t /* folder_id */, syncfolder_entry>;
@@ -1479,6 +1480,7 @@ static void me_insert_message(xstmt &stm_insert, uint32_t *puidnext,
 	stm_insert.bind_text(9, rcpt);
 	stm_insert.bind_int64(10, size);
 	stm_insert.bind_int64(11, e.recv_time);
+	stm_insert.bind_int64(12, e.flagged);
 	if (stm_insert.step() != SQLITE_DONE)
 		mlog(LV_ERR, "E-2075: sqlite_step not finished");
 } catch (const std::bad_alloc &) {
@@ -1533,7 +1535,7 @@ static BOOL me_sync_contents(IDB_ITEM *pidb, uint64_t folder_id) try
 		auto cl_0 = make_scope_exit([&]() { exmdb_client::unload_table(dir, table_id); });
 		static constexpr uint32_t proptags_0[] = {
 			PidTagMid, PR_MESSAGE_FLAGS, PR_LAST_MODIFICATION_TIME,
-			PR_MESSAGE_DELIVERY_TIME, PidTagMidString,
+			PR_MESSAGE_DELIVERY_TIME, PidTagMidString, PR_FLAG_STATUS,
 		};
 		static constexpr PROPTAG_ARRAY proptags_1 = {std::size(proptags_0), deconst(proptags_0)};
 		if (!exmdb_client::query_table(dir, nullptr, CP_ACP, table_id,
@@ -1554,10 +1556,10 @@ static BOOL me_sync_contents(IDB_ITEM *pidb, uint64_t folder_id) try
 
 	syncmessage_list syncmessagelist;
 	for (size_t i = 0; i < rows.count; ++i) {
-		auto num = rows.pparray[i]->get<const uint64_t>(PidTagMid);
-		if (num == nullptr)
+		auto lnum = rows.pparray[i]->get<const uint64_t>(PidTagMid);
+		if (lnum == nullptr)
 			continue;
-		auto message_id = rop_util_get_gc_value(*num);
+		auto message_id = rop_util_get_gc_value(*lnum);
 		auto flags = rows.pparray[i]->get<uint32_t>(PR_MESSAGE_FLAGS);
 		if (flags == nullptr)
 			continue;
@@ -1566,10 +1568,12 @@ static BOOL me_sync_contents(IDB_ITEM *pidb, uint64_t folder_id) try
 		auto mod_time = rows.pparray[i]->get<uint64_t>(PR_LAST_MODIFICATION_TIME);
 		auto recv_time = rows.pparray[i]->get<uint64_t>(PR_MESSAGE_DELIVERY_TIME);
 		auto midstr = rows.pparray[i]->get<const char>(PidTagMidString);
+		auto num = rows.pparray[i]->get<const uint32_t>(PR_FLAG_STATUS);
+		bool flagged = num != nullptr && *num == followupFlagged;
 		syncmessagelist.emplace(message_id, syncmessage_entry{
 			mod_time != nullptr ? *mod_time : 0,
 			recv_time != nullptr ? *recv_time : 0,
-			*flags, znul(midstr)
+			*flags, znul(midstr), flagged
 		});
 	}
 
@@ -1580,8 +1584,8 @@ static BOOL me_sync_contents(IDB_ITEM *pidb, uint64_t folder_id) try
 		return FALSE;
 	snprintf(sql_string, std::size(sql_string), "INSERT INTO messages (message_id, "
 		"folder_id, mid_string, mod_time, uid, unsent, read, subject,"
-		" sender, rcpt, size, received) VALUES (?, %llu, ?, ?, ?, ?, "
-		"?, ?, ?, ?, ?, ?)", LLU{folder_id});
+		" sender, rcpt, size, received, flagged) VALUES (?, %llu, ?, ?, ?, ?, "
+		"?, ?, ?, ?, ?, ?, ?)", LLU{folder_id});
 	auto stm_insert_msg = gx_sql_prep(pidb->psqlite, sql_string);
 	if (stm_insert_msg == nullptr)
 		return FALSE;
@@ -3130,9 +3134,20 @@ static int me_psflg(int argc, char **argv, int sockd)
 		}
 	}
 	if (strchr(argv[4], midb_flag::flagged) != nullptr) {
+		static constexpr uint32_t val = followupFlagged, icon = olRedFlagIcon;
+		static constexpr TAGGED_PROPVAL tp[] = {
+			{PR_FLAG_STATUS, deconst(&val)},
+			{PR_FOLLOWUP_ICON, deconst(&icon)},
+		};
+		static constexpr TPROPVAL_ARRAY ta = {std::size(tp), deconst(tp)};
+		if (!exmdb_client::set_message_properties(argv[1],
+		    nullptr, CP_ACP, rop_util_make_eid_ex(1, message_id),
+		    &ta, &problems))
+			return MIDB_E_MDB_SETMSGPROPS;
 		snprintf(sql_string, std::size(sql_string), "UPDATE messages SET flagged=1"
 		        " WHERE message_id=%llu", LLU{message_id});
 		gx_sql_exec(pidb->psqlite, sql_string);
+		/* The backnotification (msg_modified) comes a bit too late for comfort */
 	}
 	if (strchr(argv[4], midb_flag::forwarded) != nullptr) {
 		snprintf(sql_string, std::size(sql_string), "UPDATE messages SET forwarded=1"
@@ -3212,6 +3227,13 @@ static int me_prflg(int argc, char **argv, int sockd)
 		}
 	}
 	if (strchr(argv[4], midb_flag::flagged) != nullptr) {
+		static constexpr proptag_t tags[] = {
+			PR_FLAG_STATUS, PR_FOLLOWUP_ICON, PR_TODO_ITEM_FLAGS,
+		};
+		static constexpr PROPTAG_ARRAY ta = {std::size(tags), deconst(tags)};
+		if (!exmdb_client::remove_message_properties(argv[1], CP_ACP,
+		    rop_util_make_eid_ex(1, message_id), &ta))
+			return MIDB_E_MDB_SETMSGPROPS;
 		snprintf(sql_string, std::size(sql_string), "UPDATE messages SET flagged=0"
 		        " WHERE message_id=%llu", LLU{message_id});
 		gx_sql_exec(pidb->psqlite, sql_string);
@@ -3509,7 +3531,7 @@ static void notif_msg_added(IDB_ITEM *pidb,
 {
 	static constexpr proptag_t tmp_proptags[] =
 		{PR_MESSAGE_DELIVERY_TIME, PR_LAST_MODIFICATION_TIME,
-		PidTagMidString, PR_MESSAGE_FLAGS};
+		PidTagMidString, PR_MESSAGE_FLAGS, PR_FLAG_STATUS};
 	static constexpr PROPTAG_ARRAY proptags = {std::size(tmp_proptags), deconst(tmp_proptags)};
 	TPROPVAL_ARRAY propvals;
 	if (!exmdb_client::get_message_properties(cu_get_maildir(),
@@ -3523,6 +3545,8 @@ static void notif_msg_added(IDB_ITEM *pidb,
 	auto received_time = lnum != nullptr ? *lnum : 0;
 	auto num = propvals.get<const uint32_t>(PR_MESSAGE_FLAGS);
 	auto message_flags = num != nullptr ? *num : 0;
+	num = propvals.get<const uint32_t>(PR_FLAG_STATUS);
+	bool b_flagged = num != nullptr && *num == followupFlagged;
 
 	std::string flags_buff;
 	char mid_string[128];
@@ -3559,13 +3583,14 @@ static void notif_msg_added(IDB_ITEM *pidb,
 		return;
 	qstr = fmt::format("INSERT INTO messages ("
 		"message_id, folder_id, mid_string, mod_time, uid, "
-		"unsent, read, subject, sender, rcpt, size, received)"
-		" VALUES (?, {}, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", folder_id);
+		"unsent, read, subject, sender, rcpt, size, received, flagged)"
+		" VALUES (?, {}, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", folder_id);
 	pstmt = gx_sql_prep(pidb->psqlite, qstr.c_str());
 	if (pstmt == nullptr)
 		return;	
 	me_insert_message(pstmt, &uidnext, message_id,
-		syncmessage_entry{mod_time, received_time, message_flags, str});
+		syncmessage_entry{mod_time, received_time, message_flags,
+		str, b_flagged});
 	pstmt.finalize();
 	if (flags_buff.find(midb_flag::flagged) != flags_buff.npos) {
 		qstr = fmt::format("UPDATE messages SET "
@@ -3828,21 +3853,26 @@ static void notif_msg_modified(IDB_ITEM *pidb,
     uint64_t folder_id, uint64_t message_id) try
 {
 	TPROPVAL_ARRAY propvals;
-	static constexpr proptag_t tmp_proptags[] = {PR_MESSAGE_FLAGS, PR_LAST_MODIFICATION_TIME, PidTagMidString};
+	static constexpr proptag_t tmp_proptags[] = {
+		PR_MESSAGE_FLAGS, PR_LAST_MODIFICATION_TIME, PidTagMidString,
+		PR_FLAG_STATUS,
+	};
 	static constexpr PROPTAG_ARRAY proptags = {std::size(tmp_proptags), deconst(tmp_proptags)};
 	if (!exmdb_client::get_message_properties(cu_get_maildir(),
 	    nullptr, CP_ACP, rop_util_make_eid_ex(1, message_id),
 	    &proptags, &propvals))
 		return;	
 	auto num = propvals.get<const uint32_t>(PR_MESSAGE_FLAGS);
 	auto message_flags = num != nullptr ? *num : 0;
+	num = propvals.get<const uint32_t>(PR_FLAG_STATUS);
+	bool b_flagged = num != nullptr && *num == followupFlagged;
 	auto str = propvals.get<const char>(PidTagMidString);
 	if (str != nullptr) {
  UPDATE_MESSAGE_FLAGS:
 		auto b_unsent = !!(message_flags & MSGFLAG_UNSENT);
 		auto b_read   = !!(message_flags & MSGFLAG_READ);
-		auto qstr = fmt::format("UPDATE messages SET read={}, unsent={}"
-		            " WHERE message_id={}", b_read, b_unsent, message_id);
+		auto qstr = fmt::format("UPDATE messages SET read={}, unsent={}, flagged={}"
+		            " WHERE message_id={}", b_read, b_unsent, b_flagged, message_id);
 		gx_sql_exec(pidb->psqlite, qstr.c_str());
 		return;
 	}

include/gromox/mapidefs.h

@@ -308,6 +308,16 @@ enum { /* for PR_FLAG_STATUS */
 	followupFlagged = 0x2U,
 };
 
+enum { /* for PR_FOLLOWUP_ICON */
+	olNoFlagIcon = 0,
+	olPurpleFlagIcon,
+	olOrangeFlagIcon,
+	olGreenFlagIcon,
+	olYellowFlagIcon,
+	olBlueFlagIcon,
+	olRedFlagIcon,
+};
+
 enum mapi_importance {
 	IMPORTANCE_LOW = 0,
 	IMPORTANCE_NORMAL = 1,

include/gromox/mapitags.hpp

@@ -355,7 +355,7 @@ enum {
 	// PR_LAST_VERB_EXECUTION_TIME = PROP_TAG(PT_SYSTIME, 0x1082), /* PidTagLastVerbExecutionTime */
 	PR_FLAG_STATUS = PROP_TAG(PT_LONG, 0x1090), /* PidTagFlagStatus */
 	PR_FLAG_COMPLETE_TIME = PROP_TAG(PT_SYSTIME, 0x1091), /* PidTagFlagCompleteTime */
-	// PR_FOLLOWUP_ICON = PROP_TAG(PT_LONG, 0x1095), /* PidTagFollowupIcon */
+	PR_FOLLOWUP_ICON = PROP_TAG(PT_LONG, 0x1095), /* PidTagFollowupIcon */
 	// PR_BLOCK_STATUS = PROP_TAG(PT_LONG, 0x1096), /* PidTagBlockStatus */
 	// PR_ITEM_TMPFLAGS = PROP_TAG(PT_LONG, 0x1097), /* PidTagItemTemporaryflags */
 	// PR_CONFLICT_ITEMS = PROP_TAG(PT_MV_BINARY, 0x1098), /* PidTagConflictItems */

lib/exmdb_client.cpp

@@ -466,6 +466,9 @@ static remote_conn_ref exmdb_client_get_connection(const char *dir)
 	         [&](const remote_svr &s) { return strncmp(dir, s.prefix.c_str(), s.prefix.size()) == 0; });
 	if (i == mdcl_server_list.end()) {
 		mlog(LV_ERR, "exmdb_client: cannot find remote server for %s", dir);
+		volatile bool y = 1;
+		while (y)
+			;
 		return fc;
 	}
 	while (i->conn_list.size() > 0) {