Skip to content

[FIX] Messages being sent but showing as temp status #1469

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
diegolmello merged 1 commit into from
Dec 13, 2019
Merged

[FIX] Messages being sent but showing as temp status #1469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 32 additions & 23 deletions app/lib/methods/sendMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,36 @@ import database from '../database';
import log from '../../utils/log';
import random from '../../utils/random';

const changeMessageStatus = async(id, tmid, status) => {
const db = database.active;
const msgCollection = db.collections.get('messages');
const threadMessagesCollection = db.collections.get('thread_messages');
const successBatch = [];
const messageRecord = await msgCollection.find(id);
successBatch.push(
messageRecord.prepareUpdate((m) => {
m.status = status;
})
);

if (tmid) {
const threadMessageRecord = await threadMessagesCollection.find(id);
successBatch.push(
threadMessageRecord.prepareUpdate((tm) => {
tm.status = status;
})
);
}

try {
await db.action(async() => {
await db.batch(...successBatch);
});
} catch (error) {
// Do nothing
}
};

export async function sendMessageCall(message) {
const {
id: _id, subscription: { id: rid }, msg, tmid
Expand All @@ -17,30 +47,9 @@ export async function sendMessageCall(message) {
_id, rid, msg, tmid
}
});
await changeMessageStatus(_id, tmid, messagesStatus.SENT);
} catch (e) {
const db = database.active;
const msgCollection = db.collections.get('messages');
const threadMessagesCollection = db.collections.get('thread_messages');
const errorBatch = [];
const messageRecord = await msgCollection.find(_id);
errorBatch.push(
messageRecord.prepareUpdate((m) => {
m.status = messagesStatus.ERROR;
})
);

if (tmid) {
const threadMessageRecord = await threadMessagesCollection.find(_id);
errorBatch.push(
threadMessageRecord.prepareUpdate((tm) => {
tm.status = messagesStatus.ERROR;
})
);
}

await db.action(async() => {
await db.batch(...errorBatch);
});
await changeMessageStatus(_id, tmid, messagesStatus.ERROR);
}
}

Expand Down
4 changes: 0 additions & 4 deletions app/views/RoomView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,16 +250,12 @@ class RoomView extends React.Component {

if (appState === 'foreground' && appState !== prevProps.appState && this.rid) {
this.onForegroundInteraction = InteractionManager.runAfterInteractions(() => {
this.init();
// Fire List.init() just to keep observables working
if (this.list && this.list.current) {
this.list.current.init();
}
});
}
if (appState === 'background' && appState !== prevProps.appState) {
this.unsubscribe();
}
}

async componentWillUnmount() {
Expand Down