toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: remove from channel (#8539)

Browse source
This commit is contained in:
Elias Nahum 2025-02-01 01:09:46 +08:00 committed by GitHub
parent 6f8d6632b6
commit a1da0a720f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
app/actions/remote/channel.ts
View file

@ -411,14 +411,32 @@ export async function fetchAllMyChannelsForAllTeams(serverUrl: string, since: nu
}
const client = NetworkManager.getClient(serverUrl);
const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
async function fetchAllMemberships() {
const results: ChannelMembership[] = [];
async function fetchNextMembershipsPage(page: number) {
try {
const memberships = await client.getAllMyChannelMembersFromAllTeams(page, General.CHANNEL_MEMBERS_CHUNK_SIZE, groupLabel);
results.push(...memberships);
if (memberships.length < General.CHANNEL_MEMBERS_CHUNK_SIZE) {
return;
}
await fetchNextMembershipsPage(page + 1);
} catch (e) {
logError(`fetchAllMyChannelsForAllTeams error: Failed to fetch memberships for page ${page} `, e);
}
}
await fetchNextMembershipsPage(0);
return results;
}
const promises: [Promise<Channel[]>, Promise<ChannelMembership[]>] = [
client.getAllChannelsFromAllTeams(since, since > 0, groupLabel),
client.getAllMyChannelMembersFromAllTeams(0, General.CHANNEL_MEMBERS_CHUNK_SIZE, groupLabel),
fetchAllMemberships(),
];
const [channels, memberships] = await Promise.all(promises);
const remaining = Math.floor(channels.length / General.CHANNEL_MEMBERS_CHUNK_SIZE);
const remainingMembershipsPromises = [];
const categoriesPromises = [];
const teamIdsSet = channels.reduce<Set<string>>((set, c) => {
@ -427,24 +445,15 @@ export async function fetchAllMyChannelsForAllTeams(serverUrl: string, since: nu
}
return set;
}, new Set());
for (const teamId of teamIdsSet) {
categoriesPromises.push(client.getCategories('me', teamId, groupLabel));
}
if (remaining > 0) {
for (let i = 1; i <= remaining; i++) {
remainingMembershipsPromises.push(client.getAllMyChannelMembersFromAllTeams(i, General.CHANNEL_MEMBERS_CHUNK_SIZE, groupLabel));
}
}
const results = await Promise.all([...remainingMembershipsPromises, ...categoriesPromises]);
const categories: CategoryWithChannels[] = [];
const results = await Promise.all(categoriesPromises);
for (const result of results) {
if (Array.isArray(result)) {
memberships.push(...result);
} else if ('categories' in result) {
categories.push(...result.categories);
}
categories.push(...result.categories);
}
if (!fetchOnly) {

2
package-lock.json generated
View file

@ -6,7 +6,7 @@
"packages": {
"": {
"name": "mattermost-mobile",
"version": "2.24.0",
"version": "2.25.0",
"hasInstallScript": true,
"license": "Apache 2.0",
"dependencies": {