@llun/activities.schema 0.2.30 → 0.2.32

package/src/{person.ts → actor.ts}

@@ -1,10 +1,10 @@
 import { z } from "zod";
 import { Image } from "./image.js";
 
-export const Person = z.object({
+export const Actor = z.object({
   id: z.string(),
-  type: z.literal("Person"),
-  following: z.string().url(),
+  type: z.union([z.literal("Person"), z.literal("Service")]),
+  following: z.string().url().optional(),
   followers: z.string().url(),
   inbox: z.string().url(),
   outbox: z.string().url(),
@@ -13,6 +13,7 @@ export const Person = z.object({
   summary: z.string().nullish(),
   url: z.string().url(),
   published: z.string().nullish(),
+  manuallyApprovesFollowers: z.boolean().optional(),
   publicKey: z.object({
     id: z.string(),
     owner: z.string(),
@@ -20,10 +21,16 @@ export const Person = z.object({
   }),
   endpoints: z
     .object({
-      sharedInbox: z.string().optional(),
+      sharedInbox: z.string().url().optional(),
     })
     .optional(),
   icon: Image.nullish(),
   image: Image.nullish(),
 });
+export type Actor = z.infer<typeof Actor>;
+
+export const Person = Actor;
 export type Person = z.infer<typeof Person>;
+
+export const Service = Actor;
+export type Service = z.infer<typeof Service>;

package/src/index.ts

@@ -14,6 +14,6 @@ export * from "./note/mention.js";
 export * from "./note/hashtag.js";
 export * from "./note/document.js";
 
-export * from "./person.js";
+export * from "./actor.js";
 
 export * as Mastodon from "./mastodon/index.js";

package/src/mastodon/status/base.ts

@@ -8,6 +8,8 @@ import { CustomEmoji } from "../customEmoji.js";
 import { Poll } from "../poll/index.js";
 import { PreviewCard } from "../previewCard.js";
 import { FilterResult } from "../filterResult.js";
+import { Mention } from "./mention.js";
+import { Tag } from "./tag.js";
 
 export const BaseStatus = z.object({
   id: z.string({
@@ -36,6 +38,11 @@ export const BaseStatus = z.object({
     "Custom emoji to be used when rendering status content"
   ),
 
+  mentions: Mention.array().describe(
+    "Mentions of users within the status content"
+  ),
+  tags: Tag.array().describe("Hashtags used within the status content"),
+
   reblogs_count: z.number({
     description: "How many boosts this status has received",
   }),

package/dist/types/person.d.ts

@@ -1,121 +0,0 @@
-import { z } from "zod";
-export declare const Person: z.ZodObject<{
-    id: z.ZodString;
-    type: z.ZodLiteral<"Person">;
-    following: z.ZodString;
-    followers: z.ZodString;
-    inbox: z.ZodString;
-    outbox: z.ZodString;
-    preferredUsername: z.ZodString;
-    name: z.ZodString;
-    summary: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    url: z.ZodString;
-    published: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    publicKey: z.ZodObject<{
-        id: z.ZodString;
-        owner: z.ZodString;
-        publicKeyPem: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        id: string;
-        owner: string;
-        publicKeyPem: string;
-    }, {
-        id: string;
-        owner: string;
-        publicKeyPem: string;
-    }>;
-    endpoints: z.ZodOptional<z.ZodObject<{
-        sharedInbox: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        sharedInbox?: string | undefined;
-    }, {
-        sharedInbox?: string | undefined;
-    }>>;
-    icon: z.ZodOptional<z.ZodNullable<z.ZodObject<{
-        type: z.ZodLiteral<"Image">;
-        mediaType: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-        url: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        type: "Image";
-        url: string;
-        mediaType?: string | null | undefined;
-    }, {
-        type: "Image";
-        url: string;
-        mediaType?: string | null | undefined;
-    }>>>;
-    image: z.ZodOptional<z.ZodNullable<z.ZodObject<{
-        type: z.ZodLiteral<"Image">;
-        mediaType: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-        url: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        type: "Image";
-        url: string;
-        mediaType?: string | null | undefined;
-    }, {
-        type: "Image";
-        url: string;
-        mediaType?: string | null | undefined;
-    }>>>;
-}, "strip", z.ZodTypeAny, {
-    id: string;
-    type: "Person";
-    url: string;
-    name: string;
-    following: string;
-    followers: string;
-    inbox: string;
-    outbox: string;
-    preferredUsername: string;
-    publicKey: {
-        id: string;
-        owner: string;
-        publicKeyPem: string;
-    };
-    published?: string | null | undefined;
-    icon?: {
-        type: "Image";
-        url: string;
-        mediaType?: string | null | undefined;
-    } | null | undefined;
-    summary?: string | null | undefined;
-    endpoints?: {
-        sharedInbox?: string | undefined;
-    } | undefined;
-    image?: {
-        type: "Image";
-        url: string;
-        mediaType?: string | null | undefined;
-    } | null | undefined;
-}, {
-    id: string;
-    type: "Person";
-    url: string;
-    name: string;
-    following: string;
-    followers: string;
-    inbox: string;
-    outbox: string;
-    preferredUsername: string;
-    publicKey: {
-        id: string;
-        owner: string;
-        publicKeyPem: string;
-    };
-    published?: string | null | undefined;
-    icon?: {
-        type: "Image";
-        url: string;
-        mediaType?: string | null | undefined;
-    } | null | undefined;
-    summary?: string | null | undefined;
-    endpoints?: {
-        sharedInbox?: string | undefined;
-    } | undefined;
-    image?: {
-        type: "Image";
-        url: string;
-        mediaType?: string | null | undefined;
-    } | null | undefined;
-}>;
-export type Person = z.infer<typeof Person>;