Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Explicitly sort messages before pruning

Browse Source 
to avoid a race-condition where messages aren't sorted and the wrong
message gets pruned.
This commit is contained in:
JC Brand 2022-03-14 21:19:43 +01:00
parent d2b9c954d9
commit 82fb263438
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/headless/plugins/chat/model.js
View File

@ -6,7 +6,7 @@ import log from '@converse/headless/log';
import pick from "lodash-es/pick";
import { Model } from '@converse/skeletor/src/model.js';
import { _converse, api, converse } from "../../core.js";
import { debouncedPruneHistory, pruneHistory } from '@converse/headless/shared/chat/utils.js';
import { debouncedPruneHistory } from '@converse/headless/shared/chat/utils.js';
import { getMediaURLsMetadata } from '@converse/headless/shared/parsers.js';
import { getOpenPromise } from '@converse/openpromise';
import { initStorage } from '@converse/headless/utils/storage.js';
@ -350,7 +350,7 @@ const ChatBox = ModelWithContact.extend({
api.settings.get('pruning_behavior') === 'unscrolled' &&
!this.ui.get('scrolled')
) {
pruneHistory(this);
debouncedPruneHistory(this);
}
},

5
src/headless/shared/chat/utils.js
View File

@ -7,6 +7,9 @@ export function pruneHistory (model) {
const max_history = api.settings.get('prune_messages_above');
if (max_history && typeof max_history === 'number') {
if (model.messages.length > max_history) {
model.messages.sort(); // Explicitly call sort() to avoid race-conditions
const non_empty_messages = model.messages.filter((m) => !u.isEmptyMessage(m));
if (non_empty_messages.length > max_history) {
while (non_empty_messages.length > max_history) {
@ -58,4 +61,4 @@ export function getMediaURLs (arr, text, offset=0) {
}).filter(o => o);
}
export const debouncedPruneHistory = debounce(pruneHistory, 250);
export const debouncedPruneHistory = debounce(pruneHistory, 500);