diff --git a/src/app/hooks/useLastActivePathMapper.ts b/src/app/hooks/useLastActivePathMapper.ts new file mode 100644 index 00000000..632bb059 --- /dev/null +++ b/src/app/hooks/useLastActivePathMapper.ts @@ -0,0 +1,25 @@ +import { useEffect } from 'react'; +import { useLocation, useMatches } from 'react-router-dom'; +import { useMatrixClient } from './useMatrixClient'; +import { setLastActivePath } from '../state/lastActivePath'; +import { withRoomEventId } from '../pages/pathUtils'; + +/** + * Remembers the last channel the user opened. Only room routes are stored, so + * visiting the inbox, explore or settings does not replace the last seen channel. + * Permalinks are stored as the channel itself, without the event id. + */ +export const useLastActivePathMapper = () => { + const mx = useMatrixClient(); + const location = useLocation(); + const matches = useMatches(); + + useEffect(() => { + const userId = mx.getUserId(); + if (!userId) return; + + if (!matches.some((match) => match.params?.roomIdOrAlias)) return; + + setLastActivePath(userId, withRoomEventId(location.pathname)); + }, [mx, location, matches]); +}; diff --git a/src/app/pages/Router.tsx b/src/app/pages/Router.tsx index 4d77085a..07ce3e3a 100644 --- a/src/app/pages/Router.tsx +++ b/src/app/pages/Router.tsx @@ -70,8 +70,16 @@ import { Create } from './client/create'; import { CreateSpaceModalRenderer } from '../features/create-space'; import { SearchModalRenderer } from '../features/search'; import { getCurrentSession } from '../state/sessions'; +import { getLastActivePath } from '../state/lastActivePath'; import { AnimatedOutlet } from '../components/AnimatedOutlet'; +/** + * Startup landing path: the channel the user last opened, falling back to the inbox + * when nothing has been remembered for the account yet. + */ +const getStartupPath = (userId: string): string => + getLastActivePath(userId) ?? getInboxNotificationsPath(); + export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize) => { const { hashRouter } = clientConfig; const mobile = screenSize === ScreenSize.Mobile; @@ -88,7 +96,8 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize) { - if (getCurrentSession()) return redirect(getInboxNotificationsPath()); + const session = getCurrentSession(); + if (session) return redirect(getStartupPath(session.userId)); const afterLoginPath = getAppPathFromHref(getOriginBaseUrl(), window.location.href); if (afterLoginPath) setAfterLoginRedirectPath(afterLoginPath); return redirect(getLoginPath()); @@ -98,7 +107,8 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize) loader={({ request }) => { const url = new URL(request.url); const addingAccount = url.searchParams.get('add-account') === 'true'; - const hasSession = !!getCurrentSession(); + const session = getCurrentSession(); + const hasSession = !!session; // Log to localStorage for persistence across reloads const debugInfo = { @@ -117,9 +127,9 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize) if (debugLog.length > 10) debugLog.shift(); // Keep last 10 localStorage.setItem('debug-router-logs', JSON.stringify(debugLog)); - if (hasSession && !addingAccount) { - console.log('[Router] Redirecting to Inbox/Notifications because session exists and not adding account'); - return redirect(getInboxNotificationsPath()); + if (session && !addingAccount) { + console.log('[Router] Redirecting to last seen channel for existing session'); + return redirect(getStartupPath(session.userId)); } return null; diff --git a/src/app/pages/auth/login/loginUtil.ts b/src/app/pages/auth/login/loginUtil.ts index 65fb17c4..45f381c1 100644 --- a/src/app/pages/auth/login/loginUtil.ts +++ b/src/app/pages/auth/login/loginUtil.ts @@ -10,6 +10,7 @@ import { getAfterLoginRedirectPath, } from '../../afterLoginRedirectPath'; import { getHomePath } from '../../pathUtils'; +import { getLastActivePath } from '../../../state/lastActivePath'; import { setFallbackSession } from '../../../state/sessions'; import { getLocalStorageItem, setLocalStorageItem } from '../../../state/utils/atomWithLocalStorage'; @@ -149,7 +150,8 @@ export const useLoginComplete = (data?: CustomLoginResponse) => { const afterLoginRedirectUrl = getAfterLoginRedirectPath(); deleteAfterLoginRedirectPath(); - const targetPath = afterLoginRedirectUrl ?? getHomePath(); + const targetPath = + afterLoginRedirectUrl ?? getLastActivePath(loginRes.user_id) ?? getHomePath(); console.log('[Login] Login complete, reloading to initialize client:', { targetPath, userId: loginRes.user_id, diff --git a/src/app/pages/client/ClientInitStorageAtom.tsx b/src/app/pages/client/ClientInitStorageAtom.tsx index 1abee707..340315c3 100644 --- a/src/app/pages/client/ClientInitStorageAtom.tsx +++ b/src/app/pages/client/ClientInitStorageAtom.tsx @@ -8,6 +8,7 @@ import { makeNavToActivePathAtom } from '../../state/navToActivePath'; import { NavToActivePathProvider } from '../../state/hooks/navToActivePath'; import { makeOpenedSidebarFolderAtom } from '../../state/openedSidebarFolder'; import { OpenedSidebarFolderProvider } from '../../state/hooks/openedSidebarFolder'; +import { useLastActivePathMapper } from '../../hooks/useLastActivePathMapper'; type ClientInitStorageAtomProps = { children: ReactNode; @@ -24,6 +25,8 @@ export function ClientInitStorageAtom({ children }: ClientInitStorageAtomProps) const openedSidebarFolderAtom = useMemo(() => makeOpenedSidebarFolderAtom(userId), [userId]); + useLastActivePathMapper(); + return ( diff --git a/src/app/state/lastActivePath.ts b/src/app/state/lastActivePath.ts new file mode 100644 index 00000000..ff209131 --- /dev/null +++ b/src/app/state/lastActivePath.ts @@ -0,0 +1,16 @@ +import { getLocalStorageItem, setLocalStorageItem } from './utils/atomWithLocalStorage'; + +const LAST_ACTIVE_PATH_KEY = 'lastActivePath'; + +const getStoreKey = (userId: string): string => `${LAST_ACTIVE_PATH_KEY}${userId}`; + +/** + * Last channel (room route) the user opened, remembered per account so the app + * reopens there on startup instead of the inbox. + */ +export const getLastActivePath = (userId: string): string | undefined => + getLocalStorageItem(getStoreKey(userId), undefined); + +export const setLastActivePath = (userId: string, path: string): void => { + setLocalStorageItem(getStoreKey(userId), path); +};