Skip to content

Commit

Permalink
fetchMessages --> script updated and this is working 100% now.
Browse files Browse the repository at this point in the history
  • Loading branch information
JasminDreasond committed Feb 9, 2025
1 parent 7ca1331 commit 0ba9a53
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions src/client/initMatrix.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,13 @@ class InitMatrix extends EventEmitter {
}
}

async fetchMessage(roomId, limit = 10, filter = null, fromToken = null, dir = 'b') {
async fetchMessages(
roomId,
limit = 10,
filter = null,
fromToken = null,
dir = sdk.Direction.Backward,
) {
// Request parameters
const params = {
dir, // "b" = backward (old events), "f" = forward
Expand All @@ -87,21 +93,21 @@ class InitMatrix extends EventEmitter {
if (mEvent.getType() === 'm.room.encrypted') {
try {
const decrypted = await this.matrixClient.getCrypto().decryptEvent(mEvent);
return {
mEvent,
decrypted: decrypted.clearEvent.content.body, // Decrypted message
};
} catch (error) {
return { mEvent, decrypted: null, eventError: error };
if (objType(decrypted, 'object')) {
if (objType(decrypted.clearEvent, 'object')) mEvent.clearEvent = decrypted.clearEvent;
return { mEvent, decrypt: decrypted };
} else return { mEvent };
} catch (err) {
return { mEvent, err };
}
}
return event;
return { mEvent };
}),
);

// Return messages and token to next page
return {
messages: decryptedMessages,
events: decryptedMessages.reverse(),
nextToken: response.end, // Token to the next page
};
}
Expand Down

0 comments on commit 0ba9a53

Please sign in to comment.