From fbe86043b7e276ab123f29c234d5ef6d9724536f Mon Sep 17 00:00:00 2001 From: Jesse Wierzbinski Date: Mon, 26 Aug 2024 19:40:15 +0200 Subject: [PATCH] refactor(api): :recycle: Replace old client library with new version (@versia/client) --- bun.lockb | Bin 280604 -> 280612 bytes classes/functions/application.ts | 2 +- classes/functions/notification.ts | 2 +- config/config.example.toml | 4 ++-- config/config.schema.json | 6 +++--- docs/glitch-soc.md | 2 +- drizzle/schema.ts | 2 +- package.json | 2 +- packages/config-manager/config.type.ts | 6 +++--- packages/database-interface/attachment.ts | 2 +- packages/database-interface/emoji.ts | 2 +- packages/database-interface/note.ts | 2 +- packages/database-interface/relationship.ts | 2 +- packages/database-interface/role.ts | 2 +- packages/database-interface/user.ts | 6 +++--- server/api/api/v1/accounts/:id/block.test.ts | 2 +- server/api/api/v1/accounts/:id/follow.test.ts | 2 +- .../api/api/v1/accounts/:id/followers.test.ts | 2 +- .../api/api/v1/accounts/:id/following.test.ts | 2 +- server/api/api/v1/accounts/:id/index.test.ts | 2 +- server/api/api/v1/accounts/:id/mute.test.ts | 2 +- .../api/api/v1/accounts/:id/statuses.test.ts | 2 +- server/api/api/v1/accounts/:id/unmute.test.ts | 2 +- server/api/api/v1/accounts/id/index.test.ts | 2 +- .../api/api/v1/accounts/lookup/index.test.ts | 2 +- .../api/api/v1/accounts/search/index.test.ts | 2 +- server/api/api/v1/markers/index.ts | 2 +- .../api/v1/notifications/:id/dismiss.test.ts | 2 +- .../api/v1/notifications/:id/index.test.ts | 2 +- .../api/v1/notifications/clear/index.test.ts | 2 +- .../destroy_multiple/index.test.ts | 2 +- server/api/api/v1/notifications/index.test.ts | 2 +- .../api/api/v1/statuses/:id/favourite.test.ts | 2 +- .../api/v1/statuses/:id/favourited_by.test.ts | 2 +- .../api/v1/statuses/:id/reblogged_by.test.ts | 2 +- server/api/api/v1/statuses/:id/source.ts | 2 +- .../api/v1/statuses/:id/unfavourite.test.ts | 2 +- server/api/api/v1/statuses/index.test.ts | 2 +- server/api/api/v1/timelines/home.test.ts | 2 +- server/api/api/v1/timelines/public.test.ts | 2 +- server/api/api/v2/instance/index.ts | 3 +-- tests/api/accounts.test.ts | 2 +- tests/api/statuses.test.ts | 2 +- tests/oauth.test.ts | 2 +- types/api.ts | 4 +--- 45 files changed, 51 insertions(+), 54 deletions(-) diff --git a/bun.lockb b/bun.lockb index 6ac1ef25a902c0985b41d035c7a0cb1badfabff6..86f17ef6fb4cb084e5fd10714acb69a8f3de837e 100755 GIT binary patch delta 31764 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

wU|i)q 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 diff --git a/classes/functions/application.ts b/classes/functions/application.ts index 1b8d1a7e..c4f82de5 100644 --- a/classes/functions/application.ts +++ b/classes/functions/application.ts @@ -1,4 +1,4 @@ -import type { Application as APIApplication } from "@lysand-org/client/types"; +import type { Application as APIApplication } from "@versia/client/types"; import type { InferSelectModel } from "drizzle-orm"; import { db } from "~/drizzle/db"; import type { Applications } from "~/drizzle/schema"; diff --git a/classes/functions/notification.ts b/classes/functions/notification.ts index 9b880de8..cb7794dd 100644 --- a/classes/functions/notification.ts +++ b/classes/functions/notification.ts @@ -1,4 +1,4 @@ -import type { Notification as ApiNotification } from "@lysand-org/client/types"; +import type { Notification as ApiNotification } from "@versia/client/types"; import type { InferSelectModel } from "drizzle-orm"; import { db } from "~/drizzle/db"; import type { Notifications } from "~/drizzle/schema"; diff --git a/config/config.example.toml b/config/config.example.toml index 1fc34e42..03b384d4 100644 --- a/config/config.example.toml +++ b/config/config.example.toml @@ -323,8 +323,8 @@ avatars = [] # Bridges must be hosted separately from the main Versia Server process [federation.bridge] enabled = false -# Only lysand-ap exists for now -software = "lysand-ap" +# Only versia-ap exists for now +software = "versia-ap" # If this is empty, any bridge with the correct token # will be able to send data to your instance allowed_ips = ["192.168.1.0/24"] diff --git a/config/config.schema.json b/config/config.schema.json index 2f094f18..089510ef 100644 --- a/config/config.schema.json +++ b/config/config.schema.json @@ -3346,7 +3346,7 @@ "anyOf": [ { "type": "string", - "enum": ["lysand-ap"] + "enum": ["versia-ap"] }, { "type": "string" @@ -3372,7 +3372,7 @@ "additionalProperties": false, "default": { "enabled": false, - "software": "lysand-ap", + "software": "versia-ap", "allowed_ips": [], "token": "" } @@ -3396,7 +3396,7 @@ }, "bridge": { "enabled": false, - "software": "lysand-ap", + "software": "versia-ap", "allowed_ips": [], "token": "" } diff --git a/docs/glitch-soc.md b/docs/glitch-soc.md index 0b0eeb7f..6b277aa5 100644 --- a/docs/glitch-soc.md +++ b/docs/glitch-soc.md @@ -7,7 +7,7 @@ Versia Server supports the use of the Glitch-Soc fork of Mastodon's frontend. He 3. Change the config to enable Glitch-FE: ```toml [frontend] - # Enable custom frontends (warning: not enabling this or Glitch will make Lysand only accessible via the Mastodon API) + # Enable custom frontends (warning: not enabling this or Glitch will make Versia Server only accessible via the Mastodon API) # Frontends also control the OAuth flow, so if you disable this, you will need to use the Mastodon frontend enabled = true # The URL to reach the frontend at (should be on a local network) diff --git a/drizzle/schema.ts b/drizzle/schema.ts index 73c81a67..f8d87947 100644 --- a/drizzle/schema.ts +++ b/drizzle/schema.ts @@ -1,4 +1,4 @@ -import type { Source as ApiSource } from "@lysand-org/client/types"; +import type { Source as ApiSource } from "@versia/client/types"; import type { ContentFormat } from "@versia/federation/types"; import type { Challenge } from "altcha-lib/types"; import { relations, sql } from "drizzle-orm"; diff --git a/package.json b/package.json index d9a7170d..6888fd7c 100644 --- a/package.json +++ b/package.json @@ -105,10 +105,10 @@ "@inquirer/input": "^2.2.9", "@json2csv/plainjs": "^7.0.6", "@logtape/logtape": "npm:@jsr/logtape__logtape@0.4.2", - "@lysand-org/client": "^0.2.5", "@oclif/core": "^4.0.19", "@sentry/bun": "^8.26.0", "@tufjs/canonical-json": "^2.0.0", + "@versia/client": "^0.1.0-rc.0", "@versia/federation": "^0.1.0-rc.1", "altcha-lib": "^0.5.1", "blurhash": "^2.0.5", diff --git a/packages/config-manager/config.type.ts b/packages/config-manager/config.type.ts index 005bcced..b1638684 100644 --- a/packages/config-manager/config.type.ts +++ b/packages/config-manager/config.type.ts @@ -484,14 +484,14 @@ export const configValidator = z.object({ bridge: z .object({ enabled: z.boolean().default(false), - software: z.enum(["lysand-ap"]).or(z.string()), + software: z.enum(["versia-ap"]).or(z.string()), allowed_ips: z.array(z.string().trim()).default([]), token: z.string().default(""), url: zUrl.optional(), }) .default({ enabled: false, - software: "lysand-ap", + software: "versia-ap", allowed_ips: [], token: "", }) @@ -516,7 +516,7 @@ export const configValidator = z.object({ }, bridge: { enabled: false, - software: "lysand-ap", + software: "versia-ap", allowed_ips: [], token: "", }, diff --git a/packages/database-interface/attachment.ts b/packages/database-interface/attachment.ts index b0d0d00c..4c53f047 100644 --- a/packages/database-interface/attachment.ts +++ b/packages/database-interface/attachment.ts @@ -2,7 +2,7 @@ import { proxyUrl } from "@/response"; import type { AsyncAttachment as ApiAsyncAttachment, Attachment as ApiAttachment, -} from "@lysand-org/client/types"; +} from "@versia/client/types"; import type { ContentFormat } from "@versia/federation/types"; import { type InferInsertModel, diff --git a/packages/database-interface/emoji.ts b/packages/database-interface/emoji.ts index 5324679b..fe7f5786 100644 --- a/packages/database-interface/emoji.ts +++ b/packages/database-interface/emoji.ts @@ -1,6 +1,6 @@ import { emojiValidatorWithColons, emojiValidatorWithIdentifiers } from "@/api"; import { proxyUrl } from "@/response"; -import type { Emoji as ApiEmoji } from "@lysand-org/client/types"; +import type { Emoji as ApiEmoji } from "@versia/client/types"; import type { CustomEmojiExtension } from "@versia/federation/types"; import { type InferInsertModel, diff --git a/packages/database-interface/note.ts b/packages/database-interface/note.ts index 1feb7ee8..110fd597 100644 --- a/packages/database-interface/note.ts +++ b/packages/database-interface/note.ts @@ -7,7 +7,7 @@ import { getLogger } from "@logtape/logtape"; import type { Attachment as ApiAttachment, Status as ApiStatus, -} from "@lysand-org/client/types"; +} from "@versia/client/types"; import { EntityValidator } from "@versia/federation"; import type { ContentFormat, diff --git a/packages/database-interface/relationship.ts b/packages/database-interface/relationship.ts index 959242d0..6ec151c0 100644 --- a/packages/database-interface/relationship.ts +++ b/packages/database-interface/relationship.ts @@ -1,4 +1,4 @@ -import type { Relationship as APIRelationship } from "@lysand-org/client/types"; +import type { Relationship as APIRelationship } from "@versia/client/types"; import { type InferInsertModel, type InferSelectModel, diff --git a/packages/database-interface/role.ts b/packages/database-interface/role.ts index c2ae2fbc..051de943 100644 --- a/packages/database-interface/role.ts +++ b/packages/database-interface/role.ts @@ -1,5 +1,5 @@ import { proxyUrl } from "@/response"; -import type { RolePermission } from "@lysand-org/client/types"; +import type { RolePermission } from "@versia/client/types"; import { type InferInsertModel, type InferSelectModel, diff --git a/packages/database-interface/user.ts b/packages/database-interface/user.ts index 7210a73a..c81f25d9 100644 --- a/packages/database-interface/user.ts +++ b/packages/database-interface/user.ts @@ -7,14 +7,14 @@ import { getLogger } from "@logtape/logtape"; import type { Account as ApiAccount, Mention as ApiMention, -} from "@lysand-org/client/types"; +} from "@versia/client/types"; import { EntityValidator, FederationRequester, type HttpVerb, SignatureConstructor, } from "@versia/federation"; -import type { User as VersiaUser } from "@versia/federation/types"; +import type { Collection, User as VersiaUser } from "@versia/federation/types"; import chalk from "chalk"; import { type InferInsertModel, @@ -668,7 +668,7 @@ export class User extends BaseInterface { * @returns The signed string and headers to send with the request */ async sign( - entity: KnownEntity, + entity: KnownEntity | Collection, signatureUrl: string | URL, signatureMethod: HttpVerb = "POST", ): Promise<{ diff --git a/server/api/api/v1/accounts/:id/block.test.ts b/server/api/api/v1/accounts/:id/block.test.ts index c1aa83ad..23441b59 100644 --- a/server/api/api/v1/accounts/:id/block.test.ts +++ b/server/api/api/v1/accounts/:id/block.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import type { Relationship as ApiRelationship } from "@lysand-org/client/types"; +import type { Relationship as ApiRelationship } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./block"; diff --git a/server/api/api/v1/accounts/:id/follow.test.ts b/server/api/api/v1/accounts/:id/follow.test.ts index 5a82373c..f29c6332 100644 --- a/server/api/api/v1/accounts/:id/follow.test.ts +++ b/server/api/api/v1/accounts/:id/follow.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import type { Relationship as ApiRelationship } from "@lysand-org/client/types"; +import type { Relationship as ApiRelationship } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./follow"; diff --git a/server/api/api/v1/accounts/:id/followers.test.ts b/server/api/api/v1/accounts/:id/followers.test.ts index 513a8ea6..79884129 100644 --- a/server/api/api/v1/accounts/:id/followers.test.ts +++ b/server/api/api/v1/accounts/:id/followers.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Account as ApiAccount } from "@lysand-org/client/types"; +import type { Account as ApiAccount } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./followers"; diff --git a/server/api/api/v1/accounts/:id/following.test.ts b/server/api/api/v1/accounts/:id/following.test.ts index 58f13b32..504621f8 100644 --- a/server/api/api/v1/accounts/:id/following.test.ts +++ b/server/api/api/v1/accounts/:id/following.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Account as ApiAccount } from "@lysand-org/client/types"; +import type { Account as ApiAccount } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./following"; diff --git a/server/api/api/v1/accounts/:id/index.test.ts b/server/api/api/v1/accounts/:id/index.test.ts index 8da0c320..c7983ac8 100644 --- a/server/api/api/v1/accounts/:id/index.test.ts +++ b/server/api/api/v1/accounts/:id/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Account as ApiAccount } from "@lysand-org/client/types"; +import type { Account as ApiAccount } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/accounts/:id/mute.test.ts b/server/api/api/v1/accounts/:id/mute.test.ts index a75da007..cc9edcdd 100644 --- a/server/api/api/v1/accounts/:id/mute.test.ts +++ b/server/api/api/v1/accounts/:id/mute.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import type { Relationship as ApiRelationship } from "@lysand-org/client/types"; +import type { Relationship as ApiRelationship } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./mute"; diff --git a/server/api/api/v1/accounts/:id/statuses.test.ts b/server/api/api/v1/accounts/:id/statuses.test.ts index 7e9a7d8d..7b1ad5fb 100644 --- a/server/api/api/v1/accounts/:id/statuses.test.ts +++ b/server/api/api/v1/accounts/:id/statuses.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Status as ApiStatus } from "@lysand-org/client/types"; +import type { Status as ApiStatus } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./statuses"; diff --git a/server/api/api/v1/accounts/:id/unmute.test.ts b/server/api/api/v1/accounts/:id/unmute.test.ts index c80d9e99..bb7ae2f3 100644 --- a/server/api/api/v1/accounts/:id/unmute.test.ts +++ b/server/api/api/v1/accounts/:id/unmute.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Relationship as ApiRelationship } from "@lysand-org/client/types"; +import type { Relationship as ApiRelationship } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./unmute"; diff --git a/server/api/api/v1/accounts/id/index.test.ts b/server/api/api/v1/accounts/id/index.test.ts index cdeffac8..f5b78870 100644 --- a/server/api/api/v1/accounts/id/index.test.ts +++ b/server/api/api/v1/accounts/id/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import type { Account as ApiAccount } from "@lysand-org/client/types"; +import type { Account as ApiAccount } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/accounts/lookup/index.test.ts b/server/api/api/v1/accounts/lookup/index.test.ts index 103d73fc..ae37251d 100644 --- a/server/api/api/v1/accounts/lookup/index.test.ts +++ b/server/api/api/v1/accounts/lookup/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import type { Account as ApiAccount } from "@lysand-org/client/types"; +import type { Account as ApiAccount } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/accounts/search/index.test.ts b/server/api/api/v1/accounts/search/index.test.ts index ef667012..cc489cac 100644 --- a/server/api/api/v1/accounts/search/index.test.ts +++ b/server/api/api/v1/accounts/search/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import type { Account as ApiAccount } from "@lysand-org/client/types"; +import type { Account as ApiAccount } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/markers/index.ts b/server/api/api/v1/markers/index.ts index c0085d52..4c081aba 100644 --- a/server/api/api/v1/markers/index.ts +++ b/server/api/api/v1/markers/index.ts @@ -6,7 +6,7 @@ import { idValidator, } from "@/api"; import { zValidator } from "@hono/zod-validator"; -import type { Marker as ApiMarker } from "@lysand-org/client/types"; +import type { Marker as ApiMarker } from "@versia/client/types"; import { and, count, eq } from "drizzle-orm"; import { z } from "zod"; import { db } from "~/drizzle/db"; diff --git a/server/api/api/v1/notifications/:id/dismiss.test.ts b/server/api/api/v1/notifications/:id/dismiss.test.ts index f53b9a0a..774b8295 100644 --- a/server/api/api/v1/notifications/:id/dismiss.test.ts +++ b/server/api/api/v1/notifications/:id/dismiss.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Notification as ApiNotification } from "@lysand-org/client/types"; +import type { Notification as ApiNotification } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./dismiss"; diff --git a/server/api/api/v1/notifications/:id/index.test.ts b/server/api/api/v1/notifications/:id/index.test.ts index a687eb26..30e9b9f7 100644 --- a/server/api/api/v1/notifications/:id/index.test.ts +++ b/server/api/api/v1/notifications/:id/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Notification as ApiNotification } from "@lysand-org/client/types"; +import type { Notification as ApiNotification } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/notifications/clear/index.test.ts b/server/api/api/v1/notifications/clear/index.test.ts index 672dd33d..8e2497a2 100644 --- a/server/api/api/v1/notifications/clear/index.test.ts +++ b/server/api/api/v1/notifications/clear/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Notification as ApiNotification } from "@lysand-org/client/types"; +import type { Notification as ApiNotification } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/notifications/destroy_multiple/index.test.ts b/server/api/api/v1/notifications/destroy_multiple/index.test.ts index dbd012ed..a7c1d867 100644 --- a/server/api/api/v1/notifications/destroy_multiple/index.test.ts +++ b/server/api/api/v1/notifications/destroy_multiple/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Notification as ApiNotification } from "@lysand-org/client/types"; +import type { Notification as ApiNotification } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/notifications/index.test.ts b/server/api/api/v1/notifications/index.test.ts index 8176e11e..530a9d3c 100644 --- a/server/api/api/v1/notifications/index.test.ts +++ b/server/api/api/v1/notifications/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Notification as ApiNotification } from "@lysand-org/client/types"; +import type { Notification as ApiNotification } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/statuses/:id/favourite.test.ts b/server/api/api/v1/statuses/:id/favourite.test.ts index 8d127e33..de66d77a 100644 --- a/server/api/api/v1/statuses/:id/favourite.test.ts +++ b/server/api/api/v1/statuses/:id/favourite.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import type { Status as ApiStatus } from "@lysand-org/client/types"; +import type { Status as ApiStatus } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./favourite"; diff --git a/server/api/api/v1/statuses/:id/favourited_by.test.ts b/server/api/api/v1/statuses/:id/favourited_by.test.ts index 78637f92..b2c4b492 100644 --- a/server/api/api/v1/statuses/:id/favourited_by.test.ts +++ b/server/api/api/v1/statuses/:id/favourited_by.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Account as ApiAccount } from "@lysand-org/client/types"; +import type { Account as ApiAccount } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./favourited_by"; diff --git a/server/api/api/v1/statuses/:id/reblogged_by.test.ts b/server/api/api/v1/statuses/:id/reblogged_by.test.ts index e8a32bc5..18047d0a 100644 --- a/server/api/api/v1/statuses/:id/reblogged_by.test.ts +++ b/server/api/api/v1/statuses/:id/reblogged_by.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Account as ApiAccount } from "@lysand-org/client/types"; +import type { Account as ApiAccount } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./reblogged_by"; diff --git a/server/api/api/v1/statuses/:id/source.ts b/server/api/api/v1/statuses/:id/source.ts index 43a6dbe1..5c3a51d9 100644 --- a/server/api/api/v1/statuses/:id/source.ts +++ b/server/api/api/v1/statuses/:id/source.ts @@ -1,6 +1,6 @@ import { apiRoute, applyConfig, auth, handleZodError } from "@/api"; import { zValidator } from "@hono/zod-validator"; -import type { StatusSource as ApiStatusSource } from "@lysand-org/client/types"; +import type { StatusSource as ApiStatusSource } from "@versia/client/types"; import { z } from "zod"; import { RolePermissions } from "~/drizzle/schema"; import { Note } from "~/packages/database-interface/note"; diff --git a/server/api/api/v1/statuses/:id/unfavourite.test.ts b/server/api/api/v1/statuses/:id/unfavourite.test.ts index dac216e8..35de0846 100644 --- a/server/api/api/v1/statuses/:id/unfavourite.test.ts +++ b/server/api/api/v1/statuses/:id/unfavourite.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Status as ApiStatus } from "@lysand-org/client/types"; +import type { Status as ApiStatus } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./unfavourite"; diff --git a/server/api/api/v1/statuses/index.test.ts b/server/api/api/v1/statuses/index.test.ts index 81816f2a..937947c8 100644 --- a/server/api/api/v1/statuses/index.test.ts +++ b/server/api/api/v1/statuses/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import type { Status as ApiStatus } from "@lysand-org/client/types"; +import type { Status as ApiStatus } from "@versia/client/types"; import { eq } from "drizzle-orm"; import { db } from "~/drizzle/db"; import { Emojis } from "~/drizzle/schema"; diff --git a/server/api/api/v1/timelines/home.test.ts b/server/api/api/v1/timelines/home.test.ts index 9eb0d318..e061f09b 100644 --- a/server/api/api/v1/timelines/home.test.ts +++ b/server/api/api/v1/timelines/home.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import type { Status as ApiStatus } from "@lysand-org/client/types"; +import type { Status as ApiStatus } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./home"; diff --git a/server/api/api/v1/timelines/public.test.ts b/server/api/api/v1/timelines/public.test.ts index 3d5e9bed..7495f9b3 100644 --- a/server/api/api/v1/timelines/public.test.ts +++ b/server/api/api/v1/timelines/public.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import type { Status as ApiStatus } from "@lysand-org/client/types"; +import type { Status as ApiStatus } from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./public"; diff --git a/server/api/api/v2/instance/index.ts b/server/api/api/v2/instance/index.ts index 2684f2a0..549b3e7a 100644 --- a/server/api/api/v2/instance/index.ts +++ b/server/api/api/v2/instance/index.ts @@ -1,6 +1,6 @@ import { apiRoute, applyConfig } from "@/api"; import { proxyUrl } from "@/response"; -import type { Instance as ApiInstance } from "@lysand-org/client/types"; +import type { Instance as ApiInstance } from "@versia/client/types"; import { and, eq, isNull } from "drizzle-orm"; import { Users } from "~/drizzle/schema"; import manifest from "~/package.json"; @@ -37,7 +37,6 @@ export default apiRoute((app) => domain: new URL(config.http.base_url).hostname, title: config.instance.name, version: "4.3.0-alpha.3+glitch", - // @ts-expect-error Temporary until package also gets the rebranding versia_version: version, source_url: "https://github.com/lysand-org/server", description: config.instance.description, diff --git a/tests/api/accounts.test.ts b/tests/api/accounts.test.ts index eb5d2286..91c3e424 100644 --- a/tests/api/accounts.test.ts +++ b/tests/api/accounts.test.ts @@ -5,7 +5,7 @@ import { afterAll, describe, expect, test } from "bun:test"; import type { Account as ApiAccount, Relationship as ApiRelationship, -} from "@lysand-org/client/types"; +} from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "~/tests/utils"; diff --git a/tests/api/statuses.test.ts b/tests/api/statuses.test.ts index 100cbf8a..39ff60b8 100644 --- a/tests/api/statuses.test.ts +++ b/tests/api/statuses.test.ts @@ -6,7 +6,7 @@ import type { AsyncAttachment as ApiAsyncAttachment, Context as ApiContext, Status as ApiStatus, -} from "@lysand-org/client/types"; +} from "@versia/client/types"; import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "~/tests/utils"; diff --git a/tests/oauth.test.ts b/tests/oauth.test.ts index bf0bc094..e218185c 100644 --- a/tests/oauth.test.ts +++ b/tests/oauth.test.ts @@ -5,7 +5,7 @@ import { afterAll, describe, expect, test } from "bun:test"; import type { Application as ApiApplication, Token as ApiToken, -} from "@lysand-org/client/types"; +} from "@versia/client/types"; import { config } from "~/packages/config-manager"; import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "./utils"; diff --git a/types/api.ts b/types/api.ts index 6e644cea..75e023c3 100644 --- a/types/api.ts +++ b/types/api.ts @@ -1,7 +1,6 @@ import type { Hono } from "@hono/hono"; import type { RouterRoute } from "@hono/hono/types"; import type { - Collection, Delete, Follow, FollowAccept, @@ -62,5 +61,4 @@ export type KnownEntity = | FollowReject | Unfollow | Delete - | LikeExtension - | Collection; + | LikeExtension;