Skip to content

[FIX] Messages not loading for unjoined channels #3904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dnlsilva merged 6 commits into from
Mar 21, 2022
Merged

[FIX] Messages not loading for unjoined channels #3904

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6dfdc0
Fix message loading for unjoined channels
dnlsilva Mar 15, 2022
7bd41c8
Update updateMessages.ts
dnlsilva Mar 15, 2022
8ead547
log -> console.log
diegolmello Mar 17, 2022
33d6c2f
Merge branch 'develop' into fix-message-loading-for-unjoined-channels
dnlsilva Mar 18, 2022
dea694b
Merge branch 'develop' into fix-message-loading-for-unjoined-channels
dnlsilva Mar 18, 2022
ff3c465
Merge branch 'develop' into fix-message-loading-for-unjoined-channels
dnlsilva Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions app/lib/methods/updateMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';
import { Q } from '@nozbe/watermelondb';
import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';

import { MESSAGE_TYPE_ANY_LOAD } from '../../constants/messageTypeLoad';
import { IMessage, TMessageModel, TSubscriptionModel, TThreadMessageModel, TThreadModel } from '../../definitions';
import database from '../database';
import { getSubscriptionByRoomId } from '../database/services/Subscription';
import { Encryption } from '../encryption';
import { MESSAGE_TYPE_ANY_LOAD } from '../../constants/messageTypeLoad';
import { generateLoadMoreId } from '../utils';
import protectedFunction from './helpers/protectedFunction';
import buildMessage from './helpers/buildMessage';
import { IMessage, TMessageModel, TThreadMessageModel, TThreadModel } from '../../definitions';
import { getSubscriptionByRoomId } from '../database/services/Subscription';
import protectedFunction from './helpers/protectedFunction';

interface IUpdateMessages {
rid: string;
Expand All @@ -27,9 +27,11 @@ export default async function updateMessages({
return Promise.resolve(0);
}

const sub = await getSubscriptionByRoomId(rid);
let sub = (await getSubscriptionByRoomId(rid)) as TSubscriptionModel;
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;
Expand Down