@diffenderfer-games/hub-contract 2.0.0-next.0 → 2.0.0-next.1

package/src/api/messages.ts

@@ -1,142 +1,142 @@
-/**
- * Direct messages between mutual friends (multiplayer-impl.md §5.2).
- *
- * "Checked before delivered": text is moderated before it is stored or
- * pushed. Free text needs the conversation's chat mode to be `on` (both
- * claimed, friends, no parent lock, site switch on); otherwise only
- * quick-chat ids go through. Hidden messages and messages from currently
- * suspended senders are left out of every read.
- */
-import { z } from 'zod';
-import { Millis, Ok, UserId } from '../common';
-import { LooseNumber, requiredId } from '../coerce';
-import { PlayerLite } from '../entities';
-import { ContentRejected, ErrorBody } from '../errors';
-import { requireClaimed } from '../middleware';
-import { ChatMode } from '../entities';
-import { QuickId } from './social/config';
-
-/** A message id: a positive integer, increasing over time. */
-export const MessageId = z.number().int().positive();
-
-/** A direct message. */
-export const Message = z.object({
-  id: MessageId,
-  /** The sender. */
-  from: UserId,
-  /** The recipient. */
-  to: UserId,
-  /** The delivered (possibly softened) text; a quick message carries its phrase's text. */
-  text: z.string(),
-  /** The quick-chat phrase id, for quick messages only. */
-  quick: QuickId.optional(),
-  /** When it was sent (epoch ms). */
-  at: Millis,
-  /** The recipient has read it. */
-  read: z.boolean(),
-  /** Words were swapped by the filter. Only on the sender's own copy. */
-  softened: z.literal(true).optional(),
-});
-
-/** A direct message. */
-export type Message = z.infer<typeof Message>;
-
-/** A conversation summary: the other player, the last message and how many of theirs you haven't read. */
-export const Conversation = z.object({
-  user: PlayerLite,
-  last: Message,
-  unread: z.number().int().nonnegative(),
-});
-
-/** A conversation summary. */
-export type Conversation = z.infer<typeof Conversation>;
-
-/** One page of a conversation's history. */
-export const MessagesPage = z.object({
-  /** Oldest to newest, at most 50. */
-  messages: z.array(Message),
-  /** Older messages exist (page with `?before=` the first id). */
-  more: z.boolean(),
-  /** The mode the chat UI should render: `off` when DMs are off, `quick` while you are muted. */
-  mode: ChatMode,
-});
-
-/** A page of history. */
-export type MessagesPage = z.infer<typeof MessagesPage>;
-
-/** A DM to send: free text, or a quick-chat phrase id (exactly one). */
-export const SendMessageInput = z.object({
-  /** Free text (moderated; only when the conversation's mode is `on`). */
-  text: z.string().optional(),
-  /** A quick-chat phrase id (any mode but `off`). */
-  quick: QuickId.optional(),
-}).refine((b) => (b.text === undefined) !== (b.quick === undefined), 'Send either text or a quick-chat id.');
-
-/** A DM to send. */
-export type SendMessageInput = z.infer<typeof SendMessageInput>;
-
-/**
- * Unread DMs (the `hello` snapshot's `unread`), ignoring hidden messages and
- * suspended senders.
- */
-export const UnreadSummary = z.object({
-  /** Total unread. */
-  dms: z.number().int().nonnegative(),
-  /** Unread per sender, keyed by the sender's user id (as a decimal string). */
-  byUser: z.record(z.string().regex(/^\d+$/), z.number().int().positive()),
-});
-
-/** Unread DM counts. */
-export type UnreadSummary = z.infer<typeof UnreadSummary>;
-
-/**
- * `:userId`, the other side of the conversation: a claimed, non-suspended
- * player other than you, else 404 "No such player." Read like `Number(x)`:
- * anything that is not a player's id is the same 404.
- */
-const Partner = z.object({ userId: LooseNumber.catch(Number.NaN) });
-
-/** The direct-message endpoints. */
-export const messagesEndpoints = {
-  ...requireClaimed.group({
-    listConversations: {
-      method: 'GET', path: '/social/conversations',
-      response: z.object({
-        /** Newest first, one per partner, at most 200. */
-        conversations: z.array(Conversation),
-      }),
-      errors: { 401: ErrorBody, 403: ErrorBody },
-      doc: { summary: 'Your conversations, newest first', tags: ['messages'] },
-    },
-    listDirectMessages: {
-      method: 'GET', path: '/social/messages/:userId', params: Partner,
-      query: z.object({
-        /** Only messages older than this message id; `0` or anything not a number means from the newest. */
-        before: LooseNumber.optional().catch(undefined),
-      }),
-      response: MessagesPage,
-      errors: { 401: ErrorBody, 403: ErrorBody, 404: ErrorBody },
-      doc: { summary: 'One page of history with a player', tags: ['messages'] },
-    },
-    sendDirectMessage: {
-      method: 'POST', path: '/social/messages/:userId', params: Partner, body: SendMessageInput,
-      response: z.object({ message: Message }),
-      errors: { 400: ErrorBody, 401: ErrorBody, 403: ErrorBody, 404: ErrorBody, 422: ContentRejected },
-      doc: {
-        summary: 'Send a DM to a friend',
-        description: '403 `not_friends` or `dms_closed`; 422 when the text is rejected, the chat mode forbids it, or you are sending too fast.',
-        tags: ['messages'],
-      },
-    },
-    markDirectMessagesRead: {
-      method: 'POST', path: '/social/messages/:userId/read', params: Partner,
-      body: z.object({
-        /** Mark their messages to you up to and including this id. */
-        upTo: requiredId('upTo must be a message id.'),
-      }),
-      response: Ok,
-      errors: { 400: ErrorBody, 401: ErrorBody, 403: ErrorBody, 404: ErrorBody },
-      doc: { summary: "Mark a friend's messages to you as read", tags: ['messages'] },
-    },
-  }),
-};
+/**
+ * Direct messages between mutual friends (multiplayer-impl.md §5.2).
+ *
+ * "Checked before delivered": text is moderated before it is stored or
+ * pushed. Free text needs the conversation's chat mode to be `on` (both
+ * claimed, friends, no parent lock, site switch on); otherwise only
+ * quick-chat ids go through. Hidden messages and messages from currently
+ * suspended senders are left out of every read.
+ */
+import { z } from 'zod';
+import { Millis, Ok, UserId } from '../common';
+import { LooseNumber, requiredId } from '../coerce';
+import { PlayerLite } from '../entities';
+import { ContentRejected, ErrorBody } from '../errors';
+import { requireClaimed } from '../middleware';
+import { ChatMode } from '../entities';
+import { QuickId } from './social/config';
+
+/** A message id: a positive integer, increasing over time. */
+export const MessageId = z.number().int().positive();
+
+/** A direct message. */
+export const Message = z.object({
+  id: MessageId,
+  /** The sender. */
+  from: UserId,
+  /** The recipient. */
+  to: UserId,
+  /** The delivered (possibly softened) text; a quick message carries its phrase's text. */
+  text: z.string(),
+  /** The quick-chat phrase id, for quick messages only. */
+  quick: QuickId.optional(),
+  /** When it was sent (epoch ms). */
+  at: Millis,
+  /** The recipient has read it. */
+  read: z.boolean(),
+  /** Words were swapped by the filter. Only on the sender's own copy. */
+  softened: z.literal(true).optional(),
+});
+
+/** A direct message. */
+export type Message = z.infer<typeof Message>;
+
+/** A conversation summary: the other player, the last message and how many of theirs you haven't read. */
+export const Conversation = z.object({
+  user: PlayerLite,
+  last: Message,
+  unread: z.number().int().nonnegative(),
+});
+
+/** A conversation summary. */
+export type Conversation = z.infer<typeof Conversation>;
+
+/** One page of a conversation's history. */
+export const MessagesPage = z.object({
+  /** Oldest to newest, at most 50. */
+  messages: z.array(Message),
+  /** Older messages exist (page with `?before=` the first id). */
+  more: z.boolean(),
+  /** The mode the chat UI should render: `off` when DMs are off, `quick` while you are muted. */
+  mode: ChatMode,
+});
+
+/** A page of history. */
+export type MessagesPage = z.infer<typeof MessagesPage>;
+
+/** A DM to send: free text, or a quick-chat phrase id (exactly one). */
+export const SendMessageInput = z.object({
+  /** Free text (moderated; only when the conversation's mode is `on`). */
+  text: z.string().optional(),
+  /** A quick-chat phrase id (any mode but `off`). */
+  quick: QuickId.optional(),
+}).refine((b) => (b.text === undefined) !== (b.quick === undefined), 'Send either text or a quick-chat id.');
+
+/** A DM to send. */
+export type SendMessageInput = z.infer<typeof SendMessageInput>;
+
+/**
+ * Unread DMs (the `hello` snapshot's `unread`), ignoring hidden messages and
+ * suspended senders.
+ */
+export const UnreadSummary = z.object({
+  /** Total unread. */
+  dms: z.number().int().nonnegative(),
+  /** Unread per sender, keyed by the sender's user id (as a decimal string). */
+  byUser: z.record(z.string().regex(/^\d+$/), z.number().int().positive()),
+});
+
+/** Unread DM counts. */
+export type UnreadSummary = z.infer<typeof UnreadSummary>;
+
+/**
+ * `:userId`, the other side of the conversation: a claimed, non-suspended
+ * player other than you, else 404 "No such player." Read like `Number(x)`:
+ * anything that is not a player's id is the same 404.
+ */
+const Partner = z.object({ userId: LooseNumber.catch(Number.NaN) });
+
+/** The direct-message endpoints. */
+export const messagesEndpoints = {
+  ...requireClaimed.group({
+    listConversations: {
+      method: 'GET', path: '/social/conversations',
+      response: z.object({
+        /** Newest first, one per partner, at most 200. */
+        conversations: z.array(Conversation),
+      }),
+      errors: { 401: ErrorBody, 403: ErrorBody },
+      doc: { summary: 'Your conversations, newest first', tags: ['messages'] },
+    },
+    listDirectMessages: {
+      method: 'GET', path: '/social/messages/:userId', params: Partner,
+      query: z.object({
+        /** Only messages older than this message id; `0` or anything not a number means from the newest. */
+        before: LooseNumber.optional().catch(undefined),
+      }),
+      response: MessagesPage,
+      errors: { 401: ErrorBody, 403: ErrorBody, 404: ErrorBody },
+      doc: { summary: 'One page of history with a player', tags: ['messages'] },
+    },
+    sendDirectMessage: {
+      method: 'POST', path: '/social/messages/:userId', params: Partner, body: SendMessageInput,
+      response: z.object({ message: Message }),
+      errors: { 400: ErrorBody, 401: ErrorBody, 403: ErrorBody, 404: ErrorBody, 422: ContentRejected },
+      doc: {
+        summary: 'Send a DM to a friend',
+        description: '403 `not_friends` or `dms_closed`; 422 when the text is rejected, the chat mode forbids it, or you are sending too fast.',
+        tags: ['messages'],
+      },
+    },
+    markDirectMessagesRead: {
+      method: 'POST', path: '/social/messages/:userId/read', params: Partner,
+      body: z.object({
+        /** Mark their messages to you up to and including this id. */
+        upTo: requiredId('upTo must be a message id.'),
+      }),
+      response: Ok,
+      errors: { 400: ErrorBody, 401: ErrorBody, 403: ErrorBody, 404: ErrorBody },
+      doc: { summary: "Mark a friend's messages to you as read", tags: ['messages'] },
+    },
+  }),
+};

package/src/api/mp/chat.ts

@@ -1,36 +1,36 @@
-/**
- * Group chat in hub rooms and parties (multiplayer.md §4.3, §4.8): what a
- * player sends, and the moderated line everyone receives.
- */
-import { z } from 'zod';
-import { UserId } from '../../common';
-
-
-/**
- * A chat send: a quick-chat phrase id, or free text. When `quick` is set it
- * wins and `text` is ignored.
- */
-export const ChatSend = z.object({
-  /** Free text; only allowed in mode `on`, then moderated. */
-  text: z.string().optional(),
-  /** A quick-chat phrase id (hub phrase, `e:<emoji>` emote or game phrase). */
-  quick: z.string().optional(),
-});
-
-/** The line as delivered: the (possibly softened) text, and the phrase id for quick-chat. */
-export const ChatLine = z.object({
-  text: z.string(),
-  /** Set when the line is a quick-chat phrase. */
-  quick: z.string().optional(),
-  /** Moderation reworded the text. */
-  softened: z.literal(true).optional(),
-});
-
-/** A delivered chat line. */
-export type ChatLine = z.infer<typeof ChatLine>;
-
-/** A chat line pushed to a room or party, with its sender. */
-export const ChatLineEvent = ChatLine.extend({ from: UserId });
-
-/** The error codes a chat send can fail with (besides its surface's own). */
-export const CHAT_ERRORS = ['rate_limited', 'content_rejected', 'bad_quick'] as const;
+/**
+ * Group chat in hub rooms and parties (multiplayer.md §4.3, §4.8): what a
+ * player sends, and the moderated line everyone receives.
+ */
+import { z } from 'zod';
+import { UserId } from '../../common';
+
+
+/**
+ * A chat send: a quick-chat phrase id, or free text. When `quick` is set it
+ * wins and `text` is ignored.
+ */
+export const ChatSend = z.object({
+  /** Free text; only allowed in mode `on`, then moderated. */
+  text: z.string().optional(),
+  /** A quick-chat phrase id (hub phrase, `e:<emoji>` emote or game phrase). */
+  quick: z.string().optional(),
+});
+
+/** The line as delivered: the (possibly softened) text, and the phrase id for quick-chat. */
+export const ChatLine = z.object({
+  text: z.string(),
+  /** Set when the line is a quick-chat phrase. */
+  quick: z.string().optional(),
+  /** Moderation reworded the text. */
+  softened: z.literal(true).optional(),
+});
+
+/** A delivered chat line. */
+export type ChatLine = z.infer<typeof ChatLine>;
+
+/** A chat line pushed to a room or party, with its sender. */
+export const ChatLineEvent = ChatLine.extend({ from: UserId });
+
+/** The error codes a chat send can fail with (besides its surface's own). */
+export const CHAT_ERRORS = ['rate_limited', 'content_rejected', 'bad_quick'] as const;