mirrors/cinny
1
0
Fork 0
mirror of https://github.com/cinnyapp/cinny.git synced 2025-11-13 02:30:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

added support for alias search in public channels

Browse source
This commit is contained in:
unknown 2021-08-08 14:28:22 +05:30
parent 4ec770da63
commit 6586f933ff
3 changed files with 117 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/client/action/room.js
View file

@ -83,20 +83,24 @@ function guessDMRoomTargetId(room, myUserId) {
* @param {string} roomId
* @param {boolean} isDM
*/
function join(roomId, isDM) {
async function join(roomIdOrAlias, isDM) {
const mx = initMatrix.matrixClient;
mx.joinRoom(roomId)
.then(async () => {
if (isDM) {
const targetUserId = guessDMRoomTargetId(mx.getRoom(roomId), mx.getUserId());
await addRoomToMDirect(roomId, targetUserId);
}
appDispatcher.dispatch({
type: cons.actions.room.JOIN,
roomId,
isDM,
});
}).catch();
try {
const resultRoom = await mx.joinRoom(roomIdOrAlias);
if (isDM) {
const targetUserId = guessDMRoomTargetId(mx.getRoom(resultRoom.roomId), mx.getUserId());
await addRoomToMDirect(resultRoom.roomId, targetUserId);
}
appDispatcher.dispatch({
type: cons.actions.room.JOIN,
roomId: resultRoom.roomId,
isDM,
});
return resultRoom.roomId;
} catch (e) {
throw new Error(e);
}
}
/**
@ -104,8 +108,9 @@ function join(roomId, isDM) {
* @param {string} roomId
* @param {boolean} isDM
*/
function leave(roomId, isDM) {
function leave(roomId) {
const mx = initMatrix.matrixClient;
const isDM = initMatrix.roomList.directs.has(roomId);
mx.leave(roomId)
.then(() => {
appDispatcher.dispatch({