Skip to content

update #923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
totegamma merged 3 commits into from
Feb 16, 2026
Merged

update #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb70422
add compativility layer for v2
totegamma Feb 9, 2026
fa8e9d9
add audio player
totegamma Feb 16, 2026
c685757
show metadata
totegamma Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"jspdf": "^2.5.1",
"mfm-js": "^0.24.0",
"mfm-renderer-react": "^0.0.9",
"music-metadata": "^11.12.1",
"notistack": "^3.0.2",
"protobufjs": "^7.3.2",
"react": "^18.2.0",
Expand Down
82 changes: 42 additions & 40 deletions app/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import { DeckPage } from './pages/Deck'
import { TimelineProvider } from './context/TimelineProvider'
import { InspectorProvider } from './context/Inspector'
import { ProfileProvider } from './context/ProfileContext'
import { AudioPlayerProvider } from './context/AudioPlayer'

const SwitchMasterToSub = lazy(() => import('./components/SwitchMasterToSub'))

Expand Down Expand Up @@ -489,46 +490,47 @@ function App(): JSX.Element {
flex: 1
}}
>
<Paper
elevation={isDeckPage ? 0 : 3}
sx={{
flexGrow: '1',
margin: { xs: 0.5, sm: 1 },
mb: { xs: 0, sm: '10px' },
display: 'flex',
flexFlow: 'column',
borderRadius: isDeckPage ? 0 : 2,
overflow: 'hidden',
background: 'none'
}}
>
<Routes>
<Route index element={<ListPage />} />
<Route path="/:id" element={<EntityPage />} />
<Route path="/intent" element={<ListPage />} />
<Route path="/settings/*" element={<Settings />} />
<Route path="/:id/media" element={<EntityPage />} />
<Route path="/:id/activity" element={<EntityPage />} />
<Route path="/:id/profile/:profileid" element={<EntityPage />} />
<Route path="/:id/profile/:profileid/media" element={<EntityPage />} />
<Route path="/:id/profile/:profileid/activity" element={<EntityPage />} />
<Route path="/:authorID/:messageID" element={<MessagePage />} />
<Route path="/timeline/:id" element={<TimelinePage />} />
<Route path="/contacts" element={<ContactsPage />} />
<Route path="/explorer/:tab" element={<ExplorerPlusPage />} />
<Route path="/classicexplorer/:tab" element={<Explorer />} />
<Route
path="/notifications"
element={<Notifications latestNotification={latestNotificationDate} />}
/>
<Route path="/ap/:id" element={<ApUserPage />} />
<Route path="/devtool" element={<Devtool />} />
<Route path="/subscriptions" element={<ManageSubsPage />} />
<Route path="/concord/*" element={<ConcordPage />} />
<Route path="/tutorial" element={<Tutorial />} />
<Route path="/deck" element={<DeckPage />} />
</Routes>
</Paper>
<AudioPlayerProvider>
<Paper
elevation={isDeckPage ? 0 : 3}
sx={{
flexGrow: '1',
margin: { xs: 0.5, sm: 1 },
display: 'flex',
flexFlow: 'column',
borderRadius: isDeckPage ? 0 : 2,
overflow: 'hidden',
background: 'none'
}}
>
<Routes>
<Route index element={<ListPage />} />
<Route path="/:id" element={<EntityPage />} />
<Route path="/intent" element={<ListPage />} />
<Route path="/settings/*" element={<Settings />} />
<Route path="/:id/media" element={<EntityPage />} />
<Route path="/:id/activity" element={<EntityPage />} />
<Route path="/:id/profile/:profileid" element={<EntityPage />} />
<Route path="/:id/profile/:profileid/media" element={<EntityPage />} />
<Route path="/:id/profile/:profileid/activity" element={<EntityPage />} />
<Route path="/:authorID/:messageID" element={<MessagePage />} />
<Route path="/timeline/:id" element={<TimelinePage />} />
<Route path="/contacts" element={<ContactsPage />} />
<Route path="/explorer/:tab" element={<ExplorerPlusPage />} />
<Route path="/classicexplorer/:tab" element={<Explorer />} />
<Route
path="/notifications"
element={<Notifications latestNotification={latestNotificationDate} />}
/>
<Route path="/ap/:id" element={<ApUserPage />} />
<Route path="/devtool" element={<Devtool />} />
<Route path="/subscriptions" element={<ManageSubsPage />} />
<Route path="/concord/*" element={<ConcordPage />} />
<Route path="/tutorial" element={<Tutorial />} />
<Route path="/deck" element={<DeckPage />} />
</Routes>
</Paper>
</AudioPlayerProvider>
<Box
sx={{
display: {
Expand Down
44 changes: 35 additions & 9 deletions app/src/components/ui/EmbeddedGallery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@ import { type WorldMedia } from '../../model'
import { Blurhash } from 'react-blurhash'
import { useGlobalState } from '../../context/GlobalState'
import FullscreenIcon from '@mui/icons-material/Fullscreen'
import PlayCircleIcon from '@mui/icons-material/PlayCircle'
import StopCircleIcon from '@mui/icons-material/StopCircle'

import poster from '../../resources/view-3dmodel.png'

import { CCIconButton } from './CCIconButton'
import { useTranslation } from 'react-i18next'
import { ModelViewer } from '../ModelViewer'
import { useAudioPlayer } from '../../context/AudioPlayer'

export interface EmbeddedGalleryProps {
medias: WorldMedia[]
Expand All @@ -29,6 +32,7 @@ export const MediaCard = ({ media, onExpand }: { media: WorldMedia; onExpand?: (
const mediaViewer = useMediaViewer()

const { getImageURL } = useGlobalState()
const { play, stop, nowPlaying } = useAudioPlayer()

const setAllowedUrl = (url: string): void => {
const key = 'reveal:' + url
Expand Down Expand Up @@ -117,16 +121,38 @@ export const MediaCard = ({ media, onExpand }: { media: WorldMedia; onExpand?: (
height: '100%',
overflow: 'hidden'
}}
onClick={(e) => {
e.stopPropagation()
if (nowPlaying === media.mediaURL) {
stop()
} else {
play(media.mediaURL)
}
}}
>
<audio
controls
src={media.mediaURL}
preload="metadata"
style={{
width: '100%',
height: '100%'
}}
/>
{nowPlaying === media.mediaURL ? (
<StopCircleIcon
sx={{
position: 'absolute',
top: '50%',
left: '50%',
transform: 'translate(-50%, -50%)',
color: 'rgba(255, 255, 255, 0.8)',
fontSize: 48
}}
/>
) : (
<PlayCircleIcon
sx={{
position: 'absolute',
top: '50%',
left: '50%',
transform: 'translate(-50%, -50%)',
color: 'rgba(255, 255, 255, 0.8)',
fontSize: 48
}}
/>
)}
</Box>
)}

Expand Down
Loading