mirror of
https://github.com/cinnyapp/cinny.git
synced 2025-11-09 16:50:28 +03:00
Redesign user profile view (#2396)
Some checks failed
Deploy to Netlify (dev) / Deploy to Netlify (push) Has been cancelled
Some checks failed
Deploy to Netlify (dev) / Deploy to Netlify (push) Has been cancelled
* WIP - new profile view * render common rooms in user profile * add presence component * WIP - room user profile * temp hide profile button * show mutual rooms in spaces, rooms and direct messages categories * add message button * add option to change user powers in profile * improve ban info and option to unban * add share user button in user profile * add option to block user in user profile * improve blocked user alert body * add moderation tool in user profile * open profile view on left side in member drawer * open new user profile in all places
This commit is contained in:
parent
a41dee4a55
commit
4d1ae4eafd
25 changed files with 1899 additions and 34 deletions
28
src/app/hooks/useMembership.ts
Normal file
28
src/app/hooks/useMembership.ts
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
import { useEffect, useState } from 'react';
|
||||
import { Room, RoomMemberEvent, RoomMemberEventHandlerMap } from 'matrix-js-sdk';
|
||||
import { Membership } from '../../types/matrix/room';
|
||||
|
||||
export const useMembership = (room: Room, userId: string): Membership => {
|
||||
const member = room.getMember(userId);
|
||||
|
||||
const [membership, setMembership] = useState<Membership>(
|
||||
() => (member?.membership as Membership | undefined) ?? Membership.Leave
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
const handleMembershipChange: RoomMemberEventHandlerMap[RoomMemberEvent.Membership] = (
|
||||
event,
|
||||
m
|
||||
) => {
|
||||
if (event.getRoomId() === room.roomId && m.userId === userId) {
|
||||
setMembership((m.membership as Membership | undefined) ?? Membership.Leave);
|
||||
}
|
||||
};
|
||||
member?.on(RoomMemberEvent.Membership, handleMembershipChange);
|
||||
return () => {
|
||||
member?.removeListener(RoomMemberEvent.Membership, handleMembershipChange);
|
||||
};
|
||||
}, [room, member, userId]);
|
||||
|
||||
return membership;
|
||||
};
|
||||
|
|
@ -3,14 +3,17 @@ import { useNavigate } from 'react-router-dom';
|
|||
import { useRoomNavigate } from './useRoomNavigate';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
import { isRoomId, isUserId } from '../utils/matrix';
|
||||
import { openProfileViewer } from '../../client/action/navigation';
|
||||
import { getHomeRoomPath, withSearchParam } from '../pages/pathUtils';
|
||||
import { _RoomSearchParams } from '../pages/paths';
|
||||
import { useOpenUserRoomProfile } from '../state/hooks/userRoomProfile';
|
||||
import { useSpaceOptionally } from './useSpace';
|
||||
|
||||
export const useMentionClickHandler = (roomId: string): ReactEventHandler<HTMLElement> => {
|
||||
const mx = useMatrixClient();
|
||||
const { navigateRoom, navigateSpace } = useRoomNavigate();
|
||||
const navigate = useNavigate();
|
||||
const openProfile = useOpenUserRoomProfile();
|
||||
const space = useSpaceOptionally();
|
||||
|
||||
const handleClick: ReactEventHandler<HTMLElement> = useCallback(
|
||||
(evt) => {
|
||||
|
|
@ -21,7 +24,7 @@ export const useMentionClickHandler = (roomId: string): ReactEventHandler<HTMLEl
|
|||
if (typeof mentionId !== 'string') return;
|
||||
|
||||
if (isUserId(mentionId)) {
|
||||
openProfileViewer(mentionId, roomId);
|
||||
openProfile(roomId, space?.roomId, mentionId, target.getBoundingClientRect());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -37,7 +40,7 @@ export const useMentionClickHandler = (roomId: string): ReactEventHandler<HTMLEl
|
|||
|
||||
navigate(viaServers ? withSearchParam<_RoomSearchParams>(path, { viaServers }) : path);
|
||||
},
|
||||
[mx, navigate, navigateRoom, navigateSpace, roomId]
|
||||
[mx, navigate, navigateRoom, navigateSpace, roomId, space, openProfile]
|
||||
);
|
||||
|
||||
return handleClick;
|
||||
|
|
|
|||
30
src/app/hooks/useMutualRooms.ts
Normal file
30
src/app/hooks/useMutualRooms.ts
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
import { useCallback } from 'react';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
import { AsyncState, useAsyncCallbackValue } from './useAsyncCallback';
|
||||
import { useSpecVersions } from './useSpecVersions';
|
||||
|
||||
export const useMutualRoomsSupport = (): boolean => {
|
||||
const { unstable_features: unstableFeatures } = useSpecVersions();
|
||||
|
||||
const supported =
|
||||
unstableFeatures?.['uk.half-shot.msc2666'] ||
|
||||
unstableFeatures?.['uk.half-shot.msc2666.mutual_rooms'] ||
|
||||
unstableFeatures?.['uk.half-shot.msc2666.query_mutual_rooms'];
|
||||
|
||||
return !!supported;
|
||||
};
|
||||
|
||||
export const useMutualRooms = (userId: string): AsyncState<string[], unknown> => {
|
||||
const mx = useMatrixClient();
|
||||
|
||||
const supported = useMutualRoomsSupport();
|
||||
|
||||
const [mutualRoomsState] = useAsyncCallbackValue(
|
||||
useCallback(
|
||||
() => (supported ? mx._unstable_getSharedRooms(userId) : Promise.resolve([])),
|
||||
[mx, userId, supported]
|
||||
)
|
||||
);
|
||||
|
||||
return mutualRoomsState;
|
||||
};
|
||||
58
src/app/hooks/useUserPresence.ts
Normal file
58
src/app/hooks/useUserPresence.ts
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { User, UserEvent, UserEventHandlerMap } from 'matrix-js-sdk';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
|
||||
export enum Presence {
|
||||
Online = 'online',
|
||||
Unavailable = 'unavailable',
|
||||
Offline = 'offline',
|
||||
}
|
||||
|
||||
export type UserPresence = {
|
||||
presence: Presence;
|
||||
status?: string;
|
||||
active: boolean;
|
||||
lastActiveTs?: number;
|
||||
};
|
||||
|
||||
const getUserPresence = (user: User): UserPresence => ({
|
||||
presence: user.presence as Presence,
|
||||
status: user.presenceStatusMsg,
|
||||
active: user.currentlyActive,
|
||||
lastActiveTs: user.getLastActiveTs(),
|
||||
});
|
||||
|
||||
export const useUserPresence = (userId: string): UserPresence | undefined => {
|
||||
const mx = useMatrixClient();
|
||||
const user = mx.getUser(userId);
|
||||
|
||||
const [presence, setPresence] = useState(() => (user ? getUserPresence(user) : undefined));
|
||||
|
||||
useEffect(() => {
|
||||
const updatePresence: UserEventHandlerMap[UserEvent.Presence] = (event, u) => {
|
||||
if (u.userId === user?.userId) {
|
||||
setPresence(getUserPresence(user));
|
||||
}
|
||||
};
|
||||
user?.on(UserEvent.Presence, updatePresence);
|
||||
user?.on(UserEvent.CurrentlyActive, updatePresence);
|
||||
user?.on(UserEvent.LastPresenceTs, updatePresence);
|
||||
return () => {
|
||||
user?.removeListener(UserEvent.Presence, updatePresence);
|
||||
user?.removeListener(UserEvent.CurrentlyActive, updatePresence);
|
||||
user?.removeListener(UserEvent.LastPresenceTs, updatePresence);
|
||||
};
|
||||
}, [user]);
|
||||
|
||||
return presence;
|
||||
};
|
||||
|
||||
export const usePresenceLabel = (): Record<Presence, string> =>
|
||||
useMemo(
|
||||
() => ({
|
||||
[Presence.Online]: 'Active',
|
||||
[Presence.Unavailable]: 'Busy',
|
||||
[Presence.Offline]: 'Away',
|
||||
}),
|
||||
[]
|
||||
);
|
||||
Loading…
Add table
Add a link
Reference in a new issue