anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'kkonsw/resync' into master-windows-changes-test

Browse source
This commit is contained in:
Maxim Logaev 2024-03-12 18:51:50 +03:00
parent f1aed531e2 ecb3fb0056
commit 2587a7e6a9
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libdino/src/service/history_sync.vala
View file

@ -131,18 +131,24 @@ public class Dino.HistorySync {
.single().row(); .single().row();
Row? latest_row = latest_row_opt.is_present() ? latest_row_opt.inner : null; Row? latest_row = latest_row_opt.is_present() ? latest_row_opt.inner : null;
if (latest_row == null) { int? db_id = null;
warning("Failed to fetch history for %s, no mam catchup data", target.to_string()); string? latest_id = null;
return; if (latest_row != null) {
// Local mam catchup data exists so we can filter messages based on the latest id
db_id = latest_row[db.mam_catchup.id];
latest_id = latest_row[db.mam_catchup.from_id];
} }
DateTime latest_time = new DateTime.now(); DateTime latest_time = new DateTime.now();
string latest_id = latest_row[db.mam_catchup.from_id];
Xmpp.MessageArchiveManagement.V2.MamQueryParams query_params; Xmpp.MessageArchiveManagement.V2.MamQueryParams query_params;
query_params = new Xmpp.MessageArchiveManagement.V2.MamQueryParams.query_before(target, latest_time, latest_id); query_params = new Xmpp.MessageArchiveManagement.V2.MamQueryParams.query_before(target, latest_time, latest_id);
yield fetch_query(account, query_params, latest_row[db.mam_catchup.id], cancellable); if (db_id == null) {
query_params.mam_server = account.bare_jid;
query_params.with = target;
}
yield fetch_query(account, query_params, db_id, cancellable);
} }
public async void fetch_everything(Account account, Jid mam_server, Cancellable? cancellable = null, DateTime until_earliest_time = new DateTime.from_unix_utc(0)) { public async void fetch_everything(Account account, Jid mam_server, Cancellable? cancellable = null, DateTime until_earliest_time = new DateTime.from_unix_utc(0)) {
@ -346,7 +352,7 @@ public class Dino.HistorySync {
* Iteratively fetches all pages returned for a query (until a PageResult other than MorePagesAvailable is returned) * Iteratively fetches all pages returned for a query (until a PageResult other than MorePagesAvailable is returned)
* @return The last PageRequestResult result * @return The last PageRequestResult result
**/ **/
private async PageRequestResult fetch_query(Account account, Xmpp.MessageArchiveManagement.V2.MamQueryParams query_params, int db_id, Cancellable? cancellable = null) { private async PageRequestResult fetch_query(Account account, Xmpp.MessageArchiveManagement.V2.MamQueryParams query_params, int? db_id, Cancellable? cancellable = null) {
debug("[%s | %s] Fetch query %s - %s", account.bare_jid.to_string(), query_params.mam_server.to_string(), query_params.start != null ? query_params.start.to_string() : "", query_params.end != null ? query_params.end.to_string() : ""); debug("[%s | %s] Fetch query %s - %s", account.bare_jid.to_string(), query_params.mam_server.to_string(), query_params.start != null ? query_params.start.to_string() : "", query_params.end != null ? query_params.end.to_string() : "");
PageRequestResult? page_result = null; PageRequestResult? page_result = null;
do { do {
@ -358,6 +364,8 @@ public class Dino.HistorySync {
string earliest_mam_id = page_result.query_result.first; string earliest_mam_id = page_result.query_result.first;
long earliest_mam_time = (long)mam_times[account][earliest_mam_id].to_unix(); long earliest_mam_time = (long)mam_times[account][earliest_mam_id].to_unix();
if (db_id != null) {
// Update local mam catchup data if it exists
debug("Updating %s to %s, %s", query_params.mam_server.to_string(), earliest_mam_time.to_string(), earliest_mam_id); debug("Updating %s to %s, %s", query_params.mam_server.to_string(), earliest_mam_time.to_string(), earliest_mam_id);
var query = db.mam_catchup.update() var query = db.mam_catchup.update()
.with(db.mam_catchup.id, "=", db_id) .with(db.mam_catchup.id, "=", db_id)
@ -369,6 +377,8 @@ public class Dino.HistorySync {
query.set(db.mam_catchup.from_end, true); query.set(db.mam_catchup.from_end, true);
} }
query.perform(); query.perform();
}
} while (page_result.page_result == PageResult.MorePagesAvailable); } while (page_result.page_result == PageResult.MorePagesAvailable);
return page_result; return page_result;