verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] Messages not loading for unjoined channels (#3904) 

* Fix message loading for unjoined channels

* Update updateMessages.ts

* log -> console.log

Co-authored-by: Diego Mello <diegolmello@gmail.com>
This commit is contained in:
Gleidson Daniel Silva 2022-03-21 15:57:23 -03:00 committed by GitHub
parent 0582cdfa61
commit 8a12924904
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/lib/methods/updateMessages.ts
View File

@ -1,14 +1,14 @@
import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';
import { Q } from '@nozbe/watermelondb'; import { Q } from '@nozbe/watermelondb';
import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';
import database from '../database';
import { Encryption } from '../encryption';
import { MESSAGE_TYPE_ANY_LOAD } from '../../constants/messageTypeLoad'; import { MESSAGE_TYPE_ANY_LOAD } from '../../constants/messageTypeLoad';
import { generateLoadMoreId } from '../utils'; import { IMessage, TMessageModel, TSubscriptionModel, TThreadMessageModel, TThreadModel } from '../../definitions';
import protectedFunction from './helpers/protectedFunction'; import database from '../database';
import buildMessage from './helpers/buildMessage';
import { IMessage, TMessageModel, TThreadMessageModel, TThreadModel } from '../../definitions';
import { getSubscriptionByRoomId } from '../database/services/Subscription'; import { getSubscriptionByRoomId } from '../database/services/Subscription';
import { Encryption } from '../encryption';
import { generateLoadMoreId } from '../utils';
import buildMessage from './helpers/buildMessage';
import protectedFunction from './helpers/protectedFunction';
interface IUpdateMessages { interface IUpdateMessages {
rid: string; rid: string;
@ -27,9 +27,11 @@ export default async function updateMessages({
return Promise.resolve(0); return Promise.resolve(0);
} }
const sub = await getSubscriptionByRoomId(rid); let sub = (await getSubscriptionByRoomId(rid)) as TSubscriptionModel;
if (!sub) { if (!sub) {
throw new Error('updateMessages: subscription not found'); sub = { id: rid } as any;
// TODO: If I didn't join the room I obviously don't have a subscription, this error catch is imperfect. Think of a way to handle the error when I actually try to open a room without subscription.
console.log('updateMessages: subscription not found');
} }
const db = database.active; const db = database.active;