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

Keep direct rooms orthogonal (#183)

Browse source 
Signed-off-by: ajbura <ajbura@gmail.com>
This commit is contained in:
ajbura 2022-02-05 19:25:59 +05:30
parent a9692f7db4
commit c8ae428df8
3 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/app/organisms/invite-user/InviteUser.jsx
View file

@ -6,6 +6,7 @@ import initMatrix from '../../../client/initMatrix';
import cons from '../../../client/state/cons';
import * as roomActions from '../../../client/action/room';
import { selectRoom } from '../../../client/action/navigation';
import { hasDMWith } from '../../../util/matrixUtil';
import Text from '../../atoms/text/Text';
import Button from '../../atoms/button/Button';
@ -104,6 +105,13 @@ function InviteUser({
async function createDM(userId) {
if (mx.getUserId() === userId) return;
const dmRoomId = hasDMWith(userId);
if (dmRoomId) {
selectRoom(dmRoomId);
onRequestClose();
return;
}
try {
addUserToProc(userId);
procUserError.delete(userId);

19
src/app/organisms/profile-viewer/ProfileViewer.jsx
View file

@ -10,7 +10,9 @@ import navigation from '../../../client/state/navigation';
import { selectRoom, openReusableContextMenu } from '../../../client/action/navigation';
import * as roomActions from '../../../client/action/room';
import { getUsername, getUsernameOfRoomMember, getPowerLabel } from '../../../util/matrixUtil';
import {
getUsername, getUsernameOfRoomMember, getPowerLabel, hasDMWith
} from '../../../util/matrixUtil';
import { getEventCords } from '../../../util/common';
import colorMXID from '../../../util/colorMXID';
@ -187,17 +189,12 @@ function ProfileFooter({ roomId, userId, onRequestClose }) {
}, [userId]);
const openDM = async () => {
const directIds = [...initMatrix.roomList.directs];
// Check and open if user already have a DM with userId.
for (let i = 0; i < directIds.length; i += 1) {
const dRoom = mx.getRoom(directIds[i]);
const roomMembers = dRoom.getMembers();
if (roomMembers.length <= 2 && dRoom.getMember(userId)) {
selectRoom(directIds[i]);
onRequestClose();
return;
}
const dmRoomId = hasDMWith(userId);
if (dmRoomId) {
selectRoom(dmRoomId);
onRequestClose();
return;
}
// Create new DM