Pop out of Threads Activity Centre (#12136)
* Add `Thread Activity centre` labs flag * Rename translation string * WIP Thread Activity Centre * Update supportedLevels * css lint * i18n lint * Fix labs subsection test * Update Threads Activity Centre label * Rename Thread Activity Centre to Threads Activity Centre * Use compound `MenuItem` instead of custom button * Color thread icon when hovered * Make the pop-up scrollable and add a max height * Remove Math.random in key * Remove unused class * Change add comments on `mx_ThreadsActivityRows` and `mx_ThreadsActivityRow` * Make threads activity centre labs flag split out unread counts Just shows notif & unread counts for main thread if the TAC is enabled. * Fix tests * Simpler fix * Open thread panel when thread clicke in Threads Activity Centre Hopefully this is a sensible enough way. The panel will stay open of course (ie. if you go to a different room & come back), but that's the nature of the right panel. * Dynamic state of room * Add doc * Use the StatelessNotificationBadge component in ThreadsActivityCentre and re-use the existing NotificationLevel * Remove unused style * Add room sorting * Fix `ThreadsActivityRow` props doc * Pass in & cache the status of the TAC labs flag * Pass includeThreads as setting to doesRoomHaveUnreadMessages too * Fix tests * Add analytics to the TAC (#12179) * Update TAC label (#12186) * Add `IndicatorIcon` to the TAC button (#12182) Add `IndicatorIcon` to the TAC button * Threads don't have activity if the room is muted This makes it match the computation in determineUnreadState. Ideally this logic should all be in one place. * Re-use doesRoomHaveUnreadThreads for useRoomThreadNotifications This incorporates the logic of not showing unread dots if the room is muted * Add TAC description in labs (#12197) * Fox position & size of dot on the tac button IndicatorIcon doesn't like having the size of its icon adjusted and we probably shouldn't do it anyway: better to specify to the component what size we want it. * TAC: Utils tests (#12200) * Add tests for `doesRoomHaveUnreadThreads` * Add tests for `getThreadNotificationLevel` * Add test for the ThreadsActivityCentre component * Add snapshot test * Fix narrow hover background on TAC button Make the button 32x32 (and the inner icon 24x24) * Add caption for empty TAC * s/tac/threads_activity_centre/ * Fix i18n & add tests * Add playwright tests for the TAC (#12227) * Fox comments --------- Co-authored-by: David Baker <dbkr@users.noreply.github.com>
This commit is contained in:
Florian Duros
GitHub
parent
3052025dd0
commit
a4987060b7
24 changed files with 1455 additions and 14 deletions
|
|
@ -20,6 +20,7 @@ import { logger } from "matrix-js-sdk/src/logger";
|
|||
import shouldHideEvent from "./shouldHideEvent";
|
||||
import { haveRendererForEvent } from "./events/EventTileFactory";
|
||||
import SettingsStore from "./settings/SettingsStore";
|
||||
import { RoomNotifState, getRoomNotifsState } from "./RoomNotifs";
|
||||
|
||||
/**
|
||||
* Returns true if this event arriving in a room should affect the room's
|
||||
|
|
@ -105,6 +106,29 @@ function doesTimelineHaveUnreadMessages(room: Room, timeline: Array<MatrixEvent>
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if this room has unread threads.
|
||||
* @param room The room to check
|
||||
* @returns {boolean} True if the given room has unread threads
|
||||
*/
|
||||
export function doesRoomHaveUnreadThreads(room: Room): boolean {
|
||||
if (getRoomNotifsState(room.client, room.roomId) === RoomNotifState.Mute) {
|
||||
// No unread for muted rooms, nor their threads
|
||||
// NB. This logic duplicated in RoomNotifs.determineUnreadState
|
||||
return false;
|
||||
}
|
||||
|
||||
for (const thread of room.getThreads()) {
|
||||
if (doesTimelineHaveUnreadMessages(room, thread.timeline)) {
|
||||
// We found an unread, so the room has an unread thread
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// If we got here then no threads were found with unread messages.
|
||||
return false;
|
||||
}
|
||||
|
||||
export function doesRoomOrThreadHaveUnreadMessages(roomOrThread: Room | Thread): boolean {
|
||||
const room = roomOrThread instanceof Thread ? roomOrThread.room : roomOrThread;
|
||||
const events = roomOrThread instanceof Thread ? roomOrThread.timeline : room.getLiveTimeline().getEvents();
|
||||
|
|
|
|||
|
|
@ -176,6 +176,9 @@ export default class DecoratedRoomAvatar extends React.PureComponent<IProps, ISt
|
|||
}
|
||||
|
||||
public render(): React.ReactNode {
|
||||
// Spread the remaining props to make it work with compound component
|
||||
const { room, size, displayBadge, forceCount, oobData, viewAvatarOnClick, tooltipProps, ...props } = this.props;
|
||||
|
||||
let badge: React.ReactNode;
|
||||
if (this.props.displayBadge && this.state.notificationState) {
|
||||
badge = (
|
||||
|
|
@ -202,7 +205,7 @@ export default class DecoratedRoomAvatar extends React.PureComponent<IProps, ISt
|
|||
});
|
||||
|
||||
return (
|
||||
<div className={classes}>
|
||||
<div className={classes} {...props}>
|
||||
<RoomAvatar
|
||||
room={this.props.room}
|
||||
size={this.props.size}
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ import { NotificationState } from "../../../stores/notifications/NotificationSta
|
|||
import { ALTERNATE_KEY_NAME } from "../../../accessibility/KeyboardShortcuts";
|
||||
import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
|
||||
import { UIComponent } from "../../../settings/UIFeature";
|
||||
import { ThreadsActivityCentre } from "./threads-activity-centre/";
|
||||
|
||||
const useSpaces = (): [Room[], MetaSpace[], Room[], SpaceKey] => {
|
||||
const invites = useEventEmitterState<Room[]>(SpaceStore.instance, UPDATE_INVITED_SPACES, () => {
|
||||
|
|
@ -350,6 +351,8 @@ const SpacePanel: React.FC = () => {
|
|||
}
|
||||
});
|
||||
|
||||
const isThreadsActivityCentreEnabled = useSettingValue<boolean>("threadsActivityCentre");
|
||||
|
||||
return (
|
||||
<RovingTabIndexProvider handleHomeEnd handleUpDown={!dragging}>
|
||||
{({ onKeyDownHandler, onDragEndHandler }) => (
|
||||
|
|
@ -406,6 +409,9 @@ const SpacePanel: React.FC = () => {
|
|||
)}
|
||||
</Droppable>
|
||||
|
||||
{isThreadsActivityCentreEnabled && (
|
||||
<ThreadsActivityCentre displayButtonLabel={!isPanelCollapsed} />
|
||||
)}
|
||||
<QuickSettingsButton isPanelCollapsed={isPanelCollapsed} />
|
||||
</nav>
|
||||
</DragDropContext>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,136 @@
|
|||
/*
|
||||
*
|
||||
* Copyright 2024 The Matrix.org Foundation C.I.C.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* /
|
||||
*/
|
||||
|
||||
import React, { JSX, useState } from "react";
|
||||
import { Menu, MenuItem } from "@vector-im/compound-web";
|
||||
import { Room } from "matrix-js-sdk/src/matrix";
|
||||
|
||||
import { ThreadsActivityCentreButton } from "./ThreadsActivityCentreButton";
|
||||
import { _t } from "../../../../languageHandler";
|
||||
import DecoratedRoomAvatar from "../../avatars/DecoratedRoomAvatar";
|
||||
import { Action } from "../../../../dispatcher/actions";
|
||||
import defaultDispatcher from "../../../../dispatcher/dispatcher";
|
||||
import { ViewRoomPayload } from "../../../../dispatcher/payloads/ViewRoomPayload";
|
||||
import RightPanelStore from "../../../../stores/right-panel/RightPanelStore";
|
||||
import { RightPanelPhases } from "../../../../stores/right-panel/RightPanelStorePhases";
|
||||
import { useUnreadThreadRooms } from "./useUnreadThreadRooms";
|
||||
import { StatelessNotificationBadge } from "../../rooms/NotificationBadge/StatelessNotificationBadge";
|
||||
import { NotificationLevel } from "../../../../stores/notifications/NotificationLevel";
|
||||
import PosthogTrackers from "../../../../PosthogTrackers";
|
||||
|
||||
interface ThreadsActivityCentreProps {
|
||||
/**
|
||||
* Display the `Treads` label next to the icon.
|
||||
*/
|
||||
displayButtonLabel?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Display in a popup the list of rooms with unread threads.
|
||||
* The popup is displayed when the user clicks on the `Threads` button.
|
||||
*/
|
||||
export function ThreadsActivityCentre({ displayButtonLabel }: ThreadsActivityCentreProps): JSX.Element {
|
||||
const [open, setOpen] = useState(false);
|
||||
const roomsAndNotifications = useUnreadThreadRooms(open);
|
||||
|
||||
return (
|
||||
<Menu
|
||||
align="end"
|
||||
open={open}
|
||||
onOpenChange={(newOpen) => {
|
||||
// Track only when the Threads Activity Centre is opened
|
||||
if (newOpen) PosthogTrackers.trackInteraction("WebThreadsActivityCentreButton");
|
||||
|
||||
setOpen(newOpen);
|
||||
}}
|
||||
side="right"
|
||||
title={_t("threads_activity_centre|header")}
|
||||
trigger={
|
||||
<ThreadsActivityCentreButton
|
||||
displayLabel={displayButtonLabel}
|
||||
notificationLevel={roomsAndNotifications.greatestNotificationLevel}
|
||||
/>
|
||||
}
|
||||
>
|
||||
{/* Make the content of the pop-up scrollable */}
|
||||
<div className="mx_ThreadsActivity_rows">
|
||||
{roomsAndNotifications.rooms.map(({ room, notificationLevel }) => (
|
||||
<ThreadsActivityRow
|
||||
key={room.roomId}
|
||||
room={room}
|
||||
notificationLevel={notificationLevel}
|
||||
onClick={() => setOpen(false)}
|
||||
/>
|
||||
))}
|
||||
{roomsAndNotifications.rooms.length === 0 && (
|
||||
<div className="mx_ThreadsActivityCentre_emptyCaption">
|
||||
{_t("threads_activity_centre|no_rooms_with_unreads_threads")}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</Menu>
|
||||
);
|
||||
}
|
||||
|
||||
interface ThreadsActivityRow {
|
||||
/**
|
||||
* The room with unread threads.
|
||||
*/
|
||||
room: Room;
|
||||
/**
|
||||
* The notification level.
|
||||
*/
|
||||
notificationLevel: NotificationLevel;
|
||||
/**
|
||||
* Callback when the user clicks on the row.
|
||||
*/
|
||||
onClick: () => void;
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a room with unread threads.
|
||||
*/
|
||||
function ThreadsActivityRow({ room, onClick, notificationLevel }: ThreadsActivityRow): JSX.Element {
|
||||
return (
|
||||
<MenuItem
|
||||
className="mx_ThreadsActivityRow"
|
||||
onSelect={(event: Event) => {
|
||||
onClick();
|
||||
|
||||
// Set the right panel card for that room so the threads panel is open before we dispatch,
|
||||
// so it will open once the room appears.
|
||||
RightPanelStore.instance.setCard({ phase: RightPanelPhases.ThreadPanel }, true, room.roomId);
|
||||
|
||||
// Track the click on the room
|
||||
PosthogTrackers.trackInteraction("WebThreadsActivityCentreRoomItem", event);
|
||||
|
||||
// Display the selected room in the timeline
|
||||
defaultDispatcher.dispatch<ViewRoomPayload>({
|
||||
action: Action.ViewRoom,
|
||||
show_room_tile: true, // make sure the room is visible in the list
|
||||
room_id: room.roomId,
|
||||
metricsTrigger: "WebThreadsActivityCentre",
|
||||
});
|
||||
}}
|
||||
label={room.name}
|
||||
Icon={<DecoratedRoomAvatar room={room} size="32px" />}
|
||||
>
|
||||
<StatelessNotificationBadge level={notificationLevel} count={0} symbol={null} type="dot" />
|
||||
</MenuItem>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
/*
|
||||
*
|
||||
* Copyright 2024 The Matrix.org Foundation C.I.C.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* /
|
||||
*/
|
||||
|
||||
import React, { forwardRef, HTMLProps } from "react";
|
||||
import { Icon } from "@vector-im/compound-design-tokens/icons/threads-solid.svg";
|
||||
import classNames from "classnames";
|
||||
import { IndicatorIcon } from "@vector-im/compound-web";
|
||||
|
||||
import { _t } from "../../../../languageHandler";
|
||||
import AccessibleTooltipButton from "../../elements/AccessibleTooltipButton";
|
||||
import { NotificationLevel } from "../../../../stores/notifications/NotificationLevel";
|
||||
import { notificationLevelToIndicator } from "../../../../utils/notifications";
|
||||
|
||||
interface ThreadsActivityCentreButtonProps extends HTMLProps<HTMLDivElement> {
|
||||
/**
|
||||
* Display the `Treads` label next to the icon.
|
||||
*/
|
||||
displayLabel?: boolean;
|
||||
/**
|
||||
* The notification level of the threads.
|
||||
*/
|
||||
notificationLevel: NotificationLevel;
|
||||
}
|
||||
|
||||
/**
|
||||
* A button to open the thread activity centre.
|
||||
*/
|
||||
export const ThreadsActivityCentreButton = forwardRef<HTMLDivElement, ThreadsActivityCentreButtonProps>(
|
||||
function ThreadsActivityCentreButton({ displayLabel, notificationLevel, ...props }, ref): React.JSX.Element {
|
||||
return (
|
||||
<AccessibleTooltipButton
|
||||
className={classNames("mx_ThreadsActivityCentreButton", { expanded: displayLabel })}
|
||||
title={_t("common|threads")}
|
||||
// @ts-ignore
|
||||
// ref nightmare...
|
||||
ref={ref}
|
||||
forceHide={displayLabel}
|
||||
aria-expanded={displayLabel}
|
||||
{...props}
|
||||
>
|
||||
<IndicatorIcon
|
||||
className="mx_ThreadsActivityCentreButton_IndicatorIcon"
|
||||
indicator={notificationLevelToIndicator(notificationLevel)}
|
||||
size="24px"
|
||||
>
|
||||
<Icon className="mx_ThreadsActivityCentreButton_Icon" />
|
||||
</IndicatorIcon>
|
||||
{displayLabel && _t("common|threads")}
|
||||
</AccessibleTooltipButton>
|
||||
);
|
||||
},
|
||||
);
|
||||
19
src/components/views/spaces/threads-activity-centre/index.ts
Normal file
19
src/components/views/spaces/threads-activity-centre/index.ts
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
/*
|
||||
*
|
||||
* Copyright 2024 The Matrix.org Foundation C.I.C.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* /
|
||||
*/
|
||||
|
||||
export { ThreadsActivityCentre } from "./ThreadsActivityCentre";
|
||||
|
|
@ -0,0 +1,104 @@
|
|||
/*
|
||||
*
|
||||
* Copyright 2024 The Matrix.org Foundation C.I.C.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* /
|
||||
*/
|
||||
|
||||
import { useEffect, useState } from "react";
|
||||
import { ClientEvent, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
|
||||
|
||||
import { doesRoomHaveUnreadThreads } from "../../../../Unread";
|
||||
import { NotificationLevel } from "../../../../stores/notifications/NotificationLevel";
|
||||
import { getThreadNotificationLevel } from "../../../../utils/notifications";
|
||||
import { useSettingValue } from "../../../../hooks/useSettings";
|
||||
import { useMatrixClientContext } from "../../../../contexts/MatrixClientContext";
|
||||
import { useEventEmitter } from "../../../../hooks/useEventEmitter";
|
||||
import { VisibilityProvider } from "../../../../stores/room-list/filters/VisibilityProvider";
|
||||
|
||||
type Result = {
|
||||
greatestNotificationLevel: NotificationLevel;
|
||||
rooms: Array<{ room: Room; notificationLevel: NotificationLevel }>;
|
||||
};
|
||||
|
||||
/**
|
||||
* Return the greatest notification level of all thread, the list of rooms with unread threads, and their notification level.
|
||||
* The result is computed when the client syncs, or when forceComputation is true
|
||||
* @param forceComputation
|
||||
* @returns {Result}
|
||||
*/
|
||||
export function useUnreadThreadRooms(forceComputation: boolean): Result {
|
||||
const msc3946ProcessDynamicPredecessor = useSettingValue<boolean>("feature_dynamic_room_predecessors");
|
||||
const mxClient = useMatrixClientContext();
|
||||
|
||||
const [result, setResult] = useState<Result>({ greatestNotificationLevel: NotificationLevel.None, rooms: [] });
|
||||
|
||||
// Listen to sync events to update the result
|
||||
useEventEmitter(mxClient, ClientEvent.Sync, () => {
|
||||
setResult(computeUnreadThreadRooms(mxClient, msc3946ProcessDynamicPredecessor));
|
||||
});
|
||||
|
||||
// Force the list computation
|
||||
useEffect(() => {
|
||||
if (forceComputation) {
|
||||
setResult(computeUnreadThreadRooms(mxClient, msc3946ProcessDynamicPredecessor));
|
||||
}
|
||||
}, [mxClient, msc3946ProcessDynamicPredecessor, forceComputation]);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compute the greatest notification level of all thread, the list of rooms with unread threads, and their notification level.
|
||||
* @param mxClient - MatrixClient
|
||||
* @param msc3946ProcessDynamicPredecessor
|
||||
*/
|
||||
function computeUnreadThreadRooms(mxClient: MatrixClient, msc3946ProcessDynamicPredecessor: boolean): Result {
|
||||
// Only count visible rooms to not torment the user with notification counts in rooms they can't see.
|
||||
// This will include highlights from the previous version of the room internally
|
||||
const visibleRooms = mxClient.getVisibleRooms(msc3946ProcessDynamicPredecessor);
|
||||
|
||||
let greatestNotificationLevel = NotificationLevel.None;
|
||||
const rooms = [];
|
||||
|
||||
for (const room of visibleRooms) {
|
||||
// We only care about rooms with unread threads
|
||||
if (VisibilityProvider.instance.isRoomVisible(room) && doesRoomHaveUnreadThreads(room)) {
|
||||
// Get the greatest notification level of all rooms
|
||||
const notificationLevel = getThreadNotificationLevel(room);
|
||||
if (notificationLevel > greatestNotificationLevel) {
|
||||
greatestNotificationLevel = notificationLevel;
|
||||
}
|
||||
|
||||
rooms.push({ room, notificationLevel });
|
||||
}
|
||||
}
|
||||
|
||||
const sortedRooms = rooms.sort((a, b) => sortRoom(a.notificationLevel, b.notificationLevel));
|
||||
return { greatestNotificationLevel, rooms: sortedRooms };
|
||||
}
|
||||
|
||||
/**
|
||||
* Sort notification level by the most important notification level to the least important
|
||||
* Highlight > Notification > Activity
|
||||
* @param notificationLevelA - notification level of room A
|
||||
* @param notificationLevelB - notification level of room B
|
||||
* @returns {number}
|
||||
*/
|
||||
function sortRoom(notificationLevelA: NotificationLevel, notificationLevelB: NotificationLevel): number {
|
||||
// NotificationLevel is a numeric enum, so we can compare them directly
|
||||
if (notificationLevelA > notificationLevelB) return -1;
|
||||
else if (notificationLevelB > notificationLevelA) return 1;
|
||||
else return 0;
|
||||
}
|
||||
|
|
@ -18,7 +18,7 @@ import { NotificationCountType, Room, RoomEvent, ThreadEvent } from "matrix-js-s
|
|||
import { useCallback, useEffect, useState } from "react";
|
||||
|
||||
import { NotificationLevel } from "../../stores/notifications/NotificationLevel";
|
||||
import { doesRoomOrThreadHaveUnreadMessages } from "../../Unread";
|
||||
import { doesRoomHaveUnreadThreads } from "../../Unread";
|
||||
import { useEventEmitter } from "../useEventEmitter";
|
||||
|
||||
/**
|
||||
|
|
@ -40,12 +40,9 @@ export const useRoomThreadNotifications = (room: Room): NotificationLevel => {
|
|||
}
|
||||
// We don't have any notified messages, but we might have unread messages. Let's
|
||||
// find out.
|
||||
for (const thread of room!.getThreads()) {
|
||||
// If the current thread has unread messages, we're done.
|
||||
if (doesRoomOrThreadHaveUnreadMessages(thread)) {
|
||||
setNotificationLevel(NotificationLevel.Activity);
|
||||
return;
|
||||
}
|
||||
if (doesRoomHaveUnreadThreads(room)) {
|
||||
setNotificationLevel(NotificationLevel.Activity);
|
||||
return;
|
||||
}
|
||||
|
||||
// default case
|
||||
|
|
|
|||
|
|
@ -1460,7 +1460,8 @@
|
|||
"sliding_sync_server_no_support": "Your server lacks native support",
|
||||
"sliding_sync_server_specify_proxy": "Your server lacks native support, you must specify a proxy",
|
||||
"sliding_sync_server_support": "Your server has native support",
|
||||
"threads_activity_centre": "Threads Activity Centre (in development). Currently this just removes thread notification counts from the count total in the room list",
|
||||
"threads_activity_centre": "Threads Activity Centre (in development)",
|
||||
"threads_activity_centre_description": "Warning: Under active development; reloads Element.",
|
||||
"under_active_development": "Under active development.",
|
||||
"unrealiable_e2e": "Unreliable in encrypted rooms",
|
||||
"video_rooms": "Video rooms",
|
||||
|
|
@ -3160,6 +3161,10 @@
|
|||
"show_thread_filter": "Show:",
|
||||
"unable_to_decrypt": "Unable to decrypt message"
|
||||
},
|
||||
"threads_activity_centre": {
|
||||
"header": "Threads activity",
|
||||
"no_rooms_with_unreads_threads": "You don't have rooms with unread threads yet."
|
||||
},
|
||||
"time": {
|
||||
"about_day_ago": "about a day ago",
|
||||
"about_hour_ago": "about an hour ago",
|
||||
|
|
|
|||
|
|
@ -1128,6 +1128,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
labsGroup: LabGroup.Threads,
|
||||
controller: new ReloadOnChangeController(),
|
||||
displayName: _td("labs|threads_activity_centre"),
|
||||
description: _td("labs|threads_activity_centre_description"),
|
||||
default: false,
|
||||
isFeature: true,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -134,3 +134,20 @@ export function notificationLevelToIndicator(
|
|||
return "critical";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the thread notification level for a room
|
||||
* @param room
|
||||
* @returns {NotificationLevel}
|
||||
*/
|
||||
export function getThreadNotificationLevel(room: Room): NotificationLevel {
|
||||
const notificationCountType = room.threadsAggregateNotificationType;
|
||||
switch (notificationCountType) {
|
||||
case NotificationCountType.Highlight:
|
||||
return NotificationLevel.Highlight;
|
||||
case NotificationCountType.Total:
|
||||
return NotificationLevel.Notification;
|
||||
default:
|
||||
return NotificationLevel.Activity;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue