mirror of
				https://github.com/cinnyapp/cinny.git
				synced 2025-11-04 14:30:29 +03:00 
			
		
		
		
	Merge branch 'cinnyapp:dev' into improve-space
This commit is contained in:
		
						commit
						2570e5e25d
					
				
					 5 changed files with 31 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -29,6 +29,7 @@ export function SearchInput({ active, loading, searchInputRef, onSearch, onReset
 | 
			
		|||
        ref={searchInputRef}
 | 
			
		||||
        style={{ paddingRight: config.space.S300 }}
 | 
			
		||||
        name="searchInput"
 | 
			
		||||
        autoFocus
 | 
			
		||||
        size="500"
 | 
			
		||||
        variant="Background"
 | 
			
		||||
        placeholder="Search for keyword"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -448,6 +448,7 @@ export function RoomTimeline({
 | 
			
		|||
  const [encUrlPreview] = useSetting(settingsAtom, 'encUrlPreview');
 | 
			
		||||
  const showUrlPreview = room.hasEncryptionStateEvent() ? encUrlPreview : urlPreview;
 | 
			
		||||
  const [showHiddenEvents] = useSetting(settingsAtom, 'showHiddenEvents');
 | 
			
		||||
  const [showDeveloperTools] = useSetting(settingsAtom, 'developerTools');
 | 
			
		||||
 | 
			
		||||
  const ignoredUsersList = useIgnoredUsers();
 | 
			
		||||
  const ignoredUsersSet = useMemo(() => new Set(ignoredUsersList), [ignoredUsersList]);
 | 
			
		||||
| 
						 | 
				
			
			@ -1065,6 +1066,7 @@ export function RoomTimeline({
 | 
			
		|||
              )
 | 
			
		||||
            }
 | 
			
		||||
            hideReadReceipts={hideActivity}
 | 
			
		||||
            showDeveloperTools={showDeveloperTools}
 | 
			
		||||
            powerLevelTag={getPowerLevelTag(senderPowerLevel)}
 | 
			
		||||
            accessibleTagColors={accessibleTagColors}
 | 
			
		||||
            legacyUsernameColor={legacyUsernameColor || direct}
 | 
			
		||||
| 
						 | 
				
			
			@ -1146,6 +1148,7 @@ export function RoomTimeline({
 | 
			
		|||
              )
 | 
			
		||||
            }
 | 
			
		||||
            hideReadReceipts={hideActivity}
 | 
			
		||||
            showDeveloperTools={showDeveloperTools}
 | 
			
		||||
            powerLevelTag={getPowerLevelTag(senderPowerLevel)}
 | 
			
		||||
            accessibleTagColors={accessibleTagColors}
 | 
			
		||||
            legacyUsernameColor={legacyUsernameColor || direct}
 | 
			
		||||
| 
						 | 
				
			
			@ -1247,6 +1250,7 @@ export function RoomTimeline({
 | 
			
		|||
              )
 | 
			
		||||
            }
 | 
			
		||||
            hideReadReceipts={hideActivity}
 | 
			
		||||
            showDeveloperTools={showDeveloperTools}
 | 
			
		||||
            powerLevelTag={getPowerLevelTag(senderPowerLevel)}
 | 
			
		||||
            accessibleTagColors={accessibleTagColors}
 | 
			
		||||
            legacyUsernameColor={legacyUsernameColor || direct}
 | 
			
		||||
| 
						 | 
				
			
			@ -1292,6 +1296,7 @@ export function RoomTimeline({
 | 
			
		|||
            messageSpacing={messageSpacing}
 | 
			
		||||
            canDelete={canRedact || mEvent.getSender() === mx.getUserId()}
 | 
			
		||||
            hideReadReceipts={hideActivity}
 | 
			
		||||
            showDeveloperTools={showDeveloperTools}
 | 
			
		||||
          >
 | 
			
		||||
            <EventContent
 | 
			
		||||
              messageLayout={messageLayout}
 | 
			
		||||
| 
						 | 
				
			
			@ -1328,6 +1333,7 @@ export function RoomTimeline({
 | 
			
		|||
            messageSpacing={messageSpacing}
 | 
			
		||||
            canDelete={canRedact || mEvent.getSender() === mx.getUserId()}
 | 
			
		||||
            hideReadReceipts={hideActivity}
 | 
			
		||||
            showDeveloperTools={showDeveloperTools}
 | 
			
		||||
          >
 | 
			
		||||
            <EventContent
 | 
			
		||||
              messageLayout={messageLayout}
 | 
			
		||||
| 
						 | 
				
			
			@ -1365,6 +1371,7 @@ export function RoomTimeline({
 | 
			
		|||
            messageSpacing={messageSpacing}
 | 
			
		||||
            canDelete={canRedact || mEvent.getSender() === mx.getUserId()}
 | 
			
		||||
            hideReadReceipts={hideActivity}
 | 
			
		||||
            showDeveloperTools={showDeveloperTools}
 | 
			
		||||
          >
 | 
			
		||||
            <EventContent
 | 
			
		||||
              messageLayout={messageLayout}
 | 
			
		||||
| 
						 | 
				
			
			@ -1402,6 +1409,7 @@ export function RoomTimeline({
 | 
			
		|||
            messageSpacing={messageSpacing}
 | 
			
		||||
            canDelete={canRedact || mEvent.getSender() === mx.getUserId()}
 | 
			
		||||
            hideReadReceipts={hideActivity}
 | 
			
		||||
            showDeveloperTools={showDeveloperTools}
 | 
			
		||||
          >
 | 
			
		||||
            <EventContent
 | 
			
		||||
              messageLayout={messageLayout}
 | 
			
		||||
| 
						 | 
				
			
			@ -1441,6 +1449,7 @@ export function RoomTimeline({
 | 
			
		|||
          messageSpacing={messageSpacing}
 | 
			
		||||
          canDelete={canRedact || mEvent.getSender() === mx.getUserId()}
 | 
			
		||||
          hideReadReceipts={hideActivity}
 | 
			
		||||
          showDeveloperTools={showDeveloperTools}
 | 
			
		||||
        >
 | 
			
		||||
          <EventContent
 | 
			
		||||
            messageLayout={messageLayout}
 | 
			
		||||
| 
						 | 
				
			
			@ -1485,6 +1494,7 @@ export function RoomTimeline({
 | 
			
		|||
          messageSpacing={messageSpacing}
 | 
			
		||||
          canDelete={canRedact || mEvent.getSender() === mx.getUserId()}
 | 
			
		||||
          hideReadReceipts={hideActivity}
 | 
			
		||||
          showDeveloperTools={showDeveloperTools}
 | 
			
		||||
        >
 | 
			
		||||
          <EventContent
 | 
			
		||||
            messageLayout={messageLayout}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -675,6 +675,7 @@ export type MessageProps = {
 | 
			
		|||
  reply?: ReactNode;
 | 
			
		||||
  reactions?: ReactNode;
 | 
			
		||||
  hideReadReceipts?: boolean;
 | 
			
		||||
  showDeveloperTools?: boolean;
 | 
			
		||||
  powerLevelTag?: PowerLevelTag;
 | 
			
		||||
  accessibleTagColors?: Map<string, string>;
 | 
			
		||||
  legacyUsernameColor?: boolean;
 | 
			
		||||
| 
						 | 
				
			
			@ -703,6 +704,7 @@ export const Message = as<'div', MessageProps>(
 | 
			
		|||
      reply,
 | 
			
		||||
      reactions,
 | 
			
		||||
      hideReadReceipts,
 | 
			
		||||
      showDeveloperTools,
 | 
			
		||||
      powerLevelTag,
 | 
			
		||||
      accessibleTagColors,
 | 
			
		||||
      legacyUsernameColor,
 | 
			
		||||
| 
						 | 
				
			
			@ -1026,7 +1028,13 @@ export const Message = as<'div', MessageProps>(
 | 
			
		|||
                              onClose={closeMenu}
 | 
			
		||||
                            />
 | 
			
		||||
                          )}
 | 
			
		||||
                          <MessageSourceCodeItem room={room} mEvent={mEvent} onClose={closeMenu} />
 | 
			
		||||
                          {showDeveloperTools && (
 | 
			
		||||
                            <MessageSourceCodeItem
 | 
			
		||||
                              room={room}
 | 
			
		||||
                              mEvent={mEvent}
 | 
			
		||||
                              onClose={closeMenu}
 | 
			
		||||
                            />
 | 
			
		||||
                          )}
 | 
			
		||||
                          <MessageCopyLinkItem room={room} mEvent={mEvent} onClose={closeMenu} />
 | 
			
		||||
                          {canPinEvent && (
 | 
			
		||||
                            <MessagePinItem room={room} mEvent={mEvent} onClose={closeMenu} />
 | 
			
		||||
| 
						 | 
				
			
			@ -1101,6 +1109,7 @@ export type EventProps = {
 | 
			
		|||
  canDelete?: boolean;
 | 
			
		||||
  messageSpacing: MessageSpacing;
 | 
			
		||||
  hideReadReceipts?: boolean;
 | 
			
		||||
  showDeveloperTools?: boolean;
 | 
			
		||||
};
 | 
			
		||||
export const Event = as<'div', EventProps>(
 | 
			
		||||
  (
 | 
			
		||||
| 
						 | 
				
			
			@ -1112,6 +1121,7 @@ export const Event = as<'div', EventProps>(
 | 
			
		|||
      canDelete,
 | 
			
		||||
      messageSpacing,
 | 
			
		||||
      hideReadReceipts,
 | 
			
		||||
      showDeveloperTools,
 | 
			
		||||
      children,
 | 
			
		||||
      ...props
 | 
			
		||||
    },
 | 
			
		||||
| 
						 | 
				
			
			@ -1188,7 +1198,13 @@ export const Event = as<'div', EventProps>(
 | 
			
		|||
                              onClose={closeMenu}
 | 
			
		||||
                            />
 | 
			
		||||
                          )}
 | 
			
		||||
                          <MessageSourceCodeItem room={room} mEvent={mEvent} onClose={closeMenu} />
 | 
			
		||||
                          {showDeveloperTools && (
 | 
			
		||||
                            <MessageSourceCodeItem
 | 
			
		||||
                              room={room}
 | 
			
		||||
                              mEvent={mEvent}
 | 
			
		||||
                              onClose={closeMenu}
 | 
			
		||||
                            />
 | 
			
		||||
                          )}
 | 
			
		||||
                          <MessageCopyLinkItem room={room} mEvent={mEvent} onClose={closeMenu} />
 | 
			
		||||
                        </Box>
 | 
			
		||||
                        {((!mEvent.isRedacted() && canDelete && !stateEvent) ||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -273,7 +273,7 @@ function InviteUser({ isOpen, roomId, searchTerm, onRequestClose }) {
 | 
			
		|||
            searchUser(usernameRef.current.value);
 | 
			
		||||
          }}
 | 
			
		||||
        >
 | 
			
		||||
          <Input value={searchTerm} forwardRef={usernameRef} label="Name or userId" />
 | 
			
		||||
          <Input value={searchTerm} forwardRef={usernameRef} label="Name or userId" autoFocus />
 | 
			
		||||
          <Button disabled={isSearching} iconSrc={UserIC} variant="primary" type="submit">
 | 
			
		||||
            Search
 | 
			
		||||
          </Button>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -75,7 +75,7 @@ function JoinAliasContent({ term, requestClose }) {
 | 
			
		|||
 | 
			
		||||
  return (
 | 
			
		||||
    <form className="join-alias" onSubmit={handleSubmit}>
 | 
			
		||||
      <Input label="Address" value={term} name="alias" required />
 | 
			
		||||
      <Input label="Address" value={term} name="alias" required autoFocus />
 | 
			
		||||
      {error && (
 | 
			
		||||
        <Text className="join-alias__error" variant="b3">
 | 
			
		||||
          {error}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue