sergiodt
/
vn-verdnaturachat
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IMPROVE] Add support for ephemeral messages inside threads (#3687)

This commit is contained in:
Diego Mello 2022-02-15 15:46:17 -03:00 committed by GitHub
parent 765c5c50f8
commit c7f4e5531c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/lib/methods/subscriptions/rooms.js
View File

@ -1,5 +1,6 @@
import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord'; import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';
import { InteractionManager } from 'react-native'; import { InteractionManager } from 'react-native';
import EJSON from 'ejson';
import database from '../../database'; import database from '../../database';
import { merge } from '../helpers/mergeSubscriptionsRooms'; import { merge } from '../helpers/mergeSubscriptionsRooms';
@ -17,6 +18,7 @@ import { setUser } from '../../../actions/login';
import { INAPP_NOTIFICATION_EMITTER } from '../../../containers/InAppNotification'; import { INAPP_NOTIFICATION_EMITTER } from '../../../containers/InAppNotification';
import { Encryption } from '../../encryption'; import { Encryption } from '../../encryption';
import { E2E_MESSAGE_TYPE } from '../../encryption/constants'; import { E2E_MESSAGE_TYPE } from '../../encryption/constants';
import updateMessages from '../updateMessages';
const removeListener = listener => listener.stop(); const removeListener = listener => listener.stop();
@ -309,32 +311,18 @@ export default function subscribeRooms() {
} }
} }
if (/message/.test(ev)) { if (/message/.test(ev)) {
try {
const [args] = ddpMessage.fields.args; const [args] = ddpMessage.fields.args;
const _id = random(17); const _id = random(17);
const message = { const message = {
_id,
rid: args.rid,
msg: args.msg,
blocks: args.blocks,
ts: new Date(),
_updatedAt: new Date(),
status: messagesStatus.SENT,
u: { u: {
_id, _id,
username: 'rocket.cat' username: 'rocket.cat',
} name: 'Rocket Cat'
},
...buildMessage(EJSON.fromJSONValue(args))
}; };
try { await updateMessages({ rid: args.rid, update: [message] });
const msgCollection = db.get('messages');
await db.action(async () => {
await msgCollection.create(
protectedFunction(m => {
m._raw = sanitizedRaw({ id: message._id }, msgCollection.schema);
m.subscription.id = args.rid;
Object.assign(m, message);
})
);
});
} catch (e) { } catch (e) {
log(e); log(e);
} }