mirrors/cinny
1
0
Fork 0
mirror of https://github.com/cinnyapp/cinny.git synced 2025-02-23 21:53:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix dm room util function

Browse source
This commit is contained in:
Ajay Bura 2024-03-23 21:08:02 +05:30
parent 2c6b4b4c52
commit 8458c6c578
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/hooks/useCommands.ts
View file

@ -1,6 +1,6 @@
import { MatrixClient, Room } from 'matrix-js-sdk'; import { MatrixClient, Room } from 'matrix-js-sdk';
import { useMemo } from 'react'; import { useMemo } from 'react';
import { hasDMWith, isRoomAlias, isRoomId, isUserId } from '../utils/matrix'; import { getDMRoomFor, isRoomAlias, isRoomId, isUserId } from '../utils/matrix';
import { selectRoom } from '../../client/action/navigation'; import { selectRoom } from '../../client/action/navigation';
import { hasDevices } from '../../util/matrixUtil'; import { hasDevices } from '../../util/matrixUtil';
import * as roomActions from '../../client/action/room'; import * as roomActions from '../../client/action/room';
@ -84,7 +84,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
const userIds = rawIds.filter((id) => isUserId(id) && id !== mx.getUserId()); const userIds = rawIds.filter((id) => isUserId(id) && id !== mx.getUserId());
if (userIds.length === 0) return; if (userIds.length === 0) return;
if (userIds.length === 1) { if (userIds.length === 1) {
const dmRoomId = hasDMWith(mx, userIds[0]); const dmRoomId = getDMRoomFor(mx, userIds[0])?.roomId;
if (dmRoomId) { if (dmRoomId) {
selectRoom(dmRoomId); selectRoom(dmRoomId);
return; return;

5
src/app/utils/matrix.ts
View file

@ -7,6 +7,7 @@ import {
MatrixClient, MatrixClient,
MatrixError, MatrixError,
MatrixEvent, MatrixEvent,
Room,
UploadProgress, UploadProgress,
UploadResponse, UploadResponse,
} from 'matrix-js-sdk'; } from 'matrix-js-sdk';
@ -164,10 +165,10 @@ export const factoryEventSentBy = (senderId: string) => (ev: MatrixEvent) =>
export const eventWithShortcode = (ev: MatrixEvent) => export const eventWithShortcode = (ev: MatrixEvent) =>
typeof ev.getContent().shortcode === 'string'; typeof ev.getContent().shortcode === 'string';
export function hasDMWith(mx: MatrixClient, userId: string) { export const getDMRoomFor = (mx: MatrixClient, userId: string): Room | undefined => {
const dmLikeRooms = mx const dmLikeRooms = mx
.getRooms() .getRooms()
.filter((room) => mx.isRoomEncrypted(room.roomId) && room.getMembers().length <= 2); .filter((room) => mx.isRoomEncrypted(room.roomId) && room.getMembers().length <= 2);
return dmLikeRooms.find((room) => room.getMember(userId)); return dmLikeRooms.find((room) => room.getMember(userId));
} };