Merge pull request #57 from cloudflare/partyserver

partyserver and friends
cloudflare · Jul 3, 2024 · af79f7b · af79f7b
2 parents 040b350 + 9eb67e8
commit af79f7b
Show file tree

Hide file tree

Showing 25 changed files with 1,841 additions and 3,908 deletions.
diff --git a/app/api/roomsApi.server.ts b/app/api/roomsApi.server.ts
diff --git a/app/components/MuteUserButton.tsx b/app/components/MuteUserButton.tsx
@@ -1,7 +1,7 @@
 import type { FC } from 'react'
 import { useRoomContext } from '~/hooks/useRoomContext'
 import { useUserMetadata } from '~/hooks/useUserMetadata'
-import type { User } from '~/types/Messages'
+import type { ClientMessage, User } from '~/types/Messages'
 import AlertDialog from './AlertDialog'
 import type { ButtonProps } from './Button'
 import { Button } from './Button'
@@ -62,10 +62,12 @@ export const MuteUserButton: FC<MuteUserButtonProps> = ({
 						<AlertDialog.Action asChild>
 							<Button
 								onClick={() => {
-									room.signal.sendMessage({
-										type: 'muteUser',
-										id: user.id,
-									})
+									room.websocket.send(
+										JSON.stringify({
+											type: 'muteUser',
+											id: user.id,
+										} satisfies ClientMessage)
+									)
 								}}
 								className="text-sm"
 								displayType="danger"

diff --git a/app/components/Toast.tsx b/app/components/Toast.tsx
@@ -8,6 +8,8 @@ import {
 } from 'react'
 import { style } from '~/utils/style'
 
+import { nanoid } from 'nanoid'
+
 export const Root = style(
 	Toast.Root,
 	'bg-white rounded dark:bg-zinc-500 shadow p-3 text-zinc-800 dark:text-zinc-50'
@@ -33,7 +35,7 @@ export const NotificationToastsProvider = (props: { children?: ReactNode }) => {
 				...ms,
 				{
 					...options,
-					id: crypto.randomUUID(),
+					id: nanoid(14),
 					content,
 				},
 			]),