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

Fix: Team mention count including muted channel (#9161)

Browse source 
* Fix: Team mention count including muted channel

* Added test
This commit is contained in:
Rajat Dabade 2025-09-30 18:53:00 +05:30 committed by GitHub
parent 2d6a5d5097
commit ffa40dac11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 206 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

201
app/database/subscription/unreads.test.ts Normal file
View file

@ -0,0 +1,201 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
import DatabaseManager from '@database/manager';
import TestHelper from '@test/test_helper';
import {subscribeMentionsByServer} from './unreads';
import type ServerDataOperator from '@database/operator/server_data_operator';
describe('subscribeMentionsByServer', () => {
const serverUrl = 'test-server';
let operator: ServerDataOperator;
beforeEach(async () => {
await DatabaseManager.init([serverUrl]);
const serverDatabaseAndOperator = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
operator = serverDatabaseAndOperator.operator;
});
afterEach(async () => {
await DatabaseManager.destroyServerDatabase(serverUrl);
});
it('should exclude muted channels from mentions count', async () => {
const channels: Channel[] = [
TestHelper.fakeChannel({
id: 'muted-channel-test',
name: 'muted-channel',
display_name: 'Muted Channel',
type: 'O',
delete_at: 0,
team_id: 'team1',
}),
TestHelper.fakeChannel({
id: 'non-muted-channel-test',
name: 'non-muted-channel',
display_name: 'Non Muted Channel',
type: 'O',
delete_at: 0,
team_id: 'team1',
}),
];
const myChannels: ChannelMembership[] = [
{
id: 'muted-channel-test',
user_id: 'user1',
channel_id: 'muted-channel-test',
last_post_at: Date.now(),
last_viewed_at: Date.now(),
last_update_at: Date.now(),
mention_count: 5,
msg_count: 10,
roles: 'user',
notify_props: {
desktop: 'default',
email: 'default',
mark_unread: 'mention',
push: 'default',
ignore_channel_mentions: 'default',
},
},
{
id: 'non-muted-channel-test',
user_id: 'user1',
channel_id: 'non-muted-channel-test',
last_post_at: Date.now(),
last_viewed_at: Date.now(),
last_update_at: Date.now(),
mention_count: 3,
msg_count: 15,
roles: 'user',
notify_props: {
desktop: 'default',
email: 'default',
mark_unread: 'all',
push: 'default',
ignore_channel_mentions: 'default',
},
},
];
await operator.handleChannel({channels, prepareRecordsOnly: false});
await operator.handleMyChannel({channels, myChannels, prepareRecordsOnly: false});
return new Promise<void>((resolve, reject) => {
const subscription = subscribeMentionsByServer(serverUrl, (url, {myChannels: filteredChannels, threadMentionCount}) => {
try {
expect(url).toBe(serverUrl);
expect(filteredChannels).toBeDefined();
expect(Array.isArray(filteredChannels)).toBe(true);
const nonMutedChannel = filteredChannels.find((ch) => ch.id === 'non-muted-channel-test');
const mutedChannel = filteredChannels.find((ch) => ch.id === 'muted-channel-test');
expect(mutedChannel).toBeUndefined();
if (nonMutedChannel) {
expect(nonMutedChannel.mentionsCount).toBe(3);
}
expect(threadMentionCount).toBe(0);
subscription?.unsubscribe();
resolve();
} catch (error) {
subscription?.unsubscribe();
reject(error);
}
});
setTimeout(() => {
subscription?.unsubscribe();
reject(new Error('Subscription did not emit data within timeout'));
}, 1000);
});
});
it('should exclude all channels when all are muted', async () => {
const channels: Channel[] = [
TestHelper.fakeChannel({
id: 'muted-channel-1',
name: 'muted-channel-1',
display_name: 'Muted Channel 1',
type: 'O',
delete_at: 0,
team_id: 'team1',
}),
TestHelper.fakeChannel({
id: 'muted-channel-2',
name: 'muted-channel-2',
display_name: 'Muted Channel 2',
type: 'O',
delete_at: 0,
team_id: 'team1',
}),
];
const myChannels: ChannelMembership[] = [
{
id: 'muted-channel-1',
user_id: 'user1',
channel_id: 'muted-channel-1',
last_post_at: Date.now(),
last_viewed_at: Date.now(),
last_update_at: Date.now(),
mention_count: 7,
msg_count: 10,
roles: 'user',
notify_props: {
desktop: 'default',
email: 'default',
mark_unread: 'mention',
push: 'default',
ignore_channel_mentions: 'default',
},
},
{
id: 'muted-channel-2',
user_id: 'user1',
channel_id: 'muted-channel-2',
last_post_at: Date.now(),
last_viewed_at: Date.now(),
last_update_at: Date.now(),
mention_count: 4,
msg_count: 15,
roles: 'user',
notify_props: {
desktop: 'default',
email: 'default',
mark_unread: 'mention',
push: 'default',
ignore_channel_mentions: 'default',
},
},
];
await operator.handleChannel({channels, prepareRecordsOnly: false});
await operator.handleMyChannel({channels, myChannels, prepareRecordsOnly: false});
return new Promise<void>((resolve, reject) => {
const subscription = subscribeMentionsByServer(serverUrl, (url, {myChannels: filteredChannels}) => {
try {
const testChannel1 = filteredChannels.find((ch) => ch.id === 'muted-channel-1');
const testChannel2 = filteredChannels.find((ch) => ch.id === 'muted-channel-2');
expect(testChannel1).toBeUndefined();
expect(testChannel2).toBeUndefined();
subscription?.unsubscribe();
resolve();
} catch (error) {
subscription?.unsubscribe();
reject(error);
}
});
setTimeout(() => {
subscription?.unsubscribe();
reject(new Error('Subscription did not emit data within timeout'));
}, 1000);
});
});
});

7
app/database/subscription/unreads.ts
View file

@ -13,7 +13,7 @@ import {getIsCRTEnabled, observeThreadMentionCount, queryThreads, observeUnreads
import type MyChannelModel from '@typings/database/models/servers/my_channel';
const {SERVER: {CHANNEL, MY_CHANNEL}} = MM_TABLES;
const {SERVER: {CHANNEL, MY_CHANNEL, MY_CHANNEL_SETTINGS}} = MM_TABLES;
export type UnreadObserverArgs = {
myChannels: MyChannelModel[];
@ -57,7 +57,10 @@ export const subscribeMentionsByServer = (serverUrl: string, observer: ServerUnr
if (server?.database) {
subscription = server.database.
get<MyChannelModel>(MY_CHANNEL).
query(Q.on(CHANNEL, Q.where('delete_at', Q.eq(0)))).
query(
Q.on(CHANNEL, Q.where('delete_at', Q.eq(0))),
Q.on(MY_CHANNEL_SETTINGS, Q.where('notify_props', Q.notLike('%"mark_unread":"mention"%'))),
).
observeWithColumns(['mentions_count']).
pipe(
combineLatestWith(observeThreadMentionCount(server.database, {includeDmGm: true})),