diff --git a/src/components/ui/UrlSummaryCard.tsx b/app/src/components/ui/UrlSummaryCard.tsx
similarity index 100%
rename from src/components/ui/UrlSummaryCard.tsx
rename to app/src/components/ui/UrlSummaryCard.tsx
diff --git a/src/components/ui/UserPicker.tsx b/app/src/components/ui/UserPicker.tsx
similarity index 85%
rename from src/components/ui/UserPicker.tsx
rename to app/src/components/ui/UserPicker.tsx
index 8d4a1c7e..6bed5714 100644
--- a/src/components/ui/UserPicker.tsx
+++ b/app/src/components/ui/UserPicker.tsx
@@ -1,9 +1,8 @@
import { Autocomplete, Box, InputBase, ListItem, ListItemIcon, ListItemText, type SxProps } from '@mui/material'
-import { type User } from '@concurrent-world/client'
+import { type User } from '@concrnt/worldlib'
import { useClient } from '../../context/ClientContext'
import { CCUserChip } from './CCUserChip'
import { CCAvatar } from './CCAvatar'
-import { useMemo } from 'react'
export interface UserPickerProps {
selected: User[]
@@ -14,19 +13,6 @@ export interface UserPickerProps {
export const UserPicker = (props: UserPickerProps): JSX.Element => {
const { client } = useClient()
- const selected = useMemo(
- () =>
- JSON.parse(
- JSON.stringify(props.selected ?? [], (key, value) => {
- if (key === 'client' || key === 'api') {
- return undefined
- }
- return value
- })
- ),
- [props.selected]
- )
-
return (
{
filterSelectedOptions
sx={{ width: 1 }}
multiple
- value={selected}
+ value={props.selected}
options={[...(client.ackings ?? []), ...(client.user ? [client.user] : [])]}
getOptionKey={(option: User) => option.ccid}
getOptionLabel={(option: User) => option.profile?.username ?? ''}
diff --git a/src/components/ui/cceditor.tsx b/app/src/components/ui/cceditor.tsx
similarity index 98%
rename from src/components/ui/cceditor.tsx
rename to app/src/components/ui/cceditor.tsx
index 107d17c8..838387b5 100644
--- a/src/components/ui/cceditor.tsx
+++ b/app/src/components/ui/cceditor.tsx
@@ -4,7 +4,7 @@ import validator from '@rjsf/validator-ajv8'
import { memo, useEffect, useState } from 'react'
import { fetchWithTimeout } from '../../util'
import { useClient } from '../../context/ClientContext'
-import { type User } from '@concurrent-world/client'
+import { type User } from '@concrnt/worldlib'
import { UserPicker } from '../ui/UserPicker'
import { type RegistryWidgetsType, type UiSchema, type WidgetProps } from '@rjsf/utils'
import { MediaInput } from './MediaInput'
diff --git a/src/components/ui/type.d.ts b/app/src/components/ui/type.d.ts
similarity index 100%
rename from src/components/ui/type.d.ts
rename to app/src/components/ui/type.d.ts
diff --git a/src/components/welcome/AppMock.tsx b/app/src/components/welcome/AppMock.tsx
similarity index 100%
rename from src/components/welcome/AppMock.tsx
rename to app/src/components/welcome/AppMock.tsx
diff --git a/src/components/welcome/Contributors.tsx b/app/src/components/welcome/Contributors.tsx
similarity index 100%
rename from src/components/welcome/Contributors.tsx
rename to app/src/components/welcome/Contributors.tsx
diff --git a/src/constants.ts b/app/src/constants.ts
similarity index 100%
rename from src/constants.ts
rename to app/src/constants.ts
diff --git a/src/context/AutoSummaryContext.tsx b/app/src/context/AutoSummaryContext.tsx
similarity index 100%
rename from src/context/AutoSummaryContext.tsx
rename to app/src/context/AutoSummaryContext.tsx
diff --git a/src/context/ClientContext.tsx b/app/src/context/ClientContext.tsx
similarity index 94%
rename from src/context/ClientContext.tsx
rename to app/src/context/ClientContext.tsx
index 2d11d57a..808e8a9d 100644
--- a/src/context/ClientContext.tsx
+++ b/app/src/context/ClientContext.tsx
@@ -1,10 +1,10 @@
import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react'
-import type { Client } from '@concurrent-world/client'
import { usePersistent } from '../hooks/usePersistent'
// @ts-expect-error vite dynamic import
-import { branch, sha } from '~build/info'
+import { branch, sha } from '~build/git'
import { FullScreenLoading } from '../components/ui/FullScreenLoading'
+import { type Client } from '@concrnt/worldlib'
const branchName = branch || window.location.host.split('.')[0]
const versionString = `${location.hostname}-${branchName as string}-${sha.slice(0, 7) as string}`
@@ -38,7 +38,7 @@ export const ClientProvider = (props: ClientProviderProps): JSX.Element => {
if (props.client) return
const loader = async (): Promise => {
- const { Client } = await import('@concurrent-world/client')
+ const { Client } = await import('@concrnt/worldlib')
if (prvkey !== '') {
Client.create(prvkey, domain, {
diff --git a/src/context/ConcordContext.tsx b/app/src/context/ConcordContext.tsx
similarity index 99%
rename from src/context/ConcordContext.tsx
rename to app/src/context/ConcordContext.tsx
index b36d9fc8..fdbfb4be 100644
--- a/src/context/ConcordContext.tsx
+++ b/app/src/context/ConcordContext.tsx
@@ -1,6 +1,6 @@
import { createContext, useCallback, useContext, useEffect, useState } from 'react'
import { CCDrawer } from '../components/ui/CCDrawer'
-import { type BadgeRef, type Message } from '@concurrent-world/client'
+import { type BadgeRef, type Message } from '@concrnt/worldlib'
import { type Emoji, type Badge } from '../model'
import { Alert, AlertTitle, Box, Button, Divider, Paper, TextField, Typography } from '@mui/material'
import { CCUserChip } from '../components/ui/CCUserChip'
diff --git a/src/context/Confirm.tsx b/app/src/context/Confirm.tsx
similarity index 100%
rename from src/context/Confirm.tsx
rename to app/src/context/Confirm.tsx
diff --git a/src/context/EmojiPickerContext.tsx b/app/src/context/EmojiPickerContext.tsx
similarity index 100%
rename from src/context/EmojiPickerContext.tsx
rename to app/src/context/EmojiPickerContext.tsx
diff --git a/src/context/GA4.tsx b/app/src/context/GA4.tsx
similarity index 100%
rename from src/context/GA4.tsx
rename to app/src/context/GA4.tsx
diff --git a/src/context/GlobalActions.tsx b/app/src/context/GlobalActions.tsx
similarity index 98%
rename from src/context/GlobalActions.tsx
rename to app/src/context/GlobalActions.tsx
index 1689f955..6a450038 100644
--- a/src/context/GlobalActions.tsx
+++ b/app/src/context/GlobalActions.tsx
@@ -2,7 +2,7 @@ import { Box, Paper, Modal, Typography, Divider, Button, Drawer, useTheme, Toolt
import { InspectorProvider } from '../context/Inspector'
import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react'
import { useClient } from './ClientContext'
-import { type CommunityTimelineSchema, Schemas, type CoreTimeline } from '@concurrent-world/client'
+import { type CommunityTimelineSchema, Schemas, type Timeline } from '@concrnt/worldlib'
import { usePreference } from './PreferenceContext'
import { ProfileEditor } from '../components/ProfileEditor'
import { Menu } from '../components/Menu/Menu'
@@ -58,7 +58,7 @@ export const GlobalActionsProvider = (props: GlobalActionsProps): JSX.Element =>
const setupAccountRequired = client?.user !== null && client?.user.profile === undefined
const noListDetected = Object.keys(lists).length === 0
- const [timelines, setTimelines] = useState>>([])
+ const [timelines, setTimelines] = useState>>([])
const [selectedTieline, setSelectedTimeline] = useState(undefined)
const setupList = useCallback(
@@ -226,7 +226,7 @@ export const GlobalActionsProvider = (props: GlobalActionsProps): JSX.Element =>
{timelines.map((timeline) => (
>
- allKnownSubscriptions: Array>
- listedSubscriptions: Record>
- allProfiles: Array>
+ allKnownSubscriptions: Array>
+ listedSubscriptions: Record>
+ allProfiles: Array>
reloadList: () => void
getImageURL: (url?: string, params?: { maxWidth?: number; maxHeight?: number; format?: string }) => string
setSwitchToSub: (state: boolean) => void
@@ -38,7 +33,7 @@ export const GlobalStateProvider = ({ children }: GlobalStateProps): JSX.Element
const [lists] = usePreference('lists')
const [isDomainOffline, setDomainIsOffline] = useState(false)
- const [entity, setEntity] = useState(null)
+ const [entity, setEntity] = useState(null)
const isCanonicalUser = entity ? entity.domain === client?.host : true
const [isRegistered, setIsRegistered] = useState(true)
const identity = JSON.parse(localStorage.getItem('Identity') || 'null')
@@ -46,10 +41,10 @@ export const GlobalStateProvider = ({ children }: GlobalStateProps): JSX.Element
const theme = useTheme()
const isMobileSize = useMediaQuery(theme.breakpoints.down('sm'))
- const [allProfiles, setAllProfiles] = useState>>([])
+ const [allProfiles, setAllProfiles] = useState>>([])
const [allKnownTimelines, setAllKnownTimelines] = useState>>([])
- const [allKnownSubscriptions, setAllKnownSubscriptions] = useState>>([])
- const [listedSubscriptions, setListedSubscriptions] = useState>>({})
+ const [allKnownSubscriptions, setAllKnownSubscriptions] = useState>>([])
+ const [listedSubscriptions, setListedSubscriptions] = useState>>({})
const [switchToSubOpen, setKeyModalOpen] = useState(false)
@@ -94,7 +89,7 @@ export const GlobalStateProvider = ({ children }: GlobalStateProps): JSX.Element
)
).then((subs) => {
if (unmounted) return
- const validsubsarr = subs.filter((e) => e[1]) as Array<[string, CoreSubscription]>
+ const validsubsarr = subs.filter((e) => e[1]) as Array<[string, Subscription]>
const listedSubs = Object.fromEntries(validsubsarr)
setListedSubscriptions(listedSubs)
@@ -130,7 +125,7 @@ export const GlobalStateProvider = ({ children }: GlobalStateProps): JSX.Element
})
)
).then((subs) => {
- const validsubsarr = subs.filter((e) => e[1]) as Array<[string, CoreSubscription]>
+ const validsubsarr = subs.filter((e) => e[1]) as Array<[string, Subscription]>
const listedSubs = Object.fromEntries(validsubsarr)
setListedSubscriptions(listedSubs)
@@ -153,20 +148,18 @@ export const GlobalStateProvider = ({ children }: GlobalStateProps): JSX.Element
useEffect(() => {
client.api
- .fetchWithCredential(client.host, '/api/v1/entity', {
+ .fetchWithCredential(client.host, '/api/v1/entity', {
method: 'GET'
})
- .then((res) => {
- if (res.status === 403) {
- setIsRegistered(false)
- }
- res.json().then((json) => {
- setEntity(json.content)
- })
+ .then((data) => {
+ setEntity(data.content)
})
.catch((e) => {
- console.error(e)
- setDomainIsOffline(true)
+ if (e instanceof PermissionError) {
+ setIsRegistered(false)
+ } else {
+ setDomainIsOffline(true)
+ }
})
}, [client])
diff --git a/src/context/Inspector.tsx b/app/src/context/Inspector.tsx
similarity index 91%
rename from src/context/Inspector.tsx
rename to app/src/context/Inspector.tsx
index 7ca27f34..64639d5a 100644
--- a/src/context/Inspector.tsx
+++ b/app/src/context/Inspector.tsx
@@ -2,11 +2,10 @@ import { Alert, Box, IconButton, List, ListItem, Paper, Typography } from '@mui/
import { createContext, useContext, useEffect, useMemo, useState } from 'react'
import { useClient } from './ClientContext'
-import { ValidateSignature, type CoreMessage, type CoreAssociation } from '@concurrent-world/client'
+import { ValidateSignature, type Message, type Association, type Key } from '@concrnt/client'
import { Codeblock } from '../components/ui/Codeblock'
import { MessageContainer } from '../components/Message/MessageContainer'
import { CCDrawer } from '../components/ui/CCDrawer'
-import { type Key } from '@concurrent-world/client/dist/types/model/core'
import { KeyCard } from '../components/ui/KeyCard'
import { ListItemTimeline } from '../components/ui/ListItemTimeline'
import PlaylistRemoveIcon from '@mui/icons-material/PlaylistRemove'
@@ -27,25 +26,27 @@ export const InspectorProvider = (props: InspectorProps): JSX.Element => {
const { client } = useClient()
const { enqueueSnackbar } = useSnackbar()
const [inspectingItem, inspectItem] = useState<{ messageId: string; author: string } | null>(null)
- const [message, setMessage] = useState | undefined>()
- const [associations, setAssociations] = useState>>([])
+ const [message, setMessage] = useState | undefined>()
+ const [associations, setAssociations] = useState>>([])
const [keyResolution, setKeyResolution] = useState([])
useEffect(() => {
if (!inspectingItem) return
let isMounted = true
- client.api.getMessageWithAuthor(inspectingItem.messageId, inspectingItem.author).then((msg) => {
- if (!msg) return
- if (!isMounted) return
- setMessage(msg)
- if (msg.document.keyID && msg.document.keyID !== '') {
- client.api.getKeyResolution(msg.document.keyID, inspectingItem.author).then((keys) => {
- if (!isMounted) return
- setKeyResolution(keys)
- })
- }
- })
+ client.api
+ .getMessageWithAuthor(inspectingItem.messageId, inspectingItem.author, undefined, { cache: 'no-cache' })
+ .then((msg) => {
+ if (!msg) return
+ if (!isMounted) return
+ setMessage(msg)
+ if (msg.parsedDoc.keyID && msg.parsedDoc.keyID !== '') {
+ client.api.getKeyResolution(msg.parsedDoc.keyID, inspectingItem.author).then((keys) => {
+ if (!isMounted) return
+ setKeyResolution(keys)
+ })
+ }
+ })
client.api.getMessageAssociationsByTarget(inspectingItem.messageId, inspectingItem.author).then((assocs) => {
if (!isMounted) return
@@ -60,9 +61,9 @@ export const InspectorProvider = (props: InspectorProps): JSX.Element => {
const signatureIsValid = useMemo(() => {
if (message) {
return ValidateSignature(
- message._document,
+ message.document,
message.signature,
- message.document.keyID ?? message.document.signer
+ message.parsedDoc.keyID ?? message.parsedDoc.signer
)
}
return false
@@ -79,7 +80,7 @@ export const InspectorProvider = (props: InspectorProps): JSX.Element => {
const isSignedBySubkey = useMemo(() => {
if (message) {
- return message.document.keyID && message.document.keyID !== ''
+ return message.parsedDoc.keyID && message.parsedDoc.keyID !== ''
}
return false
}, [message])
@@ -142,10 +143,10 @@ export const InspectorProvider = (props: InspectorProps): JSX.Element => {
}
if (valid === undefined) {
- if (since && message && since > new Date(message.document.signedAt)) {
+ if (since && message && since > new Date(message.parsedDoc.signedAt)) {
valid = false
reason = 'keychain is not valid at the time of signing'
- } else if (until && message && until < new Date(message.document.signedAt)) {
+ } else if (until && message && until < new Date(message.parsedDoc.signedAt)) {
valid = false
reason = 'keychain is not valid at the time of signing'
} else {
@@ -201,7 +202,7 @@ export const InspectorProvider = (props: InspectorProps): JSX.Element => {
With subkey:
- {message.document.keyID}
+ {message.parsedDoc.keyID}
) : (
Signature is valid!
diff --git a/src/context/MediaViewer.tsx b/app/src/context/MediaViewer.tsx
similarity index 100%
rename from src/context/MediaViewer.tsx
rename to app/src/context/MediaViewer.tsx
diff --git a/src/context/PreferenceContext.tsx b/app/src/context/PreferenceContext.tsx
similarity index 100%
rename from src/context/PreferenceContext.tsx
rename to app/src/context/PreferenceContext.tsx
diff --git a/src/context/StorageContext.tsx b/app/src/context/StorageContext.tsx
similarity index 99%
rename from src/context/StorageContext.tsx
rename to app/src/context/StorageContext.tsx
index dd5e2c30..40740134 100644
--- a/src/context/StorageContext.tsx
+++ b/app/src/context/StorageContext.tsx
@@ -122,7 +122,7 @@ export const StorageProvider = ({ children }: { children: JSX.Element | JSX.Elem
const xhr = new XMLHttpRequest()
xhr.open('POST', `https://${client.host}/storage/files`, true)
xhr.setRequestHeader('Content-Type', file.type)
- xhr.setRequestHeader('Authorization', `Bearer ${client.api.generateApiToken(client.host)}`)
+ xhr.setRequestHeader('Authorization', `Bearer ${client.api.authProvider.getAuthToken(client.host)}`)
xhr.upload.onprogress = (e) => {
if (e.lengthComputable) {
diff --git a/src/context/Theme.tsx b/app/src/context/Theme.tsx
similarity index 96%
rename from src/context/Theme.tsx
rename to app/src/context/Theme.tsx
index a00fbfd3..66c6264d 100644
--- a/src/context/Theme.tsx
+++ b/app/src/context/Theme.tsx
@@ -17,7 +17,6 @@ export const ConcrntThemeProvider = (props: ConcrntThemeProps): JSX.Element => {
useEffect(() => {
const newtheme = loadConcurrentTheme(themeName, customThemes, { fontSize: baseFontSize })
newtheme.typography.fontSize = baseFontSize
- console.log('fontsize changed:', baseFontSize)
localStorage.setItem('theme', JSON.stringify(newtheme))
setTheme(newtheme)
let themeColorMetaTag: HTMLMetaElement = document.querySelector('meta[name="theme-color"]') as HTMLMetaElement
diff --git a/src/context/Ticker.tsx b/app/src/context/Ticker.tsx
similarity index 100%
rename from src/context/Ticker.tsx
rename to app/src/context/Ticker.tsx
diff --git a/src/context/TimelineDrawer.tsx b/app/src/context/TimelineDrawer.tsx
similarity index 95%
rename from src/context/TimelineDrawer.tsx
rename to app/src/context/TimelineDrawer.tsx
index 31e5cb93..f197508e 100644
--- a/src/context/TimelineDrawer.tsx
+++ b/app/src/context/TimelineDrawer.tsx
@@ -1,7 +1,7 @@
import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react'
import { useClient } from './ClientContext'
import { CCDrawer } from '../components/ui/CCDrawer'
-import { type CommunityTimelineSchema, type Timeline as typeTimeline } from '@concurrent-world/client'
+import { type CommunityTimelineSchema, type Timeline as typeTimeline } from '@concrnt/worldlib'
import { TimelineHeader } from '../components/TimelineHeader'
import { type VListHandle } from 'virtua'
@@ -36,10 +36,8 @@ export const TimelineDrawerProvider = (props: TimelineDrawerProps): JSX.Element
const navigate = useNavigate()
useEffect(() => {
- console.log('TimelineDrawerProvider', timelineID)
if (!timelineID) return
client.getTimeline(timelineID).then((timeline) => {
- console.log('TimelineDrawerProvider', timeline)
setTimeline(timeline)
})
}, [timelineID])
@@ -100,7 +98,7 @@ export const TimelineDrawerProvider = (props: TimelineDrawerProps): JSX.Element
>
{readable ? (
: <>}
/>
diff --git a/app/src/context/UserDrawer.tsx b/app/src/context/UserDrawer.tsx
new file mode 100644
index 00000000..806d74cd
--- /dev/null
+++ b/app/src/context/UserDrawer.tsx
@@ -0,0 +1,170 @@
+import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react'
+import { useClient } from './ClientContext'
+import { CCDrawer } from '../components/ui/CCDrawer'
+import { Schemas, type User } from '@concrnt/worldlib'
+import { TimelineHeader } from '../components/TimelineHeader'
+import { type VListHandle } from 'virtua'
+
+import { Box, Collapse, Divider, Tab, Tabs } from '@mui/material'
+
+import { useLocation } from 'react-router-dom'
+import AlternateEmailIcon from '@mui/icons-material/AlternateEmail'
+import { Profile } from '../components/Profile'
+import { QueryTimelineReader } from '../components/QueryTimeline'
+import { TimelineFilter } from '../components/TimelineFilter'
+import { useTranslation } from 'react-i18next'
+
+export interface UserDrawerState {
+ open: (id: string) => void
+}
+
+const UserDrawerContext = createContext(undefined)
+
+interface UserDrawerProps {
+ children: JSX.Element | JSX.Element[]
+}
+
+export const UserDrawerProvider = (props: UserDrawerProps): JSX.Element => {
+ const { client } = useClient()
+
+ const [CCID, setCCID] = useState(null)
+ const [user, setUser] = useState(null)
+
+ useEffect(() => {
+ if (!CCID) return
+ client.getUser(CCID).then((user) => {
+ setUser(user)
+ })
+ }, [CCID])
+
+ const { t } = useTranslation('', { keyPrefix: 'common' })
+
+ const timelineRef = useRef(null)
+
+ const [showHeader, setShowHeader] = useState(false)
+
+ const path = useLocation()
+ const subProfileID = path.hash.replace('#', '')
+
+ const [filter, setFilter] = useState(undefined)
+
+ const [tab, setTab] = useState<'' | 'media' | 'activity'>('')
+
+ const targetTimeline = useMemo(() => {
+ switch (tab ?? '') {
+ case '':
+ case 'media':
+ if (subProfileID) return 'world.concrnt.t-subhome.' + subProfileID + '@' + user?.ccid
+ return user?.homeTimeline
+ case 'activity':
+ return user?.associationTimeline
+ }
+ }, [user, tab, subProfileID])
+
+ const query = useMemo(() => {
+ switch (tab) {
+ case 'media':
+ return { schema: Schemas.mediaMessage }
+ case 'activity':
+ return { schema: filter }
+ default:
+ return {}
+ }
+ }, [tab, filter])
+
+ const open = useCallback((id: string) => {
+ setCCID(id)
+ }, [])
+
+ return (
+ {
+ return {
+ open
+ }
+ }, [])}
+ >
+ {props.children}
+ {
+ setCCID(null)
+ // hash がある場合は削除
+ if (subProfileID) {
+ window.location.hash = ''
+ }
+ setUser(null)
+ }}
+ >
+
+
+
+ }
+ onTitleClick={() => {
+ timelineRef.current?.scrollToIndex(0, { align: 'start', smooth: true })
+ }}
+ />
+
+
+
+ {targetTimeline && CCID && (
+ {
+ setShowHeader(top > 180)
+ }}
+ header={
+ <>
+ {
+ window.location.hash = id
+ }}
+ />
+ {
+ setTab(value)
+ }}
+ textColor="secondary"
+ indicatorColor="secondary"
+ >
+
+
+
+
+
+ {tab === 'activity' && (
+ <>
+
+
+
+ )}
+
+ }
+ />
+ )}
+
+
+
+ )
+}
+
+export function useUserDrawer(): UserDrawerState {
+ return useContext(UserDrawerContext) as UserDrawerState
+}
diff --git a/src/context/WatchingStreamContext.tsx b/app/src/context/WatchingStreamContext.tsx
similarity index 100%
rename from src/context/WatchingStreamContext.tsx
rename to app/src/context/WatchingStreamContext.tsx
diff --git a/src/context/urlSummaryContext.tsx b/app/src/context/urlSummaryContext.tsx
similarity index 89%
rename from src/context/urlSummaryContext.tsx
rename to app/src/context/urlSummaryContext.tsx
index b87ccfc5..c9a7991a 100644
--- a/src/context/urlSummaryContext.tsx
+++ b/app/src/context/urlSummaryContext.tsx
@@ -1,4 +1,4 @@
-import { fetchWithTimeout } from '@concurrent-world/client'
+import { fetchWithTimeout } from '@concrnt/client'
import { createContext, useCallback, useContext, useRef } from 'react'
export interface Summary {
@@ -27,7 +27,7 @@ export const UrlSummaryProvider = (props: UrlSummaryProviderProps): JSX.Element
const getSummary = useCallback(
async (url: string): Promise => {
if (url in cache.current) return await cache.current[url]
- const response = await fetchWithTimeout(props.host, `/summary?url=${url}`, {}).catch(() => {
+ const response = await fetchWithTimeout(`https://${props.host}/summary?url=${url}`, {}).catch(() => {
cache.current[url] = Promise.resolve(undefined)
})
if (!response) return undefined
diff --git a/src/declare/window.d.ts b/app/src/declare/window.d.ts
similarity index 100%
rename from src/declare/window.d.ts
rename to app/src/declare/window.d.ts
diff --git a/src/hooks/useObjectList.ts b/app/src/hooks/useObjectList.ts
similarity index 100%
rename from src/hooks/useObjectList.ts
rename to app/src/hooks/useObjectList.ts
diff --git a/src/hooks/usePersistent.ts b/app/src/hooks/usePersistent.ts
similarity index 100%
rename from src/hooks/usePersistent.ts
rename to app/src/hooks/usePersistent.ts
diff --git a/src/hooks/useRefWithForceUpdate.ts b/app/src/hooks/useRefWithForceUpdate.ts
similarity index 100%
rename from src/hooks/useRefWithForceUpdate.ts
rename to app/src/hooks/useRefWithForceUpdate.ts
diff --git a/src/hooks/useResourceManager.ts b/app/src/hooks/useResourceManager.ts
similarity index 92%
rename from src/hooks/useResourceManager.ts
rename to app/src/hooks/useResourceManager.ts
index 5396b3b0..3d796d57 100644
--- a/src/hooks/useResourceManager.ts
+++ b/app/src/hooks/useResourceManager.ts
@@ -7,9 +7,7 @@ export interface IuseResourceManager {
invalidate: (key: string) => void
}
-export function useResourceManager(
- resolver: (key: string) => Promise
-): IuseResourceManager {
+export function useResourceManager(resolver: (key: string) => Promise): IuseResourceManager {
const body = useRef>({})
const get = useCallback(async (key: string): Promise => {
diff --git a/src/i18n.ts b/app/src/i18n.ts
similarity index 94%
rename from src/i18n.ts
rename to app/src/i18n.ts
index 1bb7f5a8..b8b0562b 100644
--- a/src/i18n.ts
+++ b/app/src/i18n.ts
@@ -12,7 +12,7 @@ i18n.use(Backend)
'zh-CN': ['zh-Hans', 'en'],
'zh-HK': ['zh-Hant', 'en'],
'zh-TW': ['zh-Hant', 'en'],
- 'default': ['en']
+ default: ['en']
},
interpolation: {
escapeValue: false // not needed for react as it escapes by default
diff --git a/src/main.tsx b/app/src/main.tsx
similarity index 100%
rename from src/main.tsx
rename to app/src/main.tsx
diff --git a/src/model.ts b/app/src/model.ts
similarity index 95%
rename from src/model.ts
rename to app/src/model.ts
index 16c0af0f..67c4d3b8 100644
--- a/src/model.ts
+++ b/app/src/model.ts
@@ -9,9 +9,9 @@ import type {
TypeText
} from '@mui/material/styles/createPalette'
-import type { CommunityTimelineSchema, CoreTimelineItem, Timeline } from '@concurrent-world/client'
+import type { TimelineItem } from '@concrnt/client'
-export interface StreamItemDated extends CoreTimelineItem {
+export interface StreamItemDated extends TimelineItem {
LastUpdated: number
}
diff --git a/src/pages/AccountImport.tsx b/app/src/pages/AccountImport.tsx
similarity index 98%
rename from src/pages/AccountImport.tsx
rename to app/src/pages/AccountImport.tsx
index 17fca91a..38258080 100644
--- a/src/pages/AccountImport.tsx
+++ b/app/src/pages/AccountImport.tsx
@@ -9,7 +9,7 @@ import PasswordIcon from '@mui/icons-material/Password'
import { IconButtonWithLabel } from '../components/ui/IconButtonWithLabel'
import { useTranslation } from 'react-i18next'
import { Suspense, lazy, useState } from 'react'
-import { Client } from '@concurrent-world/client'
+import { Client } from '@concrnt/worldlib'
import { Helmet } from 'react-helmet-async'
const QRCodeReader = lazy(() => import('../components/ui/QRCodeReader'))
diff --git a/src/pages/Associations.tsx b/app/src/pages/Associations.tsx
similarity index 91%
rename from src/pages/Associations.tsx
rename to app/src/pages/Associations.tsx
index 44608a50..ab5380ed 100644
--- a/src/pages/Associations.tsx
+++ b/app/src/pages/Associations.tsx
@@ -6,7 +6,7 @@ import { useClient } from '../context/ClientContext'
export function Associations(): JSX.Element {
const { client } = useClient()
- const streams = useMemo(() => {
+ const timelines = useMemo(() => {
const target = client.user?.notificationTimeline
return target ? [target] : []
}, [client])
@@ -31,7 +31,7 @@ export function Associations(): JSX.Element {
-
+
)
}
diff --git a/src/pages/Concord.tsx b/app/src/pages/Concord.tsx
similarity index 100%
rename from src/pages/Concord.tsx
rename to app/src/pages/Concord.tsx
diff --git a/src/pages/Contacts.tsx b/app/src/pages/Contacts.tsx
similarity index 100%
rename from src/pages/Contacts.tsx
rename to app/src/pages/Contacts.tsx
diff --git a/src/pages/Devtool.tsx b/app/src/pages/Devtool.tsx
similarity index 100%
rename from src/pages/Devtool.tsx
rename to app/src/pages/Devtool.tsx
diff --git a/src/pages/Entity.tsx b/app/src/pages/Entity.tsx
similarity index 98%
rename from src/pages/Entity.tsx
rename to app/src/pages/Entity.tsx
index 924da4bd..7f0b7678 100644
--- a/src/pages/Entity.tsx
+++ b/app/src/pages/Entity.tsx
@@ -2,7 +2,7 @@ import { Box, Collapse, Divider, Tab, Tabs } from '@mui/material'
import { useEffect, useMemo, useRef, useState } from 'react'
import { useLocation, useNavigate, useParams } from 'react-router-dom'
import { useClient } from '../context/ClientContext'
-import { type EmptyTimelineSchema, Schemas, type Timeline, type User } from '@concurrent-world/client'
+import { type EmptyTimelineSchema, Schemas, type Timeline, type User } from '@concrnt/worldlib'
import { type VListHandle } from 'virtua'
import { TimelineHeader } from '../components/TimelineHeader'
import AlternateEmailIcon from '@mui/icons-material/AlternateEmail'
@@ -46,7 +46,7 @@ export function EntityPage(): JSX.Element {
useEffect(() => {
if (!id) return
- client.getUser(id, hint).then((user) => {
+ client.getUser(id, hint, { TTL: 0 }).then((user) => {
setUser(user)
})
}, [id])
diff --git a/src/pages/Explorer.tsx b/app/src/pages/Explorer.tsx
similarity index 96%
rename from src/pages/Explorer.tsx
rename to app/src/pages/Explorer.tsx
index d24db8b4..aad15bb7 100644
--- a/src/pages/Explorer.tsx
+++ b/app/src/pages/Explorer.tsx
@@ -1,5 +1,6 @@
import { Box, Button, Divider, Tab, Tabs, TextField, Typography, useTheme } from '@mui/material'
-import { type CommunityTimelineSchema, Schemas, type CoreProfile, type Timeline } from '@concurrent-world/client'
+import { type CommunityTimelineSchema, Schemas, type Timeline } from '@concrnt/worldlib'
+import { type Profile } from '@concrnt/client'
import { useClient } from '../context/ClientContext'
import { NavLink, useLocation, useNavigate, useParams } from 'react-router-dom'
import { useEffect, useMemo, useState } from 'react'
@@ -22,7 +23,7 @@ interface StreamWithDomain {
interface ProfileWithDomain {
domain: string
- profile: CoreProfile
+ profile: Profile
}
export function Explorer(): JSX.Element {
@@ -65,8 +66,8 @@ export function Explorer(): JSX.Element {
const { enqueueSnackbar } = useSnackbar()
const selectedDomains = useMemo(() => {
- return hashQuery.domains?.split(',') ?? [client.api.host]
- }, [hashQuery, client.api.host])
+ return hashQuery.domains?.split(',') ?? [client.host]
+ }, [hashQuery, client.host])
const updateHash = (key: string, value: string): void => {
hashQuery[key] = value
@@ -78,7 +79,6 @@ export function Explorer(): JSX.Element {
const load = (): void => {
client.api.getDomains().then((e) => {
- if (!client.api.host) return
const domains = [client.host, ...e.filter((e) => e.fqdn !== client.host).map((e) => e.fqdn)]
setDomains(domains)
})
@@ -139,7 +139,7 @@ export function Explorer(): JSX.Element {
.flat()
.reverse()
.filter((e) => {
- return 'username' in e.profile.document.body && 'avatar' in e.profile.document.body
+ return 'username' in e.profile.parsedDoc.body && 'avatar' in e.profile.parsedDoc.body
})
.sort((a, b) => {
if (a.profile.cdate < b.profile.cdate) return 1
@@ -186,8 +186,6 @@ export function Explorer(): JSX.Element {
)
}, [search])
- if (!client.api.host) return <>loading...
-
return (
<>
@@ -294,7 +292,7 @@ export function Explorer(): JSX.Element {
return (
{t('createNewCommunity.desc1')}
- {client.api.host}
+ {client.host}
{t('createNewCommunity.desc2')}
diff --git a/src/pages/ExplorerPlus.tsx b/app/src/pages/ExplorerPlus.tsx
similarity index 80%
rename from src/pages/ExplorerPlus.tsx
rename to app/src/pages/ExplorerPlus.tsx
index 7264cdd9..6910e20f 100644
--- a/src/pages/ExplorerPlus.tsx
+++ b/app/src/pages/ExplorerPlus.tsx
@@ -34,7 +34,7 @@ import ForumIcon from '@mui/icons-material/Forum'
import EmojiPeopleIcon from '@mui/icons-material/EmojiPeople'
import { useClient } from '../context/ClientContext'
import { useSnackbar } from 'notistack'
-import { type CommunityTimelineSchema, Schemas } from '@concurrent-world/client'
+import { type CommunityTimelineSchema, Schemas } from '@concrnt/worldlib'
import { CCEditor } from '../components/ui/cceditor'
import { CCDrawer } from '../components/ui/CCDrawer'
@@ -382,73 +382,104 @@ export function ExplorerPlusPage(): JSX.Element {
>
{timelines.map((tl) => {
return (
-
-
-
-
-
+
-
-
- {tl._parsedDocument.body.name}
-
-
+
- {tl._parsedDocument.body.description}
-
-
+ override={tl._parsedDocument.body.banner}
+ />
+
-
-
- {getDomainFromFQDN(tl.domainFQDN)?.meta?.nickname}
-
-
-
-
- {
- open(tl.id)
- }}
- >
-
-
-
+
+
+ {tl._parsedDocument.body.name}
+
+
+ {tl._parsedDocument.body.description}
+
+
+
+
+
+ {getDomainFromFQDN(tl.domainFQDN)?.meta?.nickname}
+
+ {
+ e.stopPropagation()
+ e.preventDefault()
+ }}
+ >
+
+
+ {
+ open(tl.id)
+ }}
+ >
+
+
+
+
-
+
)
})}
@@ -465,7 +496,7 @@ export function ExplorerPlusPage(): JSX.Element {
{t('createNewCommunity.desc1')}
- {client.api.host}
+ {client.host}
{t('createNewCommunity.desc2')}
@@ -581,7 +612,7 @@ export function ExplorerPlusPage(): JSX.Element {
()
useEffect(() => {
if (!authorID || !messageID) return
- const client = new Client('ariake.concrnt.net')
- initializeClient(client)
let isMounted = true
- client
- .getMessage(messageID, authorID)
- .then((msg) => {
- if (!isMounted || !msg) return
- setMessage(msg)
+ Client.createAsGuest('ariake.concrnt.net').then((client) => {
+ initializeClient(client)
+ client
+ .getMessage(messageID, authorID)
+ .then((msg) => {
+ if (!isMounted || !msg) return
+ setMessage(msg)
- msg.getReplyMessages().then((replies) => {
- if (!isMounted) return
- setReplies(replies)
- })
-
- if (msg.schema === Schemas.replyMessage) {
- msg.getReplyTo().then((replyTo) => {
+ msg.getReplyMessages().then((replies) => {
if (!isMounted) return
- setReplyTo(replyTo)
+ setReplies(replies)
})
- }
- })
- .finally(() => {
- if (!isMounted) return
- setIsFetching(false)
- })
+
+ if (msg.schema === Schemas.replyMessage) {
+ msg.getReplyTo().then((replyTo) => {
+ if (!isMounted) return
+ setReplyTo(replyTo)
+ })
+ }
+ })
+ .finally(() => {
+ if (!isMounted) return
+ setIsFetching(false)
+ })
+ })
return () => {
isMounted = false
@@ -191,7 +192,7 @@ export default function GuestMessagePage(): JSX.Element {
itemProp="datePublished"
content={new Date(message.cdate).toISOString()}
/>
-
-
@@ -318,7 +319,7 @@ export default function GuestMessagePage(): JSX.Element {
reply.message.cdate
).toISOString()}
/>
- {
if (!id) return
- const client = new Client('ariake.concrnt.net')
- initializeClient(client)
- client.getUser(id).then((u) => {
- if (!u) return
- setUser(u)
- const timelineID = subProfileID ? 'world.concrnt.t-subhome.' + subProfileID + '@' + u.ccid : u.homeTimeline
- setTargetStream([timelineID])
+ Client.createAsGuest('ariake.concrnt.net').then((client) => {
+ initializeClient(client)
- client.api.getTimeline(timelineID).then((t) => {
- if (!t) return
- if (t.policy !== 'https://policy.concrnt.world/t/inline-read-write.json' || !t.policyParams) {
- setIsPrivateTimeline(false)
- return
- }
- try {
- const params = JSON.parse(t.policyParams)
- setIsPrivateTimeline(params.isReadPublic === false)
- } catch (e) {
- console.error(e)
- }
+ client.getUser(id).then((u) => {
+ if (!u) return
+ setUser(u)
+ const timelineID = subProfileID
+ ? 'world.concrnt.t-subhome.' + subProfileID + '@' + u.ccid
+ : u.homeTimeline
+ setTargetStream([timelineID])
+
+ client.api.getTimeline(timelineID).then((t) => {
+ if (!t) return
+ if (t.policy !== 'https://policy.concrnt.world/t/inline-read-write.json' || !t.policyParams) {
+ setIsPrivateTimeline(false)
+ return
+ }
+ try {
+ const params = JSON.parse(t.policyParams)
+ setIsPrivateTimeline(params.isReadPublic === false)
+ } catch (e) {
+ console.error(e)
+ }
+ })
})
})
}, [id, path.hash])
@@ -165,7 +169,7 @@ export default function GuestProfilePage(): JSX.Element {
) : (
{
- if (!e) return
- setTimeline(e)
+ Client.createAsGuest(resolver).then((client) => {
+ initializeClient(client)
- if (e.policy === 'https://policy.concrnt.world/t/inline-read-write.json' && e?.policyParams) {
- try {
- const params = JSON.parse(e.policyParams)
- setIsPrivateTimeline(!params.isReadPublic)
- } catch (e) {
- setIsPrivateTimeline(true)
+ client.api.getTimeline(id).then((e) => {
+ if (!e) return
+ setTimeline(e)
+
+ if (e.policy === 'https://policy.concrnt.world/t/inline-read-write.json' && e?.policyParams) {
+ try {
+ const params = JSON.parse(e.policyParams)
+ setIsPrivateTimeline(!params.isReadPublic)
+ } catch (e) {
+ setIsPrivateTimeline(true)
+ }
}
- }
+ })
})
}, [id])
@@ -51,12 +54,12 @@ export default function GuestTimelinePage(): JSX.Element {
<>
- {`#${timeline.document.body.name || 'No Title'} - Concrt`}
+ {`#${timeline.parsedDoc.body.name || 'No Title'} - Concrt`}
@@ -105,7 +108,7 @@ export default function GuestTimelinePage(): JSX.Element {
}}
>
: }
/>
@@ -137,7 +140,7 @@ export default function GuestTimelinePage(): JSX.Element {
) : (
}
/>
)}
diff --git a/src/pages/ListPage.tsx b/app/src/pages/ListPage.tsx
similarity index 87%
rename from src/pages/ListPage.tsx
rename to app/src/pages/ListPage.tsx
index e260a5ac..95a81101 100644
--- a/src/pages/ListPage.tsx
+++ b/app/src/pages/ListPage.tsx
@@ -6,11 +6,10 @@ import { Timeline } from '../components/Timeline'
import { useClient } from '../context/ClientContext'
import {
type CommunityTimelineSchema,
- type Timeline as CoreTimeline,
- type CoreSubscription,
type ListSubscriptionSchema,
- type CoreSubscriptionItem
-} from '@concurrent-world/client'
+ type Timeline as TypeTimeline
+} from '@concrnt/worldlib'
+import { type Subscription as CoreSubscription, type SubscriptionItem as CoreSubscriptionItem } from '@concrnt/client'
import TuneIcon from '@mui/icons-material/Tune'
import ExploreIcon from '@mui/icons-material/Explore'
import { ListSettings } from '../components/ListSettings'
@@ -25,7 +24,6 @@ import { useEditorModal } from '../components/EditorModal'
import { type StreamList } from '../model'
import { Helmet } from 'react-helmet-async'
import { useGlobalActions } from '../context/GlobalActions'
-import { timeline } from '@google/model-viewer/lib/utilities/animation'
export function ListPage(): JSX.Element {
const { client } = useClient()
@@ -60,12 +58,21 @@ export function ListPage(): JSX.Element {
const [tabSubscription, setTabSubscription] = useState()
const list: StreamList | undefined = lists[id]
- const postStreams = useMemo(() => {
- if (!list) return []
- return list.defaultPostStreams
- .map((streamID) => allKnownTimelines.find((e) => (e.cacheKey ?? e.id) === streamID))
- .filter((e) => e !== undefined) as Array>
- }, [list, allKnownTimelines])
+ const [postTimelines, setPostTimelines] = useState>>([])
+
+ useEffect(() => {
+ if (!list) return
+ Promise.allSettled(
+ list.defaultPostStreams.map((streamID) => {
+ return client.getTimeline(streamID)
+ })
+ ).then((results) => {
+ const fulfilled = results.filter((e) => e.status === 'fulfilled') as Array<
+ PromiseFulfilledResult>
+ >
+ setPostTimelines(fulfilled.map((e) => e.value))
+ })
+ }, [list, client])
const defaultPostHome = useMemo(() => {
if (!list) return true
@@ -99,18 +106,18 @@ export function ListPage(): JSX.Element {
if (url) draft += `${url}`
if (draft.trim() !== '') setIntentDraft(draft)
}
- }, [title, text, url, postStreams])
+ }, [title, text, url, postTimelines])
useEffect(() => {
- if (list?.defaultPostStreams.length !== postStreams.length) return
+ if (list?.defaultPostStreams.length !== postTimelines.length) return
const opts = {
- streamPickerInitial: postStreams,
+ streamPickerInitial: postTimelines,
defaultPostHome,
profile: list?.defaultProfile
}
editorModal.registerOptions(opts)
- if (intentDraft && postStreams.length > 0) {
+ if (intentDraft && postTimelines.length > 0) {
editorModal.open({
draft: intentDraft
})
@@ -120,7 +127,7 @@ export function ListPage(): JSX.Element {
return () => {
editorModal.unregisterOptions(opts)
}
- }, [postStreams, defaultPostHome, list?.defaultProfile])
+ }, [postTimelines, defaultPostHome, list?.defaultProfile])
const pinnedSubscriptions = useMemo(() => {
return Object.keys(lists)
@@ -139,7 +146,6 @@ export function ListPage(): JSX.Element {
useEffect(() => {
client.api.getSubscription(id).then((sub) => {
- if (!sub) return
setSubscription(sub)
})
}, [id, client, updater])
@@ -177,8 +183,8 @@ export function ListPage(): JSX.Element {
return (
<>
- {`${subscription?.document.body.name ?? 'No Name'} - Concrnt`}
-
+ {`${subscription?.parsedDoc.body.name ?? 'No Name'} - Concrnt`}
+
{pinnedSubscriptions.map((sub) => {
- const useIcon = sub.document.body.iconURL && lists[sub.id].isIconTab
+ const useIcon = sub.parsedDoc.body.iconURL && lists[sub.id].isIconTab
return (
) : (
- sub.document.body.name
+ sub.parsedDoc.body.name
)
}
onTouchStart={(a) => {
@@ -281,7 +287,7 @@ export function ListPage(): JSX.Element {
maxRows={7}
subprofile={list.defaultProfile}
streamPickerOptions={allKnownTimelines}
- streamPickerInitial={postStreams}
+ streamPickerInitial={postTimelines}
defaultPostHome={defaultPostHome}
sx={{
p: { xs: 0.5, sm: 1 }
@@ -291,7 +297,7 @@ export function ListPage(): JSX.Element {
}
- streams={timelines}
+ timelineFQIDs={timelines}
ref={timelineRef}
/>
) : (
@@ -358,9 +364,7 @@ export function ListPage(): JSX.Element {
overflowY: 'auto'
}}
>
- {tabSubscription?.map((sub) => (
-
- ))}
+ {tabSubscription?.map((sub) => )}
)
diff --git a/src/pages/ManageSubs.tsx b/app/src/pages/ManageSubs.tsx
similarity index 97%
rename from src/pages/ManageSubs.tsx
rename to app/src/pages/ManageSubs.tsx
index 7278d5ae..ec45368b 100644
--- a/src/pages/ManageSubs.tsx
+++ b/app/src/pages/ManageSubs.tsx
@@ -4,7 +4,8 @@ import { useTranslation } from 'react-i18next'
import { usePreference } from '../context/PreferenceContext'
import { useState } from 'react'
-import { Schemas, type CoreSubscription } from '@concurrent-world/client'
+import { Schemas } from '@concrnt/worldlib'
+import { Subscription } from '@concrnt/client'
import AddIcon from '@mui/icons-material/Add'
import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline'
@@ -27,10 +28,10 @@ export function ManageSubsPage(): JSX.Element {
const { reloadList, allKnownSubscriptions } = useGlobalState()
const listedSubs: string[] = Object.keys(lists)
- const unlistedSubs: Array> = allKnownSubscriptions.filter(
+ const unlistedSubs: Array> = allKnownSubscriptions.filter(
(sub) => !Object.keys(lists).includes(sub.id)
)
- const [inspectedSub, setInspectedSub] = useState | null>(null)
+ const [inspectedSub, setInspectedSub] = useState | null>(null)
return (
<>
diff --git a/src/pages/MessagePage.tsx b/app/src/pages/MessagePage.tsx
similarity index 97%
rename from src/pages/MessagePage.tsx
rename to app/src/pages/MessagePage.tsx
index 820a5355..990f8f09 100644
--- a/src/pages/MessagePage.tsx
+++ b/app/src/pages/MessagePage.tsx
@@ -25,8 +25,7 @@ import {
type ReactionAssociationSchema,
type ReplyAssociationSchema,
type RerouteAssociationSchema
-} from '@concurrent-world/client'
-import { MessageView } from '../components/Message/MessageView'
+} from '@concrnt/worldlib'
import { RerouteMessageFrame } from '../components/Message/RerouteMessageFrame'
import { FavoriteAssociation } from '../components/Association/FavoriteAssociation'
import { ReactionAssociation } from '../components/Association/ReactionAssociation'
@@ -38,6 +37,7 @@ import { PlainMessageView } from '../components/Message/PlainMessageView'
import { MediaMessageView } from '../components/Message/MediaMessageView'
import { Helmet } from 'react-helmet-async'
import { MessageSkeleton } from '../components/MessageSkeleton'
+import { MarkdownMessageView } from '../components/Message/MarkdownMessageView'
export function MessagePage(): JSX.Element {
const { authorID, messageID } = useParams()
@@ -193,7 +193,11 @@ export function MessagePage(): JSX.Element {
{replyTo && (
<>
-
+
@@ -202,7 +206,7 @@ export function MessagePage(): JSX.Element {
{(message.schema === Schemas.markdownMessage || message.schema === Schemas.replyMessage) && (
<>
- }
lastUpdated={lastUpdated}
@@ -304,7 +308,7 @@ export function MessagePage(): JSX.Element {
minRows={3}
maxRows={7}
streamPickerInitial={
- message.postedStreams?.filter(
+ message.postedTimelines?.filter(
(t) => t.schema === Schemas.communityTimeline
) ?? []
}
@@ -332,7 +336,7 @@ export function MessagePage(): JSX.Element {
padding: '20px'
}}
>
- ()
const [identity, setIdentity] = usePersistent('Identity', GenerateIdentity())
- const [profile, setProfile] = useState | null>(null)
+ const [profile, setProfile] = useState | null>(null)
const [domain, setDomain] = usePersistent('Domain', 'ariake.concrnt.net')
const activeStep = parseInt(location.hash.replace('#', '')) || 0
@@ -142,7 +136,7 @@ export default function Registration(): JSX.Element {
setupAccount()
}}
domain={domain}
- profile={profile?.document.body ?? {}}
+ profile={profile?.parsedDoc?.body ?? {}}
/>
)
}
diff --git a/src/pages/Settings.tsx b/app/src/pages/Settings.tsx
similarity index 100%
rename from src/pages/Settings.tsx
rename to app/src/pages/Settings.tsx
diff --git a/src/pages/StreamPage.tsx b/app/src/pages/StreamPage.tsx
similarity index 71%
rename from src/pages/StreamPage.tsx
rename to app/src/pages/StreamPage.tsx
index e15d79cc..91e36460 100644
--- a/src/pages/StreamPage.tsx
+++ b/app/src/pages/StreamPage.tsx
@@ -6,7 +6,7 @@ import { useClient } from '../context/ClientContext'
import { Timeline } from '../components/Timeline/main'
import { StreamInfo } from '../components/StreamInfo'
import { usePreference } from '../context/PreferenceContext'
-import { type CommunityTimelineSchema, type Timeline as typeTimeline } from '@concurrent-world/client'
+import { type CommunityTimelineSchema, type Timeline as typeTimeline } from '@concrnt/worldlib'
import { CCDrawer } from '../components/ui/CCDrawer'
import WatchingStreamContextProvider from '../context/WatchingStreamContext'
import { type VListHandle } from 'virtua'
@@ -32,62 +32,62 @@ export const StreamPage = memo((): JSX.Element => {
const timelineRef = useRef(null)
- const targetStreamID = id ?? ''
- const [targetStream, setTargetStream] = useState | null>(null)
+ const targetTimelineID = id ?? ''
+ const [timeline, setTimeline] = useState | null>(null)
- const [streamInfoOpen, setStreamInfoOpen] = useState(false)
+ const [timelineInfoOpen, setTimelineInfoOpen] = useState(false)
const isOwner = useMemo(() => {
- return targetStream?.author === client.ccid
- }, [targetStream])
+ return timeline?.author === client.ccid
+ }, [timeline])
- const isRestricted = targetStream?.policy === 'https://policy.concrnt.world/t/inline-read-write.json'
+ const isRestricted = timeline?.policy === 'https://policy.concrnt.world/t/inline-read-write.json'
const writeable = isRestricted
- ? targetStream?.policyParams?.isWritePublic
+ ? timeline?.policyParams?.isWritePublic
? true
- : targetStream?.policyParams?.writer?.includes(client.ccid ?? '')
+ : timeline?.policyParams?.writer?.includes(client.ccid ?? '')
: true
const readable = isRestricted
- ? targetStream?.policyParams?.isReadPublic
+ ? timeline?.policyParams?.isReadPublic
? true
- : targetStream?.policyParams?.reader?.includes(client.ccid ?? '')
+ : timeline?.policyParams?.reader?.includes(client.ccid ?? '')
: true
- const streams = useMemo(() => {
- return targetStream ? [targetStream] : []
- }, [targetStream])
+ const timelines = useMemo(() => {
+ return timeline ? [timeline] : []
+ }, [timeline])
- const streamIDs = useMemo(() => {
- return targetStream ? [targetStream.id] : []
- }, [targetStream])
+ const timelineFQIDs = useMemo(() => {
+ return timeline ? [timeline.fqid] : []
+ }, [timeline])
useEffect(() => {
- client.getTimeline(targetStreamID).then((stream) => {
- if (stream) {
- setTargetStream(stream)
+ client.getTimeline(targetTimelineID, { TTL: 0 }).then((t) => {
+ if (t) {
+ setTimeline(t)
}
})
}, [id])
const editorModal = useEditorModal()
useEffect(() => {
- if (!targetStream) return
+ if (!timeline) return
const opts = {
- streamPickerInitial: [targetStream]
+ streamPickerInitial: [timeline]
}
editorModal.registerOptions(opts)
return () => {
editorModal.unregisterOptions(opts)
}
- }, [targetStream])
+ }, [timeline])
return (
<>
- {`#${targetStream?.document.body.name ?? 'Not Found'} - Concrnt`}
-
+ {`#${timeline?.document.body.name ?? 'Not Found'} - Concrnt`}
+
{
}}
>
: }
secondaryAction={isOwner ? : }
onTitleClick={() => {
timelineRef.current?.scrollToIndex(0, { align: 'start', smooth: true })
}}
onSecondaryActionClick={() => {
- setStreamInfoOpen(true)
+ setTimelineInfoOpen(true)
}}
/>
{readable ? (
-
+
{
{
) : (
-
- {targetStream && }
+
+ {timeline && }
)}
{
- setStreamInfoOpen(false)
+ setTimelineInfoOpen(false)
}}
>
diff --git a/src/pages/Tutorial.tsx b/app/src/pages/Tutorial.tsx
similarity index 98%
rename from src/pages/Tutorial.tsx
rename to app/src/pages/Tutorial.tsx
index 9ace327e..c90eb065 100644
--- a/src/pages/Tutorial.tsx
+++ b/app/src/pages/Tutorial.tsx
@@ -4,7 +4,7 @@ import { useClient } from '../context/ClientContext'
import { usePreference } from '../context/PreferenceContext'
import { Suspense, lazy, useState } from 'react'
import { MarkdownRenderer } from '../components/ui/MarkdownRenderer'
-import { type Identity } from '@concurrent-world/client'
+import { type Identity } from '@concrnt/client'
import { useEditorModal } from '../components/EditorModal'
import { StreamCard } from '../components/Stream/Card'
import PlaylistAddIcon from '@mui/icons-material/PlaylistAdd'
@@ -172,7 +172,7 @@ export function Tutorial(): JSX.Element {
- {client.api.ckid ? (
+ {client.ckid ? (