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

Fix open channel of existing DM (#7126)

Browse source
This commit is contained in:
Elias Nahum 2023-02-15 11:19:00 +02:00 committed by GitHub
parent 1b94bbc0ad
commit 9d6558e6e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/queries/servers/channel.ts
View file

@ -17,6 +17,7 @@ import {observeCurrentChannelId, getCurrentChannelId, observeCurrentUserId} from
import {observeTeammateNameDisplay} from './user';
import type ServerDataOperator from '@database/operator/server_data_operator';
import type {Clause} from '@nozbe/watermelondb/QueryDescription';
import type ChannelModel from '@typings/database/models/servers/channel';
import type ChannelInfoModel from '@typings/database/models/servers/channel_info';
import type ChannelMembershipModel from '@typings/database/models/servers/channel_membership';
@ -225,7 +226,12 @@ export const observeChannel = (database: Database, channelId: string) => {
};
export const getChannelByName = async (database: Database, teamId: string, channelName: string) => {
const channels = await database.get<ChannelModel>(CHANNEL).query(Q.on(TEAM, 'id', teamId), Q.where('name', channelName)).fetch();
const clauses: Clause[] = [];
if (teamId) {
clauses.push(Q.on(TEAM, 'id', teamId));
}
clauses.push(Q.where('name', channelName));
const channels = await database.get<ChannelModel>(CHANNEL).query(...clauses).fetch();
// Check done to force types
if (channels.length) {