Merge pull request 'Serialize outgoing searches returning out of order.' (#9611) from supakaity/calckey:supakaity/bug9610 into develop

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9611
This commit is contained in:
Kainoa Kanter 2023-02-12 01:59:22 +00:00
commit 5a20d2af27

View File

@ -50,11 +50,14 @@ let instances: Instance[] = $ref([]);
let selected: Instance | null = $ref(null); let selected: Instance | null = $ref(null);
let dialogEl = $ref<InstanceType<typeof XModalWindow>>(); let dialogEl = $ref<InstanceType<typeof XModalWindow>>();
let searchOrderLatch = 0;
const search = () => { const search = () => {
if (hostname === '') { if (hostname === '') {
instances = []; instances = [];
return; return;
} }
const searchId = ++searchOrderLatch;
os.api('federation/instances', { os.api('federation/instances', {
host: hostname, host: hostname,
limit: 10, limit: 10,
@ -62,6 +65,7 @@ const search = () => {
suspended: false, suspended: false,
sort: '+pubSub', sort: '+pubSub',
}).then(_instances => { }).then(_instances => {
if (searchId !== searchOrderLatch) return;
instances = _instances.map(x => ({ instances = _instances.map(x => ({
id: x.id, id: x.id,
host: x.host, host: x.host,