From 9d6558e6e8f2da736d4fb10a7063828174cfc7cc Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 15 Feb 2023 11:19:00 +0200 Subject: [PATCH] Fix open channel of existing DM (#7126) --- app/queries/servers/channel.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/queries/servers/channel.ts b/app/queries/servers/channel.ts index 7ac1136e8a..07820c4cb0 100644 --- a/app/queries/servers/channel.ts +++ b/app/queries/servers/channel.ts @@ -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(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(CHANNEL).query(...clauses).fetch(); // Check done to force types if (channels.length) {