diff --git a/apps/draupnir/package.json b/apps/draupnir/package.json index 7d487659..6d002020 100644 --- a/apps/draupnir/package.json +++ b/apps/draupnir/package.json @@ -46,6 +46,8 @@ "@sinclair/typebox": "0.34.49", "@the-draupnir-project/interface-manager": "4.2.6", "@the-draupnir-project/matrix-basic-types": "1.5.1", + "@the-draupnir-project/matrix-protection-suite": "7.1.0", + "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk": "5.0.1", "@the-draupnir-project/mps-interface-adaptor": "0.6.0", "@vector-im/matrix-bot-sdk": "^0.8.0-element.3", "better-sqlite3": "^12.8.0", @@ -56,15 +58,12 @@ "js-yaml": "^4.1.0", "jsdom": "^24.0.0", "matrix-appservice-bridge": "^11.2.0", - "matrix-protection-suite": "npm:@the-draupnir-project/matrix-protection-suite@7.1.0", - "matrix-protection-suite-for-matrix-bot-sdk": "npm:@the-draupnir-project/matrix-protection-suite@5.0.1", "pg": "^8.8.0", "yaml": "^2.3.2" }, "overrides": { "@the-draupnir-project/matrix-basic-types": "$the-draupnir-project/matrix-basic-types", - "@the-draupnir-project/interface-manager": "$the-draupnir-project/interface-manager", - "matrix-protection-suite": "$matrix-protection-suite" + "@the-draupnir-project/interface-manager": "$the-draupnir-project/interface-manager" }, "engines": { "node": ">=24.0.0" diff --git a/apps/draupnir/src/Draupnir.ts b/apps/draupnir/src/Draupnir.ts index c6405f8a..134bafa7 100644 --- a/apps/draupnir/src/Draupnir.ts +++ b/apps/draupnir/src/Draupnir.ts @@ -28,7 +28,7 @@ import { Task, Value, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { UnlistedUserRedactionQueue } from "./queues/UnlistedUserRedactionQueue"; import { ThrottlingQueue } from "./queues/ThrottlingQueue"; import ManagementRoomOutput from "./managementroom/ManagementRoomOutput"; @@ -37,7 +37,7 @@ import { StandardReportManager } from "./report/ReportManager"; import { MatrixSendClient, SynapseAdminClient, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { IConfig } from "./config"; import { LogLevel } from "@vector-im/matrix-bot-sdk"; import { RendererMessageCollector } from "./capabilities/RendererMessageCollector"; diff --git a/apps/draupnir/src/DraupnirBotMode.ts b/apps/draupnir/src/DraupnirBotMode.ts index 08425cf3..5761e7bc 100644 --- a/apps/draupnir/src/DraupnirBotMode.ts +++ b/apps/draupnir/src/DraupnirBotMode.ts @@ -17,7 +17,7 @@ import { ActionException, ActionExceptionKind, ConfigRecoverableError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { BotSDKMatrixAccountData, ClientCapabilityFactory, @@ -25,7 +25,7 @@ import { RoomStateManagerFactory, SafeMatrixEmitter, joinedRoomsSafe, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { IConfig } from "./config"; import { Draupnir } from "./Draupnir"; import { DraupnirFactory } from "./draupnirfactory/DraupnirFactory"; diff --git a/apps/draupnir/src/appservice/AccessControl.ts b/apps/draupnir/src/appservice/AccessControl.ts index 8263ac0e..ac93f73e 100644 --- a/apps/draupnir/src/appservice/AccessControl.ts +++ b/apps/draupnir/src/appservice/AccessControl.ts @@ -24,7 +24,7 @@ import { PolicyRuleType, Recommendation, RoomJoiner, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; /** * Utility to manage which users have access to the application service, diff --git a/apps/draupnir/src/appservice/AppService.ts b/apps/draupnir/src/appservice/AppService.ts index 81d22f8b..4746d7a5 100644 --- a/apps/draupnir/src/appservice/AppService.ts +++ b/apps/draupnir/src/appservice/AppService.ts @@ -33,7 +33,7 @@ import { joinedRoomsSafe, resultifyBotSDKRequestError, resultifyBotSDKRequestErrorWith404AsUndefined, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { ClientsInRoomMap, DefaultEventDecoder, @@ -42,7 +42,7 @@ import { StandardClientsInRoomMap, Task, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { AppServiceDraupnirManager } from "./AppServiceDraupnirManager"; import { StringRoomID, diff --git a/apps/draupnir/src/appservice/AppServiceDraupnirManager.ts b/apps/draupnir/src/appservice/AppServiceDraupnirManager.ts index 92077fec..2be87123 100644 --- a/apps/draupnir/src/appservice/AppServiceDraupnirManager.ts +++ b/apps/draupnir/src/appservice/AppServiceDraupnirManager.ts @@ -28,7 +28,7 @@ import { Task, assertThrowableIsError, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { BotSDKMatrixAccountData, @@ -36,7 +36,7 @@ import { ClientForUserID, joinedRoomsSafe, RoomStateManagerFactory, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { DraupnirFailType, StandardDraupnirManager, diff --git a/apps/draupnir/src/appservice/bot/AccessCommands.tsx b/apps/draupnir/src/appservice/bot/AccessCommands.tsx index 6c0aa7f8..ca008045 100644 --- a/apps/draupnir/src/appservice/bot/AccessCommands.tsx +++ b/apps/draupnir/src/appservice/bot/AccessCommands.tsx @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 import { AppserviceAdaptorContext } from "./AppserviceBotPrerequisite"; -import { ActionResult } from "matrix-protection-suite"; +import { ActionResult } from "@the-draupnir-project/matrix-protection-suite"; import { MatrixUserIDPresentationType, describeCommand, diff --git a/apps/draupnir/src/appservice/bot/AppserviceBotHelp.tsx b/apps/draupnir/src/appservice/bot/AppserviceBotHelp.tsx index ea3a53b4..7502a0a5 100644 --- a/apps/draupnir/src/appservice/bot/AppserviceBotHelp.tsx +++ b/apps/draupnir/src/appservice/bot/AppserviceBotHelp.tsx @@ -11,7 +11,10 @@ import { TopPresentationSchema, describeCommand, } from "@the-draupnir-project/interface-manager"; -import { ActionResult, Ok } from "matrix-protection-suite"; +import { + ActionResult, + Ok, +} from "@the-draupnir-project/matrix-protection-suite"; import { AppserviceBotCommands } from "./AppserviceBotCommandTable"; import { AppserviceBotInterfaceAdaptor } from "./AppserviceBotInterfaceAdaptor"; import { diff --git a/apps/draupnir/src/appservice/bot/AppserviceBotPrerequisite.ts b/apps/draupnir/src/appservice/bot/AppserviceBotPrerequisite.ts index aee8a356..a6834d38 100644 --- a/apps/draupnir/src/appservice/bot/AppserviceBotPrerequisite.ts +++ b/apps/draupnir/src/appservice/bot/AppserviceBotPrerequisite.ts @@ -9,7 +9,7 @@ import { MatrixAdaptorContext } from "@the-draupnir-project/mps-interface-adaptor"; import { MjolnirAppService } from "../AppService"; -import { MatrixSendClient } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { MatrixSendClient } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; export interface AppserviceAdaptorContext extends MatrixAdaptorContext { appservice: MjolnirAppService; diff --git a/apps/draupnir/src/appservice/bot/AppserviceCommandHandler.ts b/apps/draupnir/src/appservice/bot/AppserviceCommandHandler.ts index dce8e9ef..566a2e45 100644 --- a/apps/draupnir/src/appservice/bot/AppserviceCommandHandler.ts +++ b/apps/draupnir/src/appservice/bot/AppserviceCommandHandler.ts @@ -10,8 +10,8 @@ import { RoomMessage, Value, isError, -} from "matrix-protection-suite"; -import { MatrixSendClient } from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite"; +import { MatrixSendClient } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { StringUserID, StringRoomID, diff --git a/apps/draupnir/src/appservice/bot/AvatarCommand.tsx b/apps/draupnir/src/appservice/bot/AvatarCommand.tsx index 247f9187..fb2b5fff 100644 --- a/apps/draupnir/src/appservice/bot/AvatarCommand.tsx +++ b/apps/draupnir/src/appservice/bot/AvatarCommand.tsx @@ -8,14 +8,14 @@ import { isError, Ok, ActionError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { StringPresentationType, describeCommand, } from "@the-draupnir-project/interface-manager"; import { isStringMediaURI } from "@the-draupnir-project/matrix-basic-types"; import { AppserviceBotInterfaceAdaptor } from "./AppserviceBotInterfaceAdaptor"; -import { resultifyBotSDKRequestError } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { resultifyBotSDKRequestError } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; export const AppserviceAvatarCommand = describeCommand({ summary: "Sets the avatar of the main appservice admin bot.", diff --git a/apps/draupnir/src/appservice/bot/DisplaynameCommand.tsx b/apps/draupnir/src/appservice/bot/DisplaynameCommand.tsx index 4313fbe0..4f1a2b54 100644 --- a/apps/draupnir/src/appservice/bot/DisplaynameCommand.tsx +++ b/apps/draupnir/src/appservice/bot/DisplaynameCommand.tsx @@ -3,13 +3,17 @@ // SPDX-License-Identifier: Apache-2.0 import { AppserviceAdaptorContext } from "./AppserviceBotPrerequisite"; -import { ActionResult, isError, Ok } from "matrix-protection-suite"; +import { + ActionResult, + isError, + Ok, +} from "@the-draupnir-project/matrix-protection-suite"; import { StringPresentationType, describeCommand, } from "@the-draupnir-project/interface-manager"; import { AppserviceBotInterfaceAdaptor } from "./AppserviceBotInterfaceAdaptor"; -import { resultifyBotSDKRequestError } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { resultifyBotSDKRequestError } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; export const AppserviceDisplaynameCommand = describeCommand({ summary: "Sets the displayname of the main appservice admin bot.", diff --git a/apps/draupnir/src/appservice/bot/ListCommand.tsx b/apps/draupnir/src/appservice/bot/ListCommand.tsx index a3533306..9136bbb1 100644 --- a/apps/draupnir/src/appservice/bot/ListCommand.tsx +++ b/apps/draupnir/src/appservice/bot/ListCommand.tsx @@ -7,7 +7,7 @@ import { ActionResult, isError, Ok, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { UnstartedDraupnir } from "../../draupnirfactory/StandardDraupnirManager"; import { AppserviceAdaptorContext } from "./AppserviceBotPrerequisite"; import { diff --git a/apps/draupnir/src/appservice/bot/ProvisionCommand.tsx b/apps/draupnir/src/appservice/bot/ProvisionCommand.tsx index 7492ebbe..5dd1364e 100644 --- a/apps/draupnir/src/appservice/bot/ProvisionCommand.tsx +++ b/apps/draupnir/src/appservice/bot/ProvisionCommand.tsx @@ -3,7 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 import { AppserviceAdaptorContext } from "./AppserviceBotPrerequisite"; -import { ActionResult, isError, Ok } from "matrix-protection-suite"; +import { + ActionResult, + isError, + Ok, +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixUserIDPresentationType, describeCommand, diff --git a/apps/draupnir/src/appservice/bot/VersionCommand.tsx b/apps/draupnir/src/appservice/bot/VersionCommand.tsx index 1a03c241..f7b7eb0d 100644 --- a/apps/draupnir/src/appservice/bot/VersionCommand.tsx +++ b/apps/draupnir/src/appservice/bot/VersionCommand.tsx @@ -3,7 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 import { AppserviceAdaptorContext } from "./AppserviceBotPrerequisite"; -import { ActionResult, Ok, isError } from "matrix-protection-suite"; +import { + ActionResult, + Ok, + isError, +} from "@the-draupnir-project/matrix-protection-suite"; import { DeadDocumentJSX, describeCommand, diff --git a/apps/draupnir/src/appservice/config/config.ts b/apps/draupnir/src/appservice/config/config.ts index 367f58f6..aa7c3d95 100644 --- a/apps/draupnir/src/appservice/config/config.ts +++ b/apps/draupnir/src/appservice/config/config.ts @@ -13,8 +13,8 @@ import { Type } from "@sinclair/typebox"; import * as fs from "fs"; import { load } from "js-yaml"; import { Value } from "@sinclair/typebox/value"; -import { EDStatic } from "matrix-protection-suite"; -import { StringUserIDSchema } from "matrix-protection-suite"; +import { EDStatic } from "@the-draupnir-project/matrix-protection-suite"; +import { StringUserIDSchema } from "@the-draupnir-project/matrix-protection-suite"; export function read(configPath: string): AppserviceConfig { const content = fs.readFileSync(configPath, "utf8"); diff --git a/apps/draupnir/src/backingstore/DraupnirStores.ts b/apps/draupnir/src/backingstore/DraupnirStores.ts index 48be0ef8..48b1ccd8 100644 --- a/apps/draupnir/src/backingstore/DraupnirStores.ts +++ b/apps/draupnir/src/backingstore/DraupnirStores.ts @@ -2,7 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 -import { EventDecoder, SHA256HashStore } from "matrix-protection-suite"; +import { + EventDecoder, + SHA256HashStore, +} from "@the-draupnir-project/matrix-protection-suite"; import { RoomAuditLog } from "../protections/RoomTakedown/RoomAuditLog"; import { SqliteRoomStateBackingStore } from "./better-sqlite3/SqliteRoomStateBackingStore"; import { SqliteHashReversalStore } from "./better-sqlite3/HashStore"; diff --git a/apps/draupnir/src/backingstore/better-sqlite3/BetterSqliteStore.ts b/apps/draupnir/src/backingstore/better-sqlite3/BetterSqliteStore.ts index b8148d25..dfc26e61 100644 --- a/apps/draupnir/src/backingstore/better-sqlite3/BetterSqliteStore.ts +++ b/apps/draupnir/src/backingstore/better-sqlite3/BetterSqliteStore.ts @@ -9,7 +9,7 @@ // import BetterSqlite3, { Database } from "better-sqlite3"; -import { Logger } from "matrix-protection-suite"; +import { Logger } from "@the-draupnir-project/matrix-protection-suite"; import { ensureSqliteSchema, SqliteSchemaOptions } from "./SqliteSchema"; export interface BetterSqliteOptions extends BetterSqlite3.Options { diff --git a/apps/draupnir/src/backingstore/better-sqlite3/HashStore.ts b/apps/draupnir/src/backingstore/better-sqlite3/HashStore.ts index 83f77bdf..32a692e7 100644 --- a/apps/draupnir/src/backingstore/better-sqlite3/HashStore.ts +++ b/apps/draupnir/src/backingstore/better-sqlite3/HashStore.ts @@ -26,7 +26,7 @@ import { Logger, UserHashRecord, PolicyRuleType, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { BetterSqliteStore, makeBetterSqliteDB } from "./BetterSqliteStore"; import { Database, Statement } from "better-sqlite3"; import path from "path"; diff --git a/apps/draupnir/src/backingstore/better-sqlite3/SqliteRoomStateBackingStore.ts b/apps/draupnir/src/backingstore/better-sqlite3/SqliteRoomStateBackingStore.ts index 1b1a98cf..83f972f9 100644 --- a/apps/draupnir/src/backingstore/better-sqlite3/SqliteRoomStateBackingStore.ts +++ b/apps/draupnir/src/backingstore/better-sqlite3/SqliteRoomStateBackingStore.ts @@ -15,7 +15,7 @@ import { StateEvent, assertThrowableIsError, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { BetterSqliteOptions, BetterSqliteStore, diff --git a/apps/draupnir/src/backingstore/better-sqlite3/SqliteSchema.ts b/apps/draupnir/src/backingstore/better-sqlite3/SqliteSchema.ts index c2bcd3c2..5bd78471 100644 --- a/apps/draupnir/src/backingstore/better-sqlite3/SqliteSchema.ts +++ b/apps/draupnir/src/backingstore/better-sqlite3/SqliteSchema.ts @@ -4,7 +4,7 @@ // SPDX-License-Identifier: Apache-2.0 import { Database } from "better-sqlite3"; -import { Logger } from "matrix-protection-suite"; +import { Logger } from "@the-draupnir-project/matrix-protection-suite"; export type SqliteSchemaOptions = { upgradeSteps: ((db: Database) => void)[]; diff --git a/apps/draupnir/src/capabilities/DraupnirRendererMessageCollector.tsx b/apps/draupnir/src/capabilities/DraupnirRendererMessageCollector.tsx index 28670ee2..8aaaea70 100644 --- a/apps/draupnir/src/capabilities/DraupnirRendererMessageCollector.tsx +++ b/apps/draupnir/src/capabilities/DraupnirRendererMessageCollector.tsx @@ -11,7 +11,7 @@ import { DescriptionMeta, RoomMessageSender, Task, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { StringRoomID } from "@the-draupnir-project/matrix-basic-types"; import { DeadDocumentJSX, diff --git a/apps/draupnir/src/capabilities/RendererMessageCollector.ts b/apps/draupnir/src/capabilities/RendererMessageCollector.ts index 9878f855..b71c7235 100644 --- a/apps/draupnir/src/capabilities/RendererMessageCollector.ts +++ b/apps/draupnir/src/capabilities/RendererMessageCollector.ts @@ -3,7 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 import { DocumentNode } from "@the-draupnir-project/interface-manager"; -import { Capability, DescriptionMeta } from "matrix-protection-suite"; +import { + Capability, + DescriptionMeta, +} from "@the-draupnir-project/matrix-protection-suite"; export enum MessageType { Document = "Document", diff --git a/apps/draupnir/src/capabilities/RoomTakedownCapability.tsx b/apps/draupnir/src/capabilities/RoomTakedownCapability.tsx index ce3eb2af..30e1c26d 100644 --- a/apps/draupnir/src/capabilities/RoomTakedownCapability.tsx +++ b/apps/draupnir/src/capabilities/RoomTakedownCapability.tsx @@ -10,7 +10,7 @@ import { CapabilityMethodSchema, describeCapabilityInterface, RoomBasicDetails, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; export interface RoomDetailsProvider { getRoomDetails(roomID: StringRoomID): Promise>; diff --git a/apps/draupnir/src/capabilities/RoomTakedownCapabilityRenderer.tsx b/apps/draupnir/src/capabilities/RoomTakedownCapabilityRenderer.tsx index 7f034824..c22e72fe 100644 --- a/apps/draupnir/src/capabilities/RoomTakedownCapabilityRenderer.tsx +++ b/apps/draupnir/src/capabilities/RoomTakedownCapabilityRenderer.tsx @@ -6,7 +6,7 @@ import { describeCapabilityRenderer, DescriptionMeta, RoomBasicDetails, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RoomTakedownCapability } from "./RoomTakedownCapability"; import { RendererMessageCollector } from "./RendererMessageCollector"; import { diff --git a/apps/draupnir/src/capabilities/ServerACLConsequencesRenderer.tsx b/apps/draupnir/src/capabilities/ServerACLConsequencesRenderer.tsx index 8e7c7973..74dcfc3e 100644 --- a/apps/draupnir/src/capabilities/ServerACLConsequencesRenderer.tsx +++ b/apps/draupnir/src/capabilities/ServerACLConsequencesRenderer.tsx @@ -19,7 +19,7 @@ import { describeCapabilityContextGlue, describeCapabilityRenderer, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RendererMessageCollector } from "./RendererMessageCollector"; import { Draupnir } from "../Draupnir"; import { diff --git a/apps/draupnir/src/capabilities/StandardEventConsequencesRenderer.tsx b/apps/draupnir/src/capabilities/StandardEventConsequencesRenderer.tsx index b1bed041..5d2566eb 100644 --- a/apps/draupnir/src/capabilities/StandardEventConsequencesRenderer.tsx +++ b/apps/draupnir/src/capabilities/StandardEventConsequencesRenderer.tsx @@ -17,7 +17,7 @@ import { describeCapabilityContextGlue, describeCapabilityRenderer, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RendererMessageCollector } from "./RendererMessageCollector"; import { Draupnir } from "../Draupnir"; import { diff --git a/apps/draupnir/src/capabilities/StandardUserConsequencesRenderer.tsx b/apps/draupnir/src/capabilities/StandardUserConsequencesRenderer.tsx index 16733cc6..359c5414 100644 --- a/apps/draupnir/src/capabilities/StandardUserConsequencesRenderer.tsx +++ b/apps/draupnir/src/capabilities/StandardUserConsequencesRenderer.tsx @@ -22,7 +22,7 @@ import { describeCapabilityContextGlue, describeCapabilityRenderer, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RendererMessageCollector } from "./RendererMessageCollector"; import { Draupnir } from "../Draupnir"; import { diff --git a/apps/draupnir/src/capabilities/SynapseAdminRoomTakedown/SynapseAdminRoomTakedown.ts b/apps/draupnir/src/capabilities/SynapseAdminRoomTakedown/SynapseAdminRoomTakedown.ts index 2f0d1922..7c085e05 100644 --- a/apps/draupnir/src/capabilities/SynapseAdminRoomTakedown/SynapseAdminRoomTakedown.ts +++ b/apps/draupnir/src/capabilities/SynapseAdminRoomTakedown/SynapseAdminRoomTakedown.ts @@ -7,12 +7,12 @@ import { describeCapabilityProvider, Logger, RoomBasicDetails, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RoomDetailsProvider, RoomTakedownCapability, } from "../RoomTakedownCapability"; -import { SynapseAdminClient } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { SynapseAdminClient } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { isError, Ok, Result } from "@gnuxie/typescript-result"; import { Draupnir } from "../../Draupnir"; import "../RoomTakedownCapability"; // needed for the interface to load. diff --git a/apps/draupnir/src/commands/AliasCommands.ts b/apps/draupnir/src/commands/AliasCommands.ts index c5d11008..5c0a5c09 100644 --- a/apps/draupnir/src/commands/AliasCommands.ts +++ b/apps/draupnir/src/commands/AliasCommands.ts @@ -8,7 +8,11 @@ // https://github.com/matrix-org/mjolnir // -import { ActionResult, isError, Ok } from "matrix-protection-suite"; +import { + ActionResult, + isError, + Ok, +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { describeCommand, @@ -17,7 +21,7 @@ import { MatrixRoomReferencePresentationSchema, } from "@the-draupnir-project/interface-manager"; import { DraupnirInterfaceAdaptor } from "./DraupnirCommandPrerequisites"; -import { resultifyBotSDKRequestError } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { resultifyBotSDKRequestError } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; export const DraupnirAliasAddCommand = describeCommand({ summary: "Add a new alias to the room on Draupnir's homeserver", diff --git a/apps/draupnir/src/commands/Ban.tsx b/apps/draupnir/src/commands/Ban.tsx index 8808c9da..7f4fa5d4 100644 --- a/apps/draupnir/src/commands/Ban.tsx +++ b/apps/draupnir/src/commands/Ban.tsx @@ -17,7 +17,7 @@ import { PolicyRoomManager, RoomResolver, WatchedPolicyRooms, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixRoomReference, MatrixUserID, diff --git a/apps/draupnir/src/commands/CreateBanListCommand.ts b/apps/draupnir/src/commands/CreateBanListCommand.ts index 017eab4f..043b2136 100644 --- a/apps/draupnir/src/commands/CreateBanListCommand.ts +++ b/apps/draupnir/src/commands/CreateBanListCommand.ts @@ -8,7 +8,10 @@ // https://github.com/matrix-org/mjolnir // -import { ActionResult, isError } from "matrix-protection-suite"; +import { + ActionResult, + isError, +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { MatrixRoomID } from "@the-draupnir-project/matrix-basic-types"; import { diff --git a/apps/draupnir/src/commands/Help.tsx b/apps/draupnir/src/commands/Help.tsx index d6109d3b..16373cab 100644 --- a/apps/draupnir/src/commands/Help.tsx +++ b/apps/draupnir/src/commands/Help.tsx @@ -8,16 +8,16 @@ // https://github.com/matrix-org/mjolnir // -import { Ok } from "matrix-protection-suite"; +import { Ok } from "@the-draupnir-project/matrix-protection-suite"; import { CommandTable, DocumentNode, DeadDocumentJSX, + TopPresentationSchema, describeCommand, describeRestParameters, } from "@the-draupnir-project/interface-manager"; import { DraupnirTopLevelCommands } from "./DraupnirCommandTable"; -import { TopPresentationSchema } from "@the-draupnir-project/interface-manager/dist/Command/PresentationSchema"; import { renderTableHelp } from "@the-draupnir-project/mps-interface-adaptor"; import { DraupnirInterfaceAdaptor } from "./DraupnirCommandPrerequisites"; import { DOCUMENTATION_URL } from "../config"; diff --git a/apps/draupnir/src/commands/ImportCommand.ts b/apps/draupnir/src/commands/ImportCommand.ts index b80ca362..cb7527a2 100644 --- a/apps/draupnir/src/commands/ImportCommand.ts +++ b/apps/draupnir/src/commands/ImportCommand.ts @@ -19,8 +19,8 @@ import { StateEvent, Value, isError, -} from "matrix-protection-suite"; -import { resolveRoomReferenceSafe } from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite"; +import { resolveRoomReferenceSafe } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { MatrixRoomReferencePresentationSchema, describeCommand, diff --git a/apps/draupnir/src/commands/KickCommand.tsx b/apps/draupnir/src/commands/KickCommand.tsx index c0c6f184..cc3465a4 100644 --- a/apps/draupnir/src/commands/KickCommand.tsx +++ b/apps/draupnir/src/commands/KickCommand.tsx @@ -17,7 +17,7 @@ import { SetRoomMembership, isError, Membership, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { StringUserID, StringRoomID, diff --git a/apps/draupnir/src/commands/ProtectionsCapabilitiesCommand.tsx b/apps/draupnir/src/commands/ProtectionsCapabilitiesCommand.tsx index 21e1fc4a..f35c950e 100644 --- a/apps/draupnir/src/commands/ProtectionsCapabilitiesCommand.tsx +++ b/apps/draupnir/src/commands/ProtectionsCapabilitiesCommand.tsx @@ -14,7 +14,7 @@ import { ProtectionDescription, findCapabilityProvider, findProtection, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { DraupnirInterfaceAdaptor } from "./DraupnirCommandPrerequisites"; diff --git a/apps/draupnir/src/commands/ProtectionsCommands.tsx b/apps/draupnir/src/commands/ProtectionsCommands.tsx index 74976577..2d44789e 100644 --- a/apps/draupnir/src/commands/ProtectionsCommands.tsx +++ b/apps/draupnir/src/commands/ProtectionsCommands.tsx @@ -23,7 +23,7 @@ import { findProtection, getAllProtections, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { DeadDocumentJSX, diff --git a/apps/draupnir/src/commands/ProtectionsShowCommand.tsx b/apps/draupnir/src/commands/ProtectionsShowCommand.tsx index 730ed40a..10cb1a86 100644 --- a/apps/draupnir/src/commands/ProtectionsShowCommand.tsx +++ b/apps/draupnir/src/commands/ProtectionsShowCommand.tsx @@ -18,7 +18,7 @@ import { ProtectionDescription, findCompatibleCapabilityProviders, findProtection, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { DraupnirInterfaceAdaptor } from "./DraupnirCommandPrerequisites"; import { StandardPersistentConfigRenderer } from "../safemode/PersistentConfigRenderer"; diff --git a/apps/draupnir/src/commands/RedactCommand.ts b/apps/draupnir/src/commands/RedactCommand.ts index 1c0ca734..2b016f21 100644 --- a/apps/draupnir/src/commands/RedactCommand.ts +++ b/apps/draupnir/src/commands/RedactCommand.ts @@ -8,9 +8,13 @@ // https://github.com/matrix-org/mjolnir // -import { ActionResult, Ok, isError } from "matrix-protection-suite"; +import { + ActionResult, + Ok, + isError, +} from "@the-draupnir-project/matrix-protection-suite"; import { redactUserMessagesIn } from "../utils"; -import { resolveRoomReferenceSafe } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { resolveRoomReferenceSafe } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { Draupnir } from "../Draupnir"; import { MatrixEventReference, diff --git a/apps/draupnir/src/commands/Rooms.tsx b/apps/draupnir/src/commands/Rooms.tsx index 0e25cebd..086bff24 100644 --- a/apps/draupnir/src/commands/Rooms.tsx +++ b/apps/draupnir/src/commands/Rooms.tsx @@ -17,7 +17,7 @@ import { WatchedPolicyRoom, assertThrowableIsError, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixRoomID, MatrixRoomReference, diff --git a/apps/draupnir/src/commands/Rules.tsx b/apps/draupnir/src/commands/Rules.tsx index c22bdc79..3905e592 100644 --- a/apps/draupnir/src/commands/Rules.tsx +++ b/apps/draupnir/src/commands/Rules.tsx @@ -18,7 +18,7 @@ import { PolicyRule, PolicyRuleMatchType, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { StringRoomID, MatrixRoomID, diff --git a/apps/draupnir/src/commands/SetAvatarCommand.ts b/apps/draupnir/src/commands/SetAvatarCommand.ts index e48ebe46..a76ad671 100644 --- a/apps/draupnir/src/commands/SetAvatarCommand.ts +++ b/apps/draupnir/src/commands/SetAvatarCommand.ts @@ -10,8 +10,8 @@ import { import { isStringMediaURI } from "@the-draupnir-project/matrix-basic-types"; import { Draupnir } from "../Draupnir"; import { DraupnirInterfaceAdaptor } from "./DraupnirCommandPrerequisites"; -import { resultifyBotSDKRequestError } from "matrix-protection-suite-for-matrix-bot-sdk"; -import { ActionError } from "matrix-protection-suite"; +import { resultifyBotSDKRequestError } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; +import { ActionError } from "@the-draupnir-project/matrix-protection-suite"; export const DraupnirAvatarCommand = describeCommand({ summary: diff --git a/apps/draupnir/src/commands/SetDisplayNameCommand.ts b/apps/draupnir/src/commands/SetDisplayNameCommand.ts index 9ca99b83..e1a4a5c8 100644 --- a/apps/draupnir/src/commands/SetDisplayNameCommand.ts +++ b/apps/draupnir/src/commands/SetDisplayNameCommand.ts @@ -9,7 +9,7 @@ import { } from "@the-draupnir-project/interface-manager"; import { Draupnir } from "../Draupnir"; import { DraupnirInterfaceAdaptor } from "./DraupnirCommandPrerequisites"; -import { resultifyBotSDKRequestError } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { resultifyBotSDKRequestError } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; export const DraupnirDisplaynameCommand = describeCommand({ summary: diff --git a/apps/draupnir/src/commands/StatusCommand.tsx b/apps/draupnir/src/commands/StatusCommand.tsx index e6aca311..5b6b6922 100644 --- a/apps/draupnir/src/commands/StatusCommand.tsx +++ b/apps/draupnir/src/commands/StatusCommand.tsx @@ -21,7 +21,7 @@ import { WatchedPolicyRoom, WatchedPolicyRooms, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { DeadDocumentJSX, diff --git a/apps/draupnir/src/commands/WatchPreview.tsx b/apps/draupnir/src/commands/WatchPreview.tsx index 3a920dca..ce0f36d6 100644 --- a/apps/draupnir/src/commands/WatchPreview.tsx +++ b/apps/draupnir/src/commands/WatchPreview.tsx @@ -23,7 +23,7 @@ import { SetMembershipRevision, ServerBanSynchronisationProtection, ServerBanIntentProjectionDelta, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; function watchDeltaForMemberBanIntents( setMembershipPoliciesRevision: SetMembershipPolicyRevision, diff --git a/apps/draupnir/src/commands/WatchUnwatchCommand.ts b/apps/draupnir/src/commands/WatchUnwatchCommand.ts index 1e68877c..c9c43540 100644 --- a/apps/draupnir/src/commands/WatchUnwatchCommand.ts +++ b/apps/draupnir/src/commands/WatchUnwatchCommand.ts @@ -14,7 +14,7 @@ import { RoomJoiner, WatchedPolicyRooms, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixRoomReferencePresentationSchema, describeCommand, diff --git a/apps/draupnir/src/commands/server-admin/DeactivateCommand.tsx b/apps/draupnir/src/commands/server-admin/DeactivateCommand.tsx index dd099f39..7b1e6356 100644 --- a/apps/draupnir/src/commands/server-admin/DeactivateCommand.tsx +++ b/apps/draupnir/src/commands/server-admin/DeactivateCommand.tsx @@ -22,7 +22,7 @@ import { LiteralPolicyRule, Logger, Task, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../../Draupnir"; import { DraupnirInterfaceAdaptor } from "../DraupnirCommandPrerequisites"; import { deactivateUser } from "../../protections/HomeserverUserPolicyApplication/deactivateUser"; diff --git a/apps/draupnir/src/commands/server-admin/HijackRoomCommand.ts b/apps/draupnir/src/commands/server-admin/HijackRoomCommand.ts index 4aaf8a2f..862a2a99 100644 --- a/apps/draupnir/src/commands/server-admin/HijackRoomCommand.ts +++ b/apps/draupnir/src/commands/server-admin/HijackRoomCommand.ts @@ -13,8 +13,8 @@ import { ActionResult, Ok, isError, -} from "matrix-protection-suite"; -import { resolveRoomReferenceSafe } from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite"; +import { resolveRoomReferenceSafe } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { MatrixRoomReferencePresentationSchema, MatrixUserIDPresentationType, diff --git a/apps/draupnir/src/commands/server-admin/ShutdownRoomCommand.ts b/apps/draupnir/src/commands/server-admin/ShutdownRoomCommand.ts index 6edfc12f..2e39aad5 100644 --- a/apps/draupnir/src/commands/server-admin/ShutdownRoomCommand.ts +++ b/apps/draupnir/src/commands/server-admin/ShutdownRoomCommand.ts @@ -16,7 +16,7 @@ import { tuple, } from "@the-draupnir-project/interface-manager"; import { Draupnir } from "../../Draupnir"; -import { ActionError } from "matrix-protection-suite"; +import { ActionError } from "@the-draupnir-project/matrix-protection-suite"; import { DraupnirInterfaceAdaptor } from "../DraupnirCommandPrerequisites"; export const SynapseAdminShutdownRoomCommand = describeCommand({ diff --git a/apps/draupnir/src/commands/server-admin/Takedown.tsx b/apps/draupnir/src/commands/server-admin/Takedown.tsx index b57f9f7a..49db0747 100644 --- a/apps/draupnir/src/commands/server-admin/Takedown.tsx +++ b/apps/draupnir/src/commands/server-admin/Takedown.tsx @@ -26,7 +26,7 @@ import { RoomResolver, SHA256HashStore, WatchedPolicyRooms, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Result, ResultError } from "@gnuxie/typescript-result"; import { MatrixRoomID, diff --git a/apps/draupnir/src/commands/unban/PolicyRemove.tsx b/apps/draupnir/src/commands/unban/PolicyRemove.tsx index f635e735..255c382b 100644 --- a/apps/draupnir/src/commands/unban/PolicyRemove.tsx +++ b/apps/draupnir/src/commands/unban/PolicyRemove.tsx @@ -22,7 +22,7 @@ import { Recommendation, StringTypeResult, StringTypeResultBuilder, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { isError, Result, ResultError } from "@gnuxie/typescript-result"; import { findPolicyRoomEditorFromRoomReference } from "../Ban"; import { diff --git a/apps/draupnir/src/commands/unban/Unban.tsx b/apps/draupnir/src/commands/unban/Unban.tsx index 19786297..0601795b 100644 --- a/apps/draupnir/src/commands/unban/Unban.tsx +++ b/apps/draupnir/src/commands/unban/Unban.tsx @@ -20,7 +20,7 @@ import { SetMembershipRevisionIssuer, SetRoomMembership, WatchedPolicyRooms, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixRoomID, MatrixUserID, diff --git a/apps/draupnir/src/commands/unban/UnbanEntity.tsx b/apps/draupnir/src/commands/unban/UnbanEntity.tsx index e88e9264..54f4e3d4 100644 --- a/apps/draupnir/src/commands/unban/UnbanEntity.tsx +++ b/apps/draupnir/src/commands/unban/UnbanEntity.tsx @@ -17,7 +17,7 @@ import { Recommendation, RoomSetResultBuilder, WatchedPolicyRooms, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { ListMatches } from "../Rules"; import { isError, Ok, Result } from "@gnuxie/typescript-result"; import { UnbanEntityPreview, UnbanEntityResult } from "./Unban"; diff --git a/apps/draupnir/src/commands/unban/UnbanUsers.tsx b/apps/draupnir/src/commands/unban/UnbanUsers.tsx index 3db99ec3..95c07feb 100644 --- a/apps/draupnir/src/commands/unban/UnbanUsers.tsx +++ b/apps/draupnir/src/commands/unban/UnbanUsers.tsx @@ -29,7 +29,7 @@ import { PolicyRuleType, PolicyRuleMatchType, PolicyListRevision, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { UnlistedUserRedactionQueue } from "../../queues/UnlistedUserRedactionQueue"; import { ListMatches } from "../Rules"; import { MemberRooms, UnbanMembersPreview, UnbanMembersResult } from "./Unban"; diff --git a/apps/draupnir/src/config.ts b/apps/draupnir/src/config.ts index 03823e66..77ee9a56 100644 --- a/apps/draupnir/src/config.ts +++ b/apps/draupnir/src/config.ts @@ -18,7 +18,10 @@ process.env.SUPPRESS_NO_CONFIG_WARNING = "y"; import Config from "config"; import path from "path"; import { SafeModeBootOption } from "./safemode/BootOption"; -import { Logger, setGlobalLoggerProvider } from "matrix-protection-suite"; +import { + Logger, + setGlobalLoggerProvider, +} from "@the-draupnir-project/matrix-protection-suite"; LogService.setLogger(new RichConsoleLogger()); setGlobalLoggerProvider(new RichConsoleLogger()); diff --git a/apps/draupnir/src/draupnirfactory/DraupnirFactory.ts b/apps/draupnir/src/draupnirfactory/DraupnirFactory.ts index 54754d7b..f75f464f 100644 --- a/apps/draupnir/src/draupnirfactory/DraupnirFactory.ts +++ b/apps/draupnir/src/draupnirfactory/DraupnirFactory.ts @@ -9,7 +9,7 @@ import { Ok, StandardLoggableConfigTracker, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { ClientCapabilityFactory, @@ -18,7 +18,7 @@ import { RoomStateManagerFactory, joinedRoomsSafe, resultifyBotSDKRequestErrorWith404AsUndefined, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { IConfig } from "../config"; import { makeProtectedRoomsSet } from "./DraupnirProtectedRoomsSet"; import { diff --git a/apps/draupnir/src/draupnirfactory/DraupnirProtectedRoomsSet.ts b/apps/draupnir/src/draupnirfactory/DraupnirProtectedRoomsSet.ts index 700fea79..c885457b 100644 --- a/apps/draupnir/src/draupnirfactory/DraupnirProtectedRoomsSet.ts +++ b/apps/draupnir/src/draupnirfactory/DraupnirProtectedRoomsSet.ts @@ -42,12 +42,12 @@ import { StandardSetRoomState, StandardWatchedPolicyRooms, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { BotSDKAccountDataConfigBackend, BotSDKRoomStateConfigBackend, MatrixSendClient, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { DefaultEnabledProtectionsMigration } from "../protections/ConfigMigration/DefaultEnabledProtectionsMigration"; import "../protections/DraupnirProtectionsIndex"; import { IConfig } from "../config"; diff --git a/apps/draupnir/src/draupnirfactory/StandardDraupnirManager.ts b/apps/draupnir/src/draupnirfactory/StandardDraupnirManager.ts index 05c774a3..3fa1fe9d 100644 --- a/apps/draupnir/src/draupnirfactory/StandardDraupnirManager.ts +++ b/apps/draupnir/src/draupnirfactory/StandardDraupnirManager.ts @@ -14,7 +14,7 @@ import { ConfigRecoverableError, Logger, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { IConfig } from "../config"; import { DraupnirFactory } from "./DraupnirFactory"; import { Draupnir } from "../Draupnir"; diff --git a/apps/draupnir/src/index.ts b/apps/draupnir/src/index.ts index 664d4f3e..7a57b996 100644 --- a/apps/draupnir/src/index.ts +++ b/apps/draupnir/src/index.ts @@ -22,8 +22,8 @@ import { StoreType } from "@matrix-org/matrix-sdk-crypto-nodejs"; import { configRead as configRead, getStoragePath } from "./config"; import { initializeSentry } from "./utils"; import { DraupnirBotModeToggle } from "./DraupnirBotMode"; -import { SafeMatrixEmitterWrapper } from "matrix-protection-suite-for-matrix-bot-sdk"; -import { DefaultEventDecoder } from "matrix-protection-suite"; +import { SafeMatrixEmitterWrapper } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; +import { DefaultEventDecoder } from "@the-draupnir-project/matrix-protection-suite"; import { makeTopLevelStores } from "./backingstore/DraupnirStores"; void (async function () { diff --git a/apps/draupnir/src/managedRoomAccountData.ts b/apps/draupnir/src/managedRoomAccountData.ts index 4b8338fb..f81f8d5f 100644 --- a/apps/draupnir/src/managedRoomAccountData.ts +++ b/apps/draupnir/src/managedRoomAccountData.ts @@ -21,7 +21,7 @@ import { RoomCreator, RoomIDPermalinkSchema, RoomVersionMirror, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; export const ZERO_TOUCH_DEPLOY_ROOM_ACCOUNT_DATA_TYPE = "space.draupnir.zero_touch_deploy_room"; diff --git a/apps/draupnir/src/managementroom/ManagementRoomDetail.ts b/apps/draupnir/src/managementroom/ManagementRoomDetail.ts index b94be1d3..0eefbbfb 100644 --- a/apps/draupnir/src/managementroom/ManagementRoomDetail.ts +++ b/apps/draupnir/src/managementroom/ManagementRoomDetail.ts @@ -16,7 +16,7 @@ import { RoomCreateEvent, RoomMembershipRevisionIssuer, RoomStateRevisionIssuer, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; export interface ManagementRoomDetail { isRoomPublic(): boolean; diff --git a/apps/draupnir/src/managementroom/ManagementRoomOutput.ts b/apps/draupnir/src/managementroom/ManagementRoomOutput.ts index 46ec78c2..d9ccf9ea 100644 --- a/apps/draupnir/src/managementroom/ManagementRoomOutput.ts +++ b/apps/draupnir/src/managementroom/ManagementRoomOutput.ts @@ -17,7 +17,7 @@ import { } from "@vector-im/matrix-bot-sdk"; import { IConfig } from "../config"; import { htmlEscape } from "../utils"; -import { MatrixSendClient } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { MatrixSendClient } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { StringRoomID, StringUserID, @@ -27,7 +27,7 @@ import { MatrixRoomID, } from "@the-draupnir-project/matrix-basic-types"; import { ManagementRoomDetail } from "./ManagementRoomDetail"; -import { Task } from "matrix-protection-suite"; +import { Task } from "@the-draupnir-project/matrix-protection-suite"; const levelToFn = { [LogLevel.DEBUG.toString()]: LogService.debug, diff --git a/apps/draupnir/src/models/RoomUpdateError.tsx b/apps/draupnir/src/models/RoomUpdateError.tsx index 14e9e35b..6b43840d 100644 --- a/apps/draupnir/src/models/RoomUpdateError.tsx +++ b/apps/draupnir/src/models/RoomUpdateError.tsx @@ -18,7 +18,7 @@ import { RoomMessageSender, RoomUpdateError, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { sendMatrixEventsFromDeadDocument } from "@the-draupnir-project/mps-interface-adaptor"; import { Result } from "@gnuxie/typescript-result"; diff --git a/apps/draupnir/src/protections/BanPropagation.tsx b/apps/draupnir/src/protections/BanPropagation.tsx index 8004a675..dd470911 100644 --- a/apps/draupnir/src/protections/BanPropagation.tsx +++ b/apps/draupnir/src/protections/BanPropagation.tsx @@ -33,9 +33,9 @@ import { allocateProtection, OwnLifetime, Protection, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; -import { resolveRoomReferenceSafe } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { resolveRoomReferenceSafe } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { DraupnirProtection } from "./Protection"; import { MatrixRoomID, diff --git a/apps/draupnir/src/protections/BasicFlooding.ts b/apps/draupnir/src/protections/BasicFlooding.ts index bef5404a..9c045faa 100644 --- a/apps/draupnir/src/protections/BasicFlooding.ts +++ b/apps/draupnir/src/protections/BasicFlooding.ts @@ -32,7 +32,7 @@ import { UserConsequences, describeProtection, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Type } from "@sinclair/typebox"; const log = new Logger("BasicFloodingProtection"); diff --git a/apps/draupnir/src/protections/BlockInvitationsOnServerProtection.tsx b/apps/draupnir/src/protections/BlockInvitationsOnServerProtection.tsx index 5dbfa93d..0837cd84 100644 --- a/apps/draupnir/src/protections/BlockInvitationsOnServerProtection.tsx +++ b/apps/draupnir/src/protections/BlockInvitationsOnServerProtection.tsx @@ -15,7 +15,7 @@ import { Recommendation, UnknownConfig, WatchedPolicyRooms, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { BlockingCallback } from "../webapis/SynapseHTTPAntispam/SpamCheckEndpointPluginManager"; import { UserMayInviteListenerArguments } from "../webapis/SynapseHTTPAntispam/UserMayInviteEndpoint"; import { createHash } from "crypto"; diff --git a/apps/draupnir/src/protections/ConfigHooks.ts b/apps/draupnir/src/protections/ConfigHooks.ts index 108405d1..c496aad2 100644 --- a/apps/draupnir/src/protections/ConfigHooks.ts +++ b/apps/draupnir/src/protections/ConfigHooks.ts @@ -8,7 +8,7 @@ import { ProtectionsConfig, ServerBanSynchronisationProtection, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { IConfig } from "../config"; import { RoomTakedownProtection } from "./RoomTakedown/RoomTakedownProtection"; import { BlockInvitationsOnServerProtection } from "./BlockInvitationsOnServerProtection"; diff --git a/apps/draupnir/src/protections/ConfigMigration/CapabilitySetProviderMigration.ts b/apps/draupnir/src/protections/ConfigMigration/CapabilitySetProviderMigration.ts index cedf5336..60c89a3d 100644 --- a/apps/draupnir/src/protections/ConfigMigration/CapabilitySetProviderMigration.ts +++ b/apps/draupnir/src/protections/ConfigMigration/CapabilitySetProviderMigration.ts @@ -11,7 +11,7 @@ import { ServerACLSynchronisationCapability, SimulatedServerBanSynchronisationCapability, Value, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; const log = new Logger("CapabilitySetProviderMigration"); diff --git a/apps/draupnir/src/protections/ConfigMigration/DefaultEnabledProtectionsMigration.ts b/apps/draupnir/src/protections/ConfigMigration/DefaultEnabledProtectionsMigration.ts index 8560f8fd..9ba1a8ba 100644 --- a/apps/draupnir/src/protections/ConfigMigration/DefaultEnabledProtectionsMigration.ts +++ b/apps/draupnir/src/protections/ConfigMigration/DefaultEnabledProtectionsMigration.ts @@ -13,7 +13,7 @@ import { SchemedDataManager, Value, findProtection, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RedactionSynchronisationProtection } from "../RedactionSynchronisation"; import { PolicyChangeNotification } from "../PolicyChangeNotification"; import { JoinRoomsOnInviteProtection } from "../invitation/JoinRoomsOnInviteProtection"; diff --git a/apps/draupnir/src/protections/DraupnirNews/DraupnirNews.tsx b/apps/draupnir/src/protections/DraupnirNews/DraupnirNews.tsx index 9e7432e4..eae00251 100644 --- a/apps/draupnir/src/protections/DraupnirNews/DraupnirNews.tsx +++ b/apps/draupnir/src/protections/DraupnirNews/DraupnirNews.tsx @@ -22,7 +22,7 @@ import { ProtectionDescription, StandardTimedGate, Value, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../../Draupnir"; import { DraupnirProtection } from "../Protection"; diff --git a/apps/draupnir/src/protections/FirstMessageIsImage.ts b/apps/draupnir/src/protections/FirstMessageIsImage.ts index 8f7061b6..6bdd5f7d 100644 --- a/apps/draupnir/src/protections/FirstMessageIsImage.ts +++ b/apps/draupnir/src/protections/FirstMessageIsImage.ts @@ -27,7 +27,7 @@ import { UserConsequences, Value, describeProtection, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { MatrixRoomID, diff --git a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/HomeserverUserPolicyApplication.ts b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/HomeserverUserPolicyApplication.ts index 4e162100..f9c5011e 100644 --- a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/HomeserverUserPolicyApplication.ts +++ b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/HomeserverUserPolicyApplication.ts @@ -21,7 +21,7 @@ import { Recommendation, Task, WatchedPolicyRooms, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { UserRestrictionCapability } from "./UserRestrictionCapability"; import { UserRestrictionAuditLog } from "./UserRestrictionAuditLog"; import { sendPromptDeactivation } from "../../commands/server-admin/DeactivateCommand"; diff --git a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/HomeserverUserPolicyProtection.ts b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/HomeserverUserPolicyProtection.ts index a7bed5f1..0c3ed36c 100644 --- a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/HomeserverUserPolicyProtection.ts +++ b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/HomeserverUserPolicyProtection.ts @@ -13,7 +13,7 @@ import { ProtectedRoomsSet, Protection, ProtectionDescription, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { UserRestrictionCapability } from "./UserRestrictionCapability"; import { Draupnir } from "../../Draupnir"; import { UserRestrictionAuditLog } from "./UserRestrictionAuditLog"; diff --git a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/HomeserverUserPurgingDeactivate.ts b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/HomeserverUserPurgingDeactivate.ts index 5c485279..8f8044b1 100644 --- a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/HomeserverUserPurgingDeactivate.ts +++ b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/HomeserverUserPurgingDeactivate.ts @@ -16,11 +16,13 @@ import { LiteralPolicyRule, Logger, StandardBatcher, -} from "matrix-protection-suite"; -import { SynapseAdminClient } from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite"; +import { + SynapseAdminClient, + UserDetailsResponse, +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { deactivateUser } from "./deactivateUser"; import { UserRestrictionAuditLog } from "./UserRestrictionAuditLog"; -import { UserDetailsResponse } from "matrix-protection-suite-for-matrix-bot-sdk/dist/SynapseAdmin/UserDetailsEndpoint"; const log = new Logger("HomeserverUserPurgingDeactivate"); diff --git a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/SqliteUserRestrictionAuditLog.ts b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/SqliteUserRestrictionAuditLog.ts index 6a7fb2fc..81cd602e 100644 --- a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/SqliteUserRestrictionAuditLog.ts +++ b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/SqliteUserRestrictionAuditLog.ts @@ -9,7 +9,7 @@ import { ActionResult, LiteralPolicyRule, Logger, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { UserRestrictionAuditLog } from "./UserRestrictionAuditLog"; import { checkKnownTables, @@ -21,7 +21,7 @@ import { } from "../../backingstore/better-sqlite3/BetterSqliteStore"; import { Database } from "better-sqlite3"; import { Ok, Result } from "@gnuxie/typescript-result"; -import { AccountRestriction } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { AccountRestriction } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import path from "path"; const log = new Logger("SqliteUserAuditLog"); diff --git a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserRestrictionAuditLog.ts b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserRestrictionAuditLog.ts index 16d65f47..a89d4ef7 100644 --- a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserRestrictionAuditLog.ts +++ b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserRestrictionAuditLog.ts @@ -4,8 +4,8 @@ import { Result } from "@gnuxie/typescript-result"; import { StringUserID } from "@the-draupnir-project/matrix-basic-types"; -import { LiteralPolicyRule } from "matrix-protection-suite"; -import { AccountRestriction } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { LiteralPolicyRule } from "@the-draupnir-project/matrix-protection-suite"; +import { AccountRestriction } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; export interface UserRestrictionAuditLog { isUserRestricted(userID: StringUserID): Promise>; diff --git a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserRestrictionCapability.ts b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserRestrictionCapability.ts index 1def4da3..3b43b563 100644 --- a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserRestrictionCapability.ts +++ b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserRestrictionCapability.ts @@ -10,8 +10,8 @@ import { CapabilityMethodSchema, describeCapabilityInterface, LiteralPolicyRule, -} from "matrix-protection-suite"; -import { AccountRestriction } from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite"; +import { AccountRestriction } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; export interface UserRestrictionCapability extends Capability { isUserRestricted(userID: StringUserID): Promise>; diff --git a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserRestrictionCapabilityRenderer.tsx b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserRestrictionCapabilityRenderer.tsx index 506644a8..9120d07a 100644 --- a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserRestrictionCapabilityRenderer.tsx +++ b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserRestrictionCapabilityRenderer.tsx @@ -6,12 +6,12 @@ import { describeCapabilityRenderer, DescriptionMeta, LiteralPolicyRule, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RendererMessageCollector } from "../../capabilities/RendererMessageCollector"; import { UserRestrictionCapability } from "./UserRestrictionCapability"; import { StringUserID } from "@the-draupnir-project/matrix-basic-types"; import { isError, Result } from "@gnuxie/typescript-result"; -import { AccountRestriction } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { AccountRestriction } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { renderFailedSingularConsequence } from "@the-draupnir-project/mps-interface-adaptor"; import { DeadDocumentJSX, diff --git a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserSuspensionCapability.ts b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserSuspensionCapability.ts index 12130577..ebe59fce 100644 --- a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserSuspensionCapability.ts +++ b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/UserSuspensionCapability.ts @@ -5,7 +5,7 @@ import { AccountRestriction, SynapseAdminClient, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { UserRestrictionCapability } from "./UserRestrictionCapability"; import { UserRestrictionAuditLog } from "./UserRestrictionAuditLog"; import { StringUserID } from "@the-draupnir-project/matrix-basic-types"; @@ -13,7 +13,7 @@ import { describeCapabilityProvider, LiteralPolicyRule, Logger, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { isError, Ok, Result, ResultError } from "@gnuxie/typescript-result"; import { isUserAccountRestricted } from "./HomeserverUserPurgingDeactivate"; import { Draupnir } from "../../Draupnir"; diff --git a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/deactivateUser.ts b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/deactivateUser.ts index 7f3dcfd2..3370fe92 100644 --- a/apps/draupnir/src/protections/HomeserverUserPolicyApplication/deactivateUser.ts +++ b/apps/draupnir/src/protections/HomeserverUserPolicyApplication/deactivateUser.ts @@ -4,11 +4,14 @@ import { isError, Ok, Result } from "@gnuxie/typescript-result"; import { StringUserID } from "@the-draupnir-project/matrix-basic-types"; -import { LiteralPolicyRule, Logger } from "matrix-protection-suite"; +import { + LiteralPolicyRule, + Logger, +} from "@the-draupnir-project/matrix-protection-suite"; import { AccountRestriction, SynapseAdminClient, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { UserRestrictionAuditLog } from "./UserRestrictionAuditLog"; const log = new Logger("deactivateUser"); diff --git a/apps/draupnir/src/protections/InvalidEventProtection.tsx b/apps/draupnir/src/protections/InvalidEventProtection.tsx index 81473a0d..3173eb87 100644 --- a/apps/draupnir/src/protections/InvalidEventProtection.tsx +++ b/apps/draupnir/src/protections/InvalidEventProtection.tsx @@ -19,7 +19,7 @@ import { RoomMessageSender, Task, UserConsequences, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { MatrixRoomID, diff --git a/apps/draupnir/src/protections/JoinWaveShortCircuit.tsx b/apps/draupnir/src/protections/JoinWaveShortCircuit.tsx index 28d5a116..c7d8ecce 100644 --- a/apps/draupnir/src/protections/JoinWaveShortCircuit.tsx +++ b/apps/draupnir/src/protections/JoinWaveShortCircuit.tsx @@ -26,7 +26,7 @@ import { allocateProtection, describeProtection, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { LogLevel } from "@vector-im/matrix-bot-sdk"; import { Draupnir } from "../Draupnir"; import { DraupnirProtection } from "./Protection"; diff --git a/apps/draupnir/src/protections/MembershipChangeProtection.tsx b/apps/draupnir/src/protections/MembershipChangeProtection.tsx index 46e8f663..189192eb 100644 --- a/apps/draupnir/src/protections/MembershipChangeProtection.tsx +++ b/apps/draupnir/src/protections/MembershipChangeProtection.tsx @@ -18,7 +18,7 @@ import { UserConsequences, allocateProtection, describeProtection, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { MatrixRoomID, diff --git a/apps/draupnir/src/protections/MentionLimitProtection.tsx b/apps/draupnir/src/protections/MentionLimitProtection.tsx index 65decbee..8b3125a6 100644 --- a/apps/draupnir/src/protections/MentionLimitProtection.tsx +++ b/apps/draupnir/src/protections/MentionLimitProtection.tsx @@ -24,7 +24,7 @@ import { allocateProtection, describeProtection, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { MatrixRoomID, diff --git a/apps/draupnir/src/protections/MessageIsMedia.ts b/apps/draupnir/src/protections/MessageIsMedia.ts index 695d78e5..b0730b79 100644 --- a/apps/draupnir/src/protections/MessageIsMedia.ts +++ b/apps/draupnir/src/protections/MessageIsMedia.ts @@ -23,7 +23,7 @@ import { UnknownConfig, Value, describeProtection, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { MatrixRoomID, diff --git a/apps/draupnir/src/protections/MessageIsVoice.ts b/apps/draupnir/src/protections/MessageIsVoice.ts index a79a36bf..310b0904 100644 --- a/apps/draupnir/src/protections/MessageIsVoice.ts +++ b/apps/draupnir/src/protections/MessageIsVoice.ts @@ -23,7 +23,7 @@ import { UnknownConfig, Value, describeProtection, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { MatrixRoomID, diff --git a/apps/draupnir/src/protections/MissingProtectionPermissions.tsx b/apps/draupnir/src/protections/MissingProtectionPermissions.tsx index 8b38932d..56492ffd 100644 --- a/apps/draupnir/src/protections/MissingProtectionPermissions.tsx +++ b/apps/draupnir/src/protections/MissingProtectionPermissions.tsx @@ -7,7 +7,7 @@ import { ProtectionPermissionsChange, RoomMessageSender, Task, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { renderRoomPill, sendMatrixEventsFromDeadDocument, diff --git a/apps/draupnir/src/protections/NewJoinerProtection.ts b/apps/draupnir/src/protections/NewJoinerProtection.ts index 99bb2ca5..faff4635 100644 --- a/apps/draupnir/src/protections/NewJoinerProtection.ts +++ b/apps/draupnir/src/protections/NewJoinerProtection.ts @@ -19,7 +19,7 @@ import { UserConsequences, describeProtection, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { IConfig } from "../config"; import { userServerName } from "@the-draupnir-project/matrix-basic-types"; diff --git a/apps/draupnir/src/protections/NotificationRoom/NotificationRoom.ts b/apps/draupnir/src/protections/NotificationRoom/NotificationRoom.ts index 3627c3b7..1c6a3b36 100644 --- a/apps/draupnir/src/protections/NotificationRoom/NotificationRoom.ts +++ b/apps/draupnir/src/protections/NotificationRoom/NotificationRoom.ts @@ -18,7 +18,7 @@ import { RoomInviter, RoomMembershipManager, RoomStateEventSender, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../../Draupnir"; export type SettingChangeAndProtectionEnableCB< diff --git a/apps/draupnir/src/protections/PolicyChangeNotification.tsx b/apps/draupnir/src/protections/PolicyChangeNotification.tsx index 6036fcfb..0d3081af 100644 --- a/apps/draupnir/src/protections/PolicyChangeNotification.tsx +++ b/apps/draupnir/src/protections/PolicyChangeNotification.tsx @@ -26,7 +26,7 @@ import { StringRoomIDSchema, describeProtection, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { DraupnirProtection } from "./Protection"; import { Draupnir } from "../Draupnir"; import { diff --git a/apps/draupnir/src/protections/ProtectedRooms/ProtectJoinedRooms.tsx b/apps/draupnir/src/protections/ProtectedRooms/ProtectJoinedRooms.tsx index 84283431..e26eebb5 100644 --- a/apps/draupnir/src/protections/ProtectedRooms/ProtectJoinedRooms.tsx +++ b/apps/draupnir/src/protections/ProtectedRooms/ProtectJoinedRooms.tsx @@ -20,7 +20,7 @@ import { RoomSetResultBuilder, StandardBatcher, Task, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { renderRoomSetResult, sendMatrixEventsFromDeadDocument, diff --git a/apps/draupnir/src/protections/ProtectedRooms/ProtectReplacementRooms.tsx b/apps/draupnir/src/protections/ProtectedRooms/ProtectReplacementRooms.tsx index b0f7ea29..ee7fa3e3 100644 --- a/apps/draupnir/src/protections/ProtectedRooms/ProtectReplacementRooms.tsx +++ b/apps/draupnir/src/protections/ProtectedRooms/ProtectReplacementRooms.tsx @@ -27,7 +27,7 @@ import { Task, TombstoneEvent, Value, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { DeadDocumentJSX } from "@the-draupnir-project/interface-manager"; const log = new Logger("ProtectReplacementRooms"); diff --git a/apps/draupnir/src/protections/ProtectedRooms/RoomsSetBehaviourProtection.tsx b/apps/draupnir/src/protections/ProtectedRooms/RoomsSetBehaviourProtection.tsx index e28c3fd9..f42e3974 100644 --- a/apps/draupnir/src/protections/ProtectedRooms/RoomsSetBehaviourProtection.tsx +++ b/apps/draupnir/src/protections/ProtectedRooms/RoomsSetBehaviourProtection.tsx @@ -16,7 +16,7 @@ import { RoomStateRevision, StateChange, UnknownConfig, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { DraupnirProtection } from "../Protection"; import { Draupnir } from "../../Draupnir"; import { Ok, Result } from "@gnuxie/typescript-result"; diff --git a/apps/draupnir/src/protections/ProtectedRooms/UnprotectPartedRooms.tsx b/apps/draupnir/src/protections/ProtectedRooms/UnprotectPartedRooms.tsx index a48d70ad..95775148 100644 --- a/apps/draupnir/src/protections/ProtectedRooms/UnprotectPartedRooms.tsx +++ b/apps/draupnir/src/protections/ProtectedRooms/UnprotectPartedRooms.tsx @@ -14,7 +14,7 @@ import { ProtectedRoomsManager, RoomMessageSender, Task, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { renderMentionPill, renderRoomPill, diff --git a/apps/draupnir/src/protections/ProtectedRooms/WatchReplacementPolicyRooms.tsx b/apps/draupnir/src/protections/ProtectedRooms/WatchReplacementPolicyRooms.tsx index c45c8138..0132c86f 100644 --- a/apps/draupnir/src/protections/ProtectedRooms/WatchReplacementPolicyRooms.tsx +++ b/apps/draupnir/src/protections/ProtectedRooms/WatchReplacementPolicyRooms.tsx @@ -13,6 +13,7 @@ import { RoomEvent, RoomJoiner, RoomMessageSender, + RoomReactionSender, RoomStateManager, RoomStateRevision, RoomVersionMirror, @@ -23,7 +24,7 @@ import { Value, WatchedPolicyRoom, WatchedPolicyRooms, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { renderPolicyList } from "../../commands/StatusCommand"; import { DeadDocumentJSX } from "@the-draupnir-project/interface-manager"; import { @@ -42,7 +43,6 @@ import { renderErrorDetails, ReactionListener, } from "@the-draupnir-project/mps-interface-adaptor"; -import { RoomReactionSender } from "matrix-protection-suite/dist/Client/RoomReactionSender"; const log = new Logger("WatchReplacementPolicyRooms"); diff --git a/apps/draupnir/src/protections/ProtectedRoomsSetRenderers.tsx b/apps/draupnir/src/protections/ProtectedRoomsSetRenderers.tsx index 9cb11bc0..3e07b7c0 100644 --- a/apps/draupnir/src/protections/ProtectedRoomsSetRenderers.tsx +++ b/apps/draupnir/src/protections/ProtectedRoomsSetRenderers.tsx @@ -13,7 +13,7 @@ import { ProtectionDescription, RoomMessageSender, Task, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { StringRoomID } from "@the-draupnir-project/matrix-basic-types"; import { sendMatrixEventsFromDeadDocument } from "@the-draupnir-project/mps-interface-adaptor"; import { DeadDocumentJSX } from "@the-draupnir-project/interface-manager"; diff --git a/apps/draupnir/src/protections/Protection.ts b/apps/draupnir/src/protections/Protection.ts index 55a5a961..f87afde1 100644 --- a/apps/draupnir/src/protections/Protection.ts +++ b/apps/draupnir/src/protections/Protection.ts @@ -8,7 +8,7 @@ // https://github.com/matrix-org/mjolnir // -import { Protection } from "matrix-protection-suite"; +import { Protection } from "@the-draupnir-project/matrix-protection-suite"; export interface DraupnirProtection< TProtectionDescription, diff --git a/apps/draupnir/src/protections/RedactionSynchronisation.ts b/apps/draupnir/src/protections/RedactionSynchronisation.ts index 2270c133..58e8ed19 100644 --- a/apps/draupnir/src/protections/RedactionSynchronisation.ts +++ b/apps/draupnir/src/protections/RedactionSynchronisation.ts @@ -33,7 +33,7 @@ import { describeCapabilityProvider, describeCapabilityRenderer, describeProtection, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { MatrixGlob, diff --git a/apps/draupnir/src/protections/RoomTakedown/DiscoveredRoomStore.ts b/apps/draupnir/src/protections/RoomTakedown/DiscoveredRoomStore.ts index 6567d19f..ca9b7646 100644 --- a/apps/draupnir/src/protections/RoomTakedown/DiscoveredRoomStore.ts +++ b/apps/draupnir/src/protections/RoomTakedown/DiscoveredRoomStore.ts @@ -11,7 +11,7 @@ import { Logger, RoomBasicDetails, SHA256HashStore, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RoomDetailsProvider } from "../../capabilities/RoomTakedownCapability"; import { RoomDiscovery } from "./RoomDiscovery"; import EventEmitter from "events"; diff --git a/apps/draupnir/src/protections/RoomTakedown/RoomAuditLog.ts b/apps/draupnir/src/protections/RoomTakedown/RoomAuditLog.ts index 24d0295b..b11d91e0 100644 --- a/apps/draupnir/src/protections/RoomTakedown/RoomAuditLog.ts +++ b/apps/draupnir/src/protections/RoomTakedown/RoomAuditLog.ts @@ -7,7 +7,10 @@ import { StringEventID, StringRoomID, } from "@the-draupnir-project/matrix-basic-types"; -import { LiteralPolicyRule, RoomBasicDetails } from "matrix-protection-suite"; +import { + LiteralPolicyRule, + RoomBasicDetails, +} from "@the-draupnir-project/matrix-protection-suite"; export type RoomTakedownDetails = Omit & { policy_id: StringEventID; diff --git a/apps/draupnir/src/protections/RoomTakedown/RoomDiscovery.ts b/apps/draupnir/src/protections/RoomTakedown/RoomDiscovery.ts index 92b853dd..de3aed0c 100644 --- a/apps/draupnir/src/protections/RoomTakedown/RoomDiscovery.ts +++ b/apps/draupnir/src/protections/RoomTakedown/RoomDiscovery.ts @@ -2,7 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 -import { PolicyRuleChange, RoomBasicDetails } from "matrix-protection-suite"; +import { + PolicyRuleChange, + RoomBasicDetails, +} from "@the-draupnir-project/matrix-protection-suite"; import { RoomToCheck } from "./DiscoveredRoomStore"; import { Result } from "@gnuxie/typescript-result"; import { StringRoomID } from "@the-draupnir-project/matrix-basic-types"; diff --git a/apps/draupnir/src/protections/RoomTakedown/RoomDiscoveryRenderer.tsx b/apps/draupnir/src/protections/RoomTakedown/RoomDiscoveryRenderer.tsx index 1e8656cb..392338a2 100644 --- a/apps/draupnir/src/protections/RoomTakedown/RoomDiscoveryRenderer.tsx +++ b/apps/draupnir/src/protections/RoomTakedown/RoomDiscoveryRenderer.tsx @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 import { DocumentNode } from "@the-draupnir-project/interface-manager"; -import { RoomBasicDetails } from "matrix-protection-suite"; +import { RoomBasicDetails } from "@the-draupnir-project/matrix-protection-suite"; import { DeadDocumentJSX } from "@the-draupnir-project/interface-manager"; export function renderDiscoveredRoom(details: RoomBasicDetails): DocumentNode { diff --git a/apps/draupnir/src/protections/RoomTakedown/RoomTakedown.ts b/apps/draupnir/src/protections/RoomTakedown/RoomTakedown.ts index 97e7b016..bf41bf51 100644 --- a/apps/draupnir/src/protections/RoomTakedown/RoomTakedown.ts +++ b/apps/draupnir/src/protections/RoomTakedown/RoomTakedown.ts @@ -12,7 +12,7 @@ import { PolicyRuleMatchType, PolicyRuleType, Recommendation, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RoomAuditLog } from "./RoomAuditLog"; import { isError, Ok, Result } from "@gnuxie/typescript-result"; import { RoomTakedownCapability } from "../../capabilities/RoomTakedownCapability"; diff --git a/apps/draupnir/src/protections/RoomTakedown/RoomTakedownProtection.ts b/apps/draupnir/src/protections/RoomTakedown/RoomTakedownProtection.ts index 885d7034..501df190 100644 --- a/apps/draupnir/src/protections/RoomTakedown/RoomTakedownProtection.ts +++ b/apps/draupnir/src/protections/RoomTakedown/RoomTakedownProtection.ts @@ -7,6 +7,7 @@ import { ActionResult, allocateProtection, describeProtection, + EDStatic, Logger, OwnLifetime, PolicyListRevision, @@ -19,7 +20,7 @@ import { SHA256HashStore, StringRoomIDSchema, Task, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RoomTakedownCapability } from "../../capabilities/RoomTakedownCapability"; import { Draupnir } from "../../Draupnir"; import { StandardRoomTakedown } from "./RoomTakedown"; @@ -40,7 +41,6 @@ import { sendMatrixEventsFromDeadDocument, } from "@the-draupnir-project/mps-interface-adaptor"; import { Type } from "@sinclair/typebox"; -import { EDStatic } from "matrix-protection-suite/dist/Interface/Static"; import { renderDiscoveredRoom } from "./RoomDiscoveryRenderer"; import { NotificationRoomCreator } from "../NotificationRoom/NotificationRoom"; import { MatrixGlob } from "@vector-im/matrix-bot-sdk"; diff --git a/apps/draupnir/src/protections/RoomTakedown/SqliteRoomAuditLog.ts b/apps/draupnir/src/protections/RoomTakedown/SqliteRoomAuditLog.ts index 6ebe2601..9c36135e 100644 --- a/apps/draupnir/src/protections/RoomTakedown/SqliteRoomAuditLog.ts +++ b/apps/draupnir/src/protections/RoomTakedown/SqliteRoomAuditLog.ts @@ -15,7 +15,7 @@ import { Logger, PolicyRuleType, RoomBasicDetails, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { BetterSqliteOptions, BetterSqliteStore, diff --git a/apps/draupnir/src/protections/RoomTakedown/SynapseHTTPAntispamRoomExplorer.ts b/apps/draupnir/src/protections/RoomTakedown/SynapseHTTPAntispamRoomExplorer.ts index d9e5dfbf..aeb6494d 100644 --- a/apps/draupnir/src/protections/RoomTakedown/SynapseHTTPAntispamRoomExplorer.ts +++ b/apps/draupnir/src/protections/RoomTakedown/SynapseHTTPAntispamRoomExplorer.ts @@ -8,7 +8,7 @@ import { Logger, PolicyRuleChange, StandardBatcher, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { CheckEventForSpamRequestBody } from "../../webapis/SynapseHTTPAntispam/CheckEventForSpamEndpoint"; import { SynapseHttpAntispam } from "../../webapis/SynapseHTTPAntispam/SynapseHttpAntispam"; import { StringRoomID } from "@the-draupnir-project/matrix-basic-types"; diff --git a/apps/draupnir/src/protections/RoomTakedown/SynapseRoomListRoomExplorerer.ts b/apps/draupnir/src/protections/RoomTakedown/SynapseRoomListRoomExplorerer.ts index 9ac84a80..d9a626dc 100644 --- a/apps/draupnir/src/protections/RoomTakedown/SynapseRoomListRoomExplorerer.ts +++ b/apps/draupnir/src/protections/RoomTakedown/SynapseRoomListRoomExplorerer.ts @@ -11,10 +11,12 @@ import { PolicyRuleChange, PolicyRuleChangeType, StandardTimedGate, -} from "matrix-protection-suite"; -import { SynapseAdminClient } from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite"; +import { + RoomListResponse, + SynapseAdminClient, +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { isError, Result } from "@gnuxie/typescript-result"; -import { RoomListResponse } from "matrix-protection-suite-for-matrix-bot-sdk/dist/SynapseAdmin/RoomListEndpoint"; const log = new Logger("SynapseRoomListExplorer"); diff --git a/apps/draupnir/src/protections/TrustedReporters.ts b/apps/draupnir/src/protections/TrustedReporters.ts index 6055187a..f37ce0f3 100644 --- a/apps/draupnir/src/protections/TrustedReporters.ts +++ b/apps/draupnir/src/protections/TrustedReporters.ts @@ -24,7 +24,7 @@ import { UserConsequences, describeProtection, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { StringUserID, diff --git a/apps/draupnir/src/protections/WordList.ts b/apps/draupnir/src/protections/WordList.ts index b28836ed..004b6458 100644 --- a/apps/draupnir/src/protections/WordList.ts +++ b/apps/draupnir/src/protections/WordList.ts @@ -30,14 +30,14 @@ import { UserConsequences, describeProtection, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { StringUserID, StringRoomID, MatrixRoomID, } from "@the-draupnir-project/matrix-basic-types"; -import { resultifyBotSDKRequestError } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { resultifyBotSDKRequestError } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; const log = new Logger("WordList"); diff --git a/apps/draupnir/src/protections/invitation/JoinRoomsOnInviteProtection.tsx b/apps/draupnir/src/protections/invitation/JoinRoomsOnInviteProtection.tsx index 6d6cf50c..f9eb7bdf 100644 --- a/apps/draupnir/src/protections/invitation/JoinRoomsOnInviteProtection.tsx +++ b/apps/draupnir/src/protections/invitation/JoinRoomsOnInviteProtection.tsx @@ -25,7 +25,7 @@ import { allocateProtection, describeProtection, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../../Draupnir"; import { DraupnirProtection } from "../Protection"; import { isInvitationForUser, isSenderJoinedInRevision } from "./inviteCore"; diff --git a/apps/draupnir/src/protections/invitation/ProtectRoomsOnInvite.tsx b/apps/draupnir/src/protections/invitation/ProtectRoomsOnInvite.tsx index 6946668e..fd0057df 100644 --- a/apps/draupnir/src/protections/invitation/ProtectRoomsOnInvite.tsx +++ b/apps/draupnir/src/protections/invitation/ProtectRoomsOnInvite.tsx @@ -18,7 +18,7 @@ import { Value, isError, RoomIDPermalinkSchema, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { renderActionResultToEvent, renderMentionPill, diff --git a/apps/draupnir/src/protections/invitation/WatchRoomsOnInvite.tsx b/apps/draupnir/src/protections/invitation/WatchRoomsOnInvite.tsx index 4aaafbee..ff2a4e28 100644 --- a/apps/draupnir/src/protections/invitation/WatchRoomsOnInvite.tsx +++ b/apps/draupnir/src/protections/invitation/WatchRoomsOnInvite.tsx @@ -21,7 +21,7 @@ import { Task, Value, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../../Draupnir"; import { renderActionResultToEvent, diff --git a/apps/draupnir/src/protections/invitation/inviteCore.ts b/apps/draupnir/src/protections/invitation/inviteCore.ts index c5c7cd2c..eb37a7ac 100644 --- a/apps/draupnir/src/protections/invitation/inviteCore.ts +++ b/apps/draupnir/src/protections/invitation/inviteCore.ts @@ -7,7 +7,7 @@ import { Membership, MembershipEvent, RoomMembershipRevision, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; export function isInvitationForUser( event: MembershipEvent, diff --git a/apps/draupnir/src/queues/EventRedactionQueue.ts b/apps/draupnir/src/queues/EventRedactionQueue.ts index 6b3aef47..9018ce0b 100644 --- a/apps/draupnir/src/queues/EventRedactionQueue.ts +++ b/apps/draupnir/src/queues/EventRedactionQueue.ts @@ -11,13 +11,13 @@ import { LogLevel } from "@vector-im/matrix-bot-sdk"; import { redactUserMessagesIn } from "../utils"; import ManagementRoomOutput from "../managementroom/ManagementRoomOutput"; -import { MatrixSendClient } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { MatrixSendClient } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { ActionExceptionKind, assertThrowableIsError, RoomUpdateError, RoomUpdateException, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { StringRoomID, StringUserID, diff --git a/apps/draupnir/src/queues/ProtectedRoomActivityTracker.ts b/apps/draupnir/src/queues/ProtectedRoomActivityTracker.ts index 4f7aa9f0..b90ccbb4 100644 --- a/apps/draupnir/src/queues/ProtectedRoomActivityTracker.ts +++ b/apps/draupnir/src/queues/ProtectedRoomActivityTracker.ts @@ -9,7 +9,7 @@ // import { StringRoomID } from "@the-draupnir-project/matrix-basic-types"; -import { RoomEvent } from "matrix-protection-suite"; +import { RoomEvent } from "@the-draupnir-project/matrix-protection-suite"; /** * Used to keep track of protected rooms so they are always ordered for activity. diff --git a/apps/draupnir/src/queues/TimelineRedactionQueue.ts b/apps/draupnir/src/queues/TimelineRedactionQueue.ts index a9ad76a1..28047a2d 100644 --- a/apps/draupnir/src/queues/TimelineRedactionQueue.ts +++ b/apps/draupnir/src/queues/TimelineRedactionQueue.ts @@ -14,7 +14,7 @@ import { Logger, RoomEventRedacter, RoomMessages, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; const log = new Logger("TimelineRedactionQueue"); diff --git a/apps/draupnir/src/queues/UnlistedUserRedactionQueue.ts b/apps/draupnir/src/queues/UnlistedUserRedactionQueue.ts index cae52723..7d4501cd 100644 --- a/apps/draupnir/src/queues/UnlistedUserRedactionQueue.ts +++ b/apps/draupnir/src/queues/UnlistedUserRedactionQueue.ts @@ -8,7 +8,7 @@ // https://github.com/matrix-org/mjolnir // import { LogLevel, LogService } from "@vector-im/matrix-bot-sdk"; -import { RoomEvent } from "matrix-protection-suite"; +import { RoomEvent } from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../Draupnir"; import { StringUserID, diff --git a/apps/draupnir/src/report/ReportManager.ts b/apps/draupnir/src/report/ReportManager.ts index ac928f6d..03f336c3 100644 --- a/apps/draupnir/src/report/ReportManager.ts +++ b/apps/draupnir/src/report/ReportManager.ts @@ -11,7 +11,7 @@ import { PowerLevelAction } from "@vector-im/matrix-bot-sdk"; import { LogService, UserID } from "@vector-im/matrix-bot-sdk"; import { htmlToText } from "html-to-text"; -import { extractRawRoomEvent } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { extractRawRoomEvent } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { htmlEscape } from "../utils"; import { JSDOM } from "jsdom"; import { Draupnir } from "../Draupnir"; @@ -24,7 +24,7 @@ import { TextMessageContent, Value, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { StringRoomID, StringUserID, diff --git a/apps/draupnir/src/report/ReportPoller.ts b/apps/draupnir/src/report/ReportPoller.ts index 9a2e46cc..106f66ce 100644 --- a/apps/draupnir/src/report/ReportPoller.ts +++ b/apps/draupnir/src/report/ReportPoller.ts @@ -12,7 +12,7 @@ import { MatrixSendClient, resultifyBotSDKRequestErrorWith404AsUndefined, SynapseAdminClient, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { ReportManager } from "./ReportManager"; import { LogLevel } from "@vector-im/matrix-bot-sdk"; import ManagementRoomOutput from "../managementroom/ManagementRoomOutput"; @@ -25,7 +25,7 @@ import { Task, assertThrowableIsError, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; /** * Synapse will tell us where we last got to on polling reports, so we need diff --git a/apps/draupnir/src/safemode/DraupnirSafeMode.ts b/apps/draupnir/src/safemode/DraupnirSafeMode.ts index 3c2acc4e..ea973cd5 100644 --- a/apps/draupnir/src/safemode/DraupnirSafeMode.ts +++ b/apps/draupnir/src/safemode/DraupnirSafeMode.ts @@ -8,13 +8,13 @@ import { EventReport, RoomEvent, Task, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { StringUserID, StringRoomID, MatrixRoomID, } from "@the-draupnir-project/matrix-basic-types"; -import { MatrixSendClient } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { MatrixSendClient } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { IConfig } from "../config"; import { SafeModeCause } from "./SafeModeCause"; import { diff --git a/apps/draupnir/src/safemode/ManagementRoom.ts b/apps/draupnir/src/safemode/ManagementRoom.ts index 48e0900d..ede87ed5 100644 --- a/apps/draupnir/src/safemode/ManagementRoom.ts +++ b/apps/draupnir/src/safemode/ManagementRoom.ts @@ -21,8 +21,8 @@ import { Task, TextMessageContent, Value, -} from "matrix-protection-suite"; -import { MatrixSendClient } from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite"; +import { MatrixSendClient } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { MatrixEventContext } from "@the-draupnir-project/mps-interface-adaptor"; const log = new Logger("ManagementRoom"); diff --git a/apps/draupnir/src/safemode/PersistentConfigEditor.ts b/apps/draupnir/src/safemode/PersistentConfigEditor.ts index 8f364110..604f4a5d 100644 --- a/apps/draupnir/src/safemode/PersistentConfigEditor.ts +++ b/apps/draupnir/src/safemode/PersistentConfigEditor.ts @@ -15,11 +15,11 @@ import { MjolnirProtectedRoomsDescription, PersistentConfigData, StandardPersistentConfigData, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { BotSDKAccountDataConfigBackend, MatrixSendClient, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { SafeModeCause, SafeModeReason } from "./SafeModeCause"; export type PersistentConfigStatus = { diff --git a/apps/draupnir/src/safemode/PersistentConfigRenderer.tsx b/apps/draupnir/src/safemode/PersistentConfigRenderer.tsx index 9d463f09..a9d04f67 100644 --- a/apps/draupnir/src/safemode/PersistentConfigRenderer.tsx +++ b/apps/draupnir/src/safemode/PersistentConfigRenderer.tsx @@ -17,7 +17,7 @@ import { ConfigPropertyDescription, ConfigPropertyError, ConfigPropertyUseError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { renderMentionPill, renderRoomPill, diff --git a/apps/draupnir/src/safemode/RecoveryOptions.tsx b/apps/draupnir/src/safemode/RecoveryOptions.tsx index 497d318c..e2a42961 100644 --- a/apps/draupnir/src/safemode/RecoveryOptions.tsx +++ b/apps/draupnir/src/safemode/RecoveryOptions.tsx @@ -6,7 +6,7 @@ import { DeadDocumentJSX, DocumentNode, } from "@the-draupnir-project/interface-manager"; -import { ConfigRecoverableError } from "matrix-protection-suite"; +import { ConfigRecoverableError } from "@the-draupnir-project/matrix-protection-suite"; import { SafeModeCause, SafeModeReason } from "./SafeModeCause"; import { MatrixReactionHandler } from "@the-draupnir-project/mps-interface-adaptor"; diff --git a/apps/draupnir/src/safemode/commands/HelpCommand.tsx b/apps/draupnir/src/safemode/commands/HelpCommand.tsx index 5b915406..354120ae 100644 --- a/apps/draupnir/src/safemode/commands/HelpCommand.tsx +++ b/apps/draupnir/src/safemode/commands/HelpCommand.tsx @@ -12,7 +12,7 @@ import { TopPresentationSchema, CommandTable, } from "@the-draupnir-project/interface-manager"; -import { Ok } from "matrix-protection-suite"; +import { Ok } from "@the-draupnir-project/matrix-protection-suite"; import { renderTableHelp } from "@the-draupnir-project/mps-interface-adaptor"; import { safeModeHeader } from "./StatusCommand"; import { DOCUMENTATION_URL } from "../../config"; diff --git a/apps/draupnir/src/safemode/commands/RecoverCommand.tsx b/apps/draupnir/src/safemode/commands/RecoverCommand.tsx index 02706a88..8a06668c 100644 --- a/apps/draupnir/src/safemode/commands/RecoverCommand.tsx +++ b/apps/draupnir/src/safemode/commands/RecoverCommand.tsx @@ -16,7 +16,7 @@ import { ConfigRecoverableError, ConfigRecoveryOption, RoomEvent, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { SafeModeInterfaceAdaptor } from "./SafeModeAdaptor"; import { PersistentConfigStatus, diff --git a/apps/draupnir/src/safemode/commands/StatusCommand.tsx b/apps/draupnir/src/safemode/commands/StatusCommand.tsx index d582169b..5df28039 100644 --- a/apps/draupnir/src/safemode/commands/StatusCommand.tsx +++ b/apps/draupnir/src/safemode/commands/StatusCommand.tsx @@ -8,7 +8,11 @@ import { DocumentNode, describeCommand, } from "@the-draupnir-project/interface-manager"; -import { ActionException, Ok, isError } from "matrix-protection-suite"; +import { + ActionException, + Ok, + isError, +} from "@the-draupnir-project/matrix-protection-suite"; import { SafeModeDraupnir } from "../DraupnirSafeMode"; import { SafeModeCause, SafeModeReason } from "../SafeModeCause"; import { diff --git a/apps/draupnir/src/utils.ts b/apps/draupnir/src/utils.ts index c47cfdea..1ea025a2 100644 --- a/apps/draupnir/src/utils.ts +++ b/apps/draupnir/src/utils.ts @@ -21,8 +21,11 @@ import * as Sentry from "@sentry/node"; import ManagementRoomOutput from "./managementroom/ManagementRoomOutput"; import { IConfig } from "./config"; import { Gauge } from "prom-client"; -import { MatrixSendClient } from "matrix-protection-suite-for-matrix-bot-sdk"; -import { Logger, RoomEvent } from "matrix-protection-suite"; +import { MatrixSendClient } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; +import { + Logger, + RoomEvent, +} from "@the-draupnir-project/matrix-protection-suite"; const log = new Logger("utils"); diff --git a/apps/draupnir/src/webapis/SynapseHTTPAntispam/CheckEventForSpamEndpoint.ts b/apps/draupnir/src/webapis/SynapseHTTPAntispam/CheckEventForSpamEndpoint.ts index 95046731..0cc89c54 100644 --- a/apps/draupnir/src/webapis/SynapseHTTPAntispam/CheckEventForSpamEndpoint.ts +++ b/apps/draupnir/src/webapis/SynapseHTTPAntispam/CheckEventForSpamEndpoint.ts @@ -10,7 +10,7 @@ import { RoomEvent, Task, Value, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { SpamCheckEndpointPluginManager } from "./SpamCheckEndpointPluginManager"; import { Request, Response } from "express"; diff --git a/apps/draupnir/src/webapis/SynapseHTTPAntispam/PingEndpoint.ts b/apps/draupnir/src/webapis/SynapseHTTPAntispam/PingEndpoint.ts index 5d0bafd7..e2e51bbb 100644 --- a/apps/draupnir/src/webapis/SynapseHTTPAntispam/PingEndpoint.ts +++ b/apps/draupnir/src/webapis/SynapseHTTPAntispam/PingEndpoint.ts @@ -9,7 +9,11 @@ import { Type } from "@sinclair/typebox"; import { Request, Response } from "express"; -import { isError, Logger, Value } from "matrix-protection-suite"; +import { + isError, + Logger, + Value, +} from "@the-draupnir-project/matrix-protection-suite"; const log = new Logger("PingEndpoint"); diff --git a/apps/draupnir/src/webapis/SynapseHTTPAntispam/SpamCheckEndpointPluginManager.ts b/apps/draupnir/src/webapis/SynapseHTTPAntispam/SpamCheckEndpointPluginManager.ts index d5fcb2e9..6bff43c3 100644 --- a/apps/draupnir/src/webapis/SynapseHTTPAntispam/SpamCheckEndpointPluginManager.ts +++ b/apps/draupnir/src/webapis/SynapseHTTPAntispam/SpamCheckEndpointPluginManager.ts @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -import { Logger, Task } from "matrix-protection-suite"; +import { Logger, Task } from "@the-draupnir-project/matrix-protection-suite"; type BlockingResponse = | "NOT_SPAM" diff --git a/apps/draupnir/src/webapis/SynapseHTTPAntispam/UserMayInviteEndpoint.ts b/apps/draupnir/src/webapis/SynapseHTTPAntispam/UserMayInviteEndpoint.ts index 6a4de2f3..ffc028e0 100644 --- a/apps/draupnir/src/webapis/SynapseHTTPAntispam/UserMayInviteEndpoint.ts +++ b/apps/draupnir/src/webapis/SynapseHTTPAntispam/UserMayInviteEndpoint.ts @@ -12,7 +12,7 @@ import { StringUserIDSchema, Task, Value, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Type } from "@sinclair/typebox"; // for check_event_for_spam we will leave the event as unparsed diff --git a/apps/draupnir/src/webapis/SynapseHTTPAntispam/UserMayJoinRoomEndpoint.ts b/apps/draupnir/src/webapis/SynapseHTTPAntispam/UserMayJoinRoomEndpoint.ts index f53168e5..41b30462 100644 --- a/apps/draupnir/src/webapis/SynapseHTTPAntispam/UserMayJoinRoomEndpoint.ts +++ b/apps/draupnir/src/webapis/SynapseHTTPAntispam/UserMayJoinRoomEndpoint.ts @@ -11,7 +11,7 @@ import { StringUserIDSchema, Task, Value, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { SpamCheckEndpointPluginManager } from "./SpamCheckEndpointPluginManager"; import { Request, Response } from "express"; diff --git a/apps/draupnir/src/webapis/WebAPIs.ts b/apps/draupnir/src/webapis/WebAPIs.ts index 8304d955..05a27f1f 100644 --- a/apps/draupnir/src/webapis/WebAPIs.ts +++ b/apps/draupnir/src/webapis/WebAPIs.ts @@ -19,8 +19,12 @@ import { isStringRoomID, isStringEventID, } from "@the-draupnir-project/matrix-basic-types"; -import { Logger, RoomEvent, Task } from "matrix-protection-suite"; -import { extractRawRoomEvent } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { + Logger, + RoomEvent, + Task, +} from "@the-draupnir-project/matrix-protection-suite"; +import { extractRawRoomEvent } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { SynapseHttpAntispam } from "./SynapseHTTPAntispam/SynapseHttpAntispam"; import { jsonReviver } from "../utils"; diff --git a/apps/draupnir/test/appservice/integration/listUnstartedDraupnirTest.ts b/apps/draupnir/test/appservice/integration/listUnstartedDraupnirTest.ts index 6ae60193..be61d94f 100644 --- a/apps/draupnir/test/appservice/integration/listUnstartedDraupnirTest.ts +++ b/apps/draupnir/test/appservice/integration/listUnstartedDraupnirTest.ts @@ -5,7 +5,7 @@ import expect from "expect"; import { MjolnirAppService } from "../../../src/appservice/AppService"; import { setupHarness } from "../utils/harness"; -import { isError } from "matrix-protection-suite"; +import { isError } from "@the-draupnir-project/matrix-protection-suite"; import { StringUserID } from "@the-draupnir-project/matrix-basic-types"; interface Context extends Mocha.Context { diff --git a/apps/draupnir/test/appservice/integration/provisionTest.ts b/apps/draupnir/test/appservice/integration/provisionTest.ts index 7307daed..7143758b 100644 --- a/apps/draupnir/test/appservice/integration/provisionTest.ts +++ b/apps/draupnir/test/appservice/integration/provisionTest.ts @@ -14,7 +14,7 @@ import { newTestUser } from "../../integration/clientHelper"; import { getFirstReply } from "../../integration/commands/commandUtils"; import { MatrixClient } from "@vector-im/matrix-bot-sdk"; import { MjolnirAppService } from "../../../src/appservice/AppService"; -import { isOk } from "matrix-protection-suite"; +import { isOk } from "@the-draupnir-project/matrix-protection-suite"; import { StringUserID } from "@the-draupnir-project/matrix-basic-types"; interface Context extends Mocha.Context { diff --git a/apps/draupnir/test/appservice/integration/versionAndBranchDraupnirTest.ts b/apps/draupnir/test/appservice/integration/versionAndBranchDraupnirTest.ts index 05d0ccbe..dc01f913 100644 --- a/apps/draupnir/test/appservice/integration/versionAndBranchDraupnirTest.ts +++ b/apps/draupnir/test/appservice/integration/versionAndBranchDraupnirTest.ts @@ -5,7 +5,7 @@ import expect from "expect"; import { MjolnirAppService } from "../../../src/appservice/AppService"; import { setupHarness } from "../utils/harness"; -import { isError } from "matrix-protection-suite"; +import { isError } from "@the-draupnir-project/matrix-protection-suite"; import { StringUserID } from "@the-draupnir-project/matrix-basic-types"; interface Context extends Mocha.Context { diff --git a/apps/draupnir/test/appservice/utils/harness.ts b/apps/draupnir/test/appservice/utils/harness.ts index 8c84b851..2ab45762 100644 --- a/apps/draupnir/test/appservice/utils/harness.ts +++ b/apps/draupnir/test/appservice/utils/harness.ts @@ -19,7 +19,7 @@ import { } from "../../../src/appservice/config/config"; import { newTestUser } from "../../integration/clientHelper"; import { CreateEvent, MatrixClient } from "@vector-im/matrix-bot-sdk"; -import { POLICY_ROOM_TYPE_VARIANTS } from "matrix-protection-suite"; +import { POLICY_ROOM_TYPE_VARIANTS } from "@the-draupnir-project/matrix-protection-suite"; import { isStringRoomAlias } from "@the-draupnir-project/matrix-basic-types"; export function readTestConfig(): AppserviceConfig { diff --git a/apps/draupnir/test/integration/abuseReportTest.ts b/apps/draupnir/test/integration/abuseReportTest.ts index 187dbb98..e54910e9 100644 --- a/apps/draupnir/test/integration/abuseReportTest.ts +++ b/apps/draupnir/test/integration/abuseReportTest.ts @@ -20,12 +20,12 @@ import { RoomEvent, RoomMessage, Value, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { StringEventID } from "@the-draupnir-project/matrix-basic-types"; import { extractRawRoomEvent, resultifyBotSDKRequestError, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; /** * Test the ability to turn abuse reports into room messages. diff --git a/apps/draupnir/test/integration/banPropagationTest.ts b/apps/draupnir/test/integration/banPropagationTest.ts index b65eceb6..f076c0f1 100644 --- a/apps/draupnir/test/integration/banPropagationTest.ts +++ b/apps/draupnir/test/integration/banPropagationTest.ts @@ -14,7 +14,7 @@ import { RoomMessage, Value, findProtection, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixRoomReference, StringRoomID, diff --git a/apps/draupnir/test/integration/clientHelper.ts b/apps/draupnir/test/integration/clientHelper.ts index 16ab0f3d..a3bb979c 100644 --- a/apps/draupnir/test/integration/clientHelper.ts +++ b/apps/draupnir/test/integration/clientHelper.ts @@ -21,7 +21,7 @@ import { NoticeMessageContent, RoomMessage, Value, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RequestFunction } from "../../src/utils"; const REGISTRATION_ATTEMPTS = 10; diff --git a/apps/draupnir/test/integration/commands/commandUtils.ts b/apps/draupnir/test/integration/commands/commandUtils.ts index 02b56690..c26a701f 100644 --- a/apps/draupnir/test/integration/commands/commandUtils.ts +++ b/apps/draupnir/test/integration/commands/commandUtils.ts @@ -14,7 +14,7 @@ import * as crypto from "crypto"; import { MatrixSendClient, SafeMatrixEmitter, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { NoticeMessageContent, ReactionEvent, @@ -24,7 +24,7 @@ import { StringEventIDSchema, ReactionContent, hasOwn, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Type } from "@sinclair/typebox"; import { Draupnir } from "../../../src/Draupnir"; import { diff --git a/apps/draupnir/test/integration/commands/hijackRoomCommandTest.ts b/apps/draupnir/test/integration/commands/hijackRoomCommandTest.ts index 62a1a8e4..de3b15c2 100644 --- a/apps/draupnir/test/integration/commands/hijackRoomCommandTest.ts +++ b/apps/draupnir/test/integration/commands/hijackRoomCommandTest.ts @@ -12,7 +12,7 @@ import { strict as assert } from "assert"; import { newTestUser } from "../clientHelper"; import { getFirstReaction } from "./commandUtils"; import { DraupnirTestContext, draupnirSafeEmitter } from "../mjolnirSetupUtils"; -import { PowerLevelsEventContent } from "matrix-protection-suite"; +import { PowerLevelsEventContent } from "@the-draupnir-project/matrix-protection-suite"; // Breaks with this test. describe("Test: The make admin command", function () { diff --git a/apps/draupnir/test/integration/commands/recoverCommandDetail.ts b/apps/draupnir/test/integration/commands/recoverCommandDetail.ts index aba2732c..64869804 100644 --- a/apps/draupnir/test/integration/commands/recoverCommandDetail.ts +++ b/apps/draupnir/test/integration/commands/recoverCommandDetail.ts @@ -6,8 +6,10 @@ import { MJOLNIR_PROTECTED_ROOMS_EVENT_TYPE, MJOLNIR_WATCHED_POLICY_ROOMS_EVENT_TYPE, MjolnirEnabledProtectionsEventType, + MjolnirPolicyRoomsEncodedShape, + MjolnirProtectedRoomsEncodedShape, MjolnirProtectedRoomsEvent, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../../../src/Draupnir"; import { MatrixRoomReference, @@ -17,9 +19,7 @@ import { import { isOk } from "@gnuxie/typescript-result"; import { SafeModeDraupnir } from "../../../src/safemode/DraupnirSafeMode"; import { DraupnirRestartError } from "../../../src/safemode/SafeModeToggle"; -import { MatrixSendClient } from "matrix-protection-suite-for-matrix-bot-sdk"; -import { MjolnirPolicyRoomsEncodedShape } from "matrix-protection-suite/dist/Protection/PolicyListConfig/MjolnirPolicyRoomsDescription"; -import { MjolnirProtectedRoomsEncodedShape } from "matrix-protection-suite/dist/Protection/ProtectedRoomsConfig/MjolnirProtectedRoomsDescription"; +import { MatrixSendClient } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; async function clobberProtectedRooms(client: MatrixSendClient): Promise { const existingAccountData = diff --git a/apps/draupnir/test/integration/commands/redactCommandTest.ts b/apps/draupnir/test/integration/commands/redactCommandTest.ts index 9d1f992f..d82399a4 100644 --- a/apps/draupnir/test/integration/commands/redactCommandTest.ts +++ b/apps/draupnir/test/integration/commands/redactCommandTest.ts @@ -19,8 +19,8 @@ import { DraupnirTestContext, } from "../mjolnirSetupUtils"; import { MatrixClient } from "@vector-im/matrix-bot-sdk"; -import { RoomEvent } from "matrix-protection-suite"; -import { extractRawRoomEvent } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { RoomEvent } from "@the-draupnir-project/matrix-protection-suite"; +import { extractRawRoomEvent } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; interface RedactionTestContext extends DraupnirTestContext { moderator?: MatrixClient; diff --git a/apps/draupnir/test/integration/commands/unbanTest.ts b/apps/draupnir/test/integration/commands/unbanTest.ts index 6fd419ba..2a6dc0c0 100644 --- a/apps/draupnir/test/integration/commands/unbanTest.ts +++ b/apps/draupnir/test/integration/commands/unbanTest.ts @@ -18,7 +18,7 @@ import { PolicyRoomEditor, PolicyRuleType, Recommendation, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { Draupnir } from "../../../src/Draupnir"; import { MatrixRoomReference, diff --git a/apps/draupnir/test/integration/fixtures.ts b/apps/draupnir/test/integration/fixtures.ts index 498745eb..d59aed56 100644 --- a/apps/draupnir/test/integration/fixtures.ts +++ b/apps/draupnir/test/integration/fixtures.ts @@ -13,7 +13,7 @@ import { MJOLNIR_PROTECTED_ROOMS_EVENT_TYPE, MJOLNIR_WATCHED_POLICY_ROOMS_EVENT_TYPE, StandardLifetime, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { configRead, getStoragePath } from "../../src/config"; import { patchMatrixClient } from "../../src/utils"; import { diff --git a/apps/draupnir/test/integration/helloTest.ts b/apps/draupnir/test/integration/helloTest.ts index 895f6b00..50d4c8ba 100644 --- a/apps/draupnir/test/integration/helloTest.ts +++ b/apps/draupnir/test/integration/helloTest.ts @@ -11,8 +11,8 @@ import { MatrixClient } from "@vector-im/matrix-bot-sdk"; import { newTestUser, noticeListener } from "./clientHelper"; import { DraupnirTestContext } from "./mjolnirSetupUtils"; -import { SafeMatrixEmitterWrapper } from "matrix-protection-suite-for-matrix-bot-sdk"; -import { DefaultEventDecoder } from "matrix-protection-suite"; +import { SafeMatrixEmitterWrapper } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; +import { DefaultEventDecoder } from "@the-draupnir-project/matrix-protection-suite"; describe("Test: !help command", function (this: Mocha.Suite) { let client: MatrixClient; diff --git a/apps/draupnir/test/integration/httpAntispamTest.ts b/apps/draupnir/test/integration/httpAntispamTest.ts index 7e17d362..a8d9a2b3 100644 --- a/apps/draupnir/test/integration/httpAntispamTest.ts +++ b/apps/draupnir/test/integration/httpAntispamTest.ts @@ -8,7 +8,7 @@ import { ActionException, isOk, MatrixException, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixError } from "@vector-im/matrix-bot-sdk"; describe("Test for http antispam callbacks", function () { diff --git a/apps/draupnir/test/integration/manualLaunchScript.ts b/apps/draupnir/test/integration/manualLaunchScript.ts index 05cc0ee2..358cae36 100644 --- a/apps/draupnir/test/integration/manualLaunchScript.ts +++ b/apps/draupnir/test/integration/manualLaunchScript.ts @@ -14,7 +14,7 @@ import { draupnirClient, makeBotModeToggle } from "./mjolnirSetupUtils"; import { configRead, getStoragePath } from "../../src/config"; -import { DefaultEventDecoder } from "matrix-protection-suite"; +import { DefaultEventDecoder } from "@the-draupnir-project/matrix-protection-suite"; import { makeTopLevelStores } from "../../src/backingstore/DraupnirStores"; void (async () => { diff --git a/apps/draupnir/test/integration/mjolnirSetupUtils.ts b/apps/draupnir/test/integration/mjolnirSetupUtils.ts index d217b5e1..708b3acf 100644 --- a/apps/draupnir/test/integration/mjolnirSetupUtils.ts +++ b/apps/draupnir/test/integration/mjolnirSetupUtils.ts @@ -25,13 +25,13 @@ import { MatrixSendClient, SafeMatrixEmitter, SafeMatrixEmitterWrapper, -} from "matrix-protection-suite-for-matrix-bot-sdk"; +} from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { DefaultEventDecoder, MJOLNIR_PROTECTED_ROOMS_EVENT_TYPE, MJOLNIR_WATCHED_POLICY_ROOMS_EVENT_TYPE, OwnLifetime, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { SafeModeDraupnir } from "../../src/safemode/DraupnirSafeMode"; import { TopLevelStores } from "../../src/backingstore/DraupnirStores"; import { diff --git a/apps/draupnir/test/integration/protections/BlockInvitationsOnServerTest.ts b/apps/draupnir/test/integration/protections/BlockInvitationsOnServerTest.ts index 36681eb8..9600efc6 100644 --- a/apps/draupnir/test/integration/protections/BlockInvitationsOnServerTest.ts +++ b/apps/draupnir/test/integration/protections/BlockInvitationsOnServerTest.ts @@ -12,8 +12,12 @@ import { DraupnirTestContext } from "../mjolnirSetupUtils"; import { newTestUser } from "../clientHelper"; import { BlockInvitationsOnServerProtection } from "../../../src/protections/BlockInvitationsOnServerProtection"; import expect from "expect"; -import { resultifyBotSDKRequestError } from "matrix-protection-suite-for-matrix-bot-sdk"; -import { isOk, MatrixException, Ok } from "matrix-protection-suite"; +import { resultifyBotSDKRequestError } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; +import { + isOk, + MatrixException, + Ok, +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixError } from "@vector-im/matrix-bot-sdk"; async function createWatchedPolicyRoom( diff --git a/apps/draupnir/test/integration/protections/JoinRoomsOnInviteTest.ts b/apps/draupnir/test/integration/protections/JoinRoomsOnInviteTest.ts index e8191bfb..c4b140d3 100644 --- a/apps/draupnir/test/integration/protections/JoinRoomsOnInviteTest.ts +++ b/apps/draupnir/test/integration/protections/JoinRoomsOnInviteTest.ts @@ -9,7 +9,7 @@ import { import { newTestUser } from "../clientHelper"; import { DraupnirTestContext } from "../mjolnirSetupUtils"; import expect from "expect"; -import { MatrixSendClient } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { MatrixSendClient } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { Draupnir } from "../../../src/Draupnir"; async function setupProtectedRooms( diff --git a/apps/draupnir/test/integration/protections/RoomTakedownProtectionTest.ts b/apps/draupnir/test/integration/protections/RoomTakedownProtectionTest.ts index 7780c3f6..7b450ada 100644 --- a/apps/draupnir/test/integration/protections/RoomTakedownProtectionTest.ts +++ b/apps/draupnir/test/integration/protections/RoomTakedownProtectionTest.ts @@ -21,7 +21,7 @@ import { parsePolicyRule, PolicyRuleChangeType, PolicyRuleType, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { SynapseAdminRoomTakedownCapability } from "../../../src/capabilities/SynapseAdminRoomTakedown/SynapseAdminRoomTakedown"; import { StandardDiscoveredRoomStore } from "../../../src/protections/RoomTakedown/DiscoveredRoomStore"; import { diff --git a/apps/draupnir/test/integration/throttleQueueTest.ts b/apps/draupnir/test/integration/throttleQueueTest.ts index 470351b6..3964c288 100644 --- a/apps/draupnir/test/integration/throttleQueueTest.ts +++ b/apps/draupnir/test/integration/throttleQueueTest.ts @@ -8,7 +8,7 @@ // https://github.com/matrix-org/mjolnir // -import { Ok } from "matrix-protection-suite"; +import { Ok } from "@the-draupnir-project/matrix-protection-suite"; import { ThrottlingQueue } from "../../src/queues/ThrottlingQueue"; import { DraupnirTestContext } from "./mjolnirSetupUtils"; diff --git a/apps/draupnir/test/integration/timelinePaginationTest.ts b/apps/draupnir/test/integration/timelinePaginationTest.ts index 009b1e1a..0c9972a8 100644 --- a/apps/draupnir/test/integration/timelinePaginationTest.ts +++ b/apps/draupnir/test/integration/timelinePaginationTest.ts @@ -13,7 +13,7 @@ import { strict as assert } from "assert"; import { newTestUser } from "./clientHelper"; import { DraupnirTestContext } from "./mjolnirSetupUtils"; import { getMessagesByUserIn } from "../../src/utils"; -import { TextMessageContent } from "matrix-protection-suite"; +import { TextMessageContent } from "@the-draupnir-project/matrix-protection-suite"; /** * Ensure that Draupnir paginates only the necessary segment of the room timeline when backfilling. diff --git a/apps/draupnir/test/integration/utilsTest.ts b/apps/draupnir/test/integration/utilsTest.ts index 45f070d4..7fcf4ac1 100644 --- a/apps/draupnir/test/integration/utilsTest.ts +++ b/apps/draupnir/test/integration/utilsTest.ts @@ -15,7 +15,7 @@ import { NoticeMessageContent, RoomEvent, Value, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; describe("Test: utils", function () { it( diff --git a/apps/draupnir/test/unit/commands/BanCommandTest.ts b/apps/draupnir/test/unit/commands/BanCommandTest.ts index dcf7b80e..691957c5 100644 --- a/apps/draupnir/test/unit/commands/BanCommandTest.ts +++ b/apps/draupnir/test/unit/commands/BanCommandTest.ts @@ -25,7 +25,7 @@ import { describeProtectedRoomsSet, isOk, randomEventID, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { createMock } from "ts-auto-mock"; import expect from "expect"; import { DraupnirBanCommand } from "../../../src/commands/Ban"; diff --git a/apps/draupnir/test/unit/commands/KickCommandTest.ts b/apps/draupnir/test/unit/commands/KickCommandTest.ts index 703d09d8..5186c1dd 100644 --- a/apps/draupnir/test/unit/commands/KickCommandTest.ts +++ b/apps/draupnir/test/unit/commands/KickCommandTest.ts @@ -17,7 +17,7 @@ import { RoomResolver, describeProtectedRoomsSet, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { DraupnirKickCommand } from "../../../src/commands/KickCommand"; import { ThrottlingQueue } from "../../../src/queues/ThrottlingQueue"; import ManagementRoomOutput from "../../../src/managementroom/ManagementRoomOutput"; diff --git a/apps/draupnir/test/unit/commands/UnbanCommandTest.ts b/apps/draupnir/test/unit/commands/UnbanCommandTest.ts index fd076c03..39188849 100644 --- a/apps/draupnir/test/unit/commands/UnbanCommandTest.ts +++ b/apps/draupnir/test/unit/commands/UnbanCommandTest.ts @@ -22,7 +22,7 @@ import { RoomUnbanner, describeProtectedRoomsSet, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { createMock } from "ts-auto-mock"; import expect from "expect"; import { DraupnirUnbanCommand } from "../../../src/commands/unban/Unban"; diff --git a/apps/draupnir/test/unit/commands/WatchUnwatchCommandTest.ts b/apps/draupnir/test/unit/commands/WatchUnwatchCommandTest.ts index 33c4dfd0..5d0aef9c 100644 --- a/apps/draupnir/test/unit/commands/WatchUnwatchCommandTest.ts +++ b/apps/draupnir/test/unit/commands/WatchUnwatchCommandTest.ts @@ -15,7 +15,7 @@ import { WatchedPolicyRooms, isError, isOk, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { createMock } from "ts-auto-mock"; import { DraupnirUnwatchPolicyRoomCommand, diff --git a/apps/draupnir/test/unit/protections/MentionLimitProtectionTest.ts b/apps/draupnir/test/unit/protections/MentionLimitProtectionTest.ts index 595d1c86..267dba59 100644 --- a/apps/draupnir/test/unit/protections/MentionLimitProtectionTest.ts +++ b/apps/draupnir/test/unit/protections/MentionLimitProtectionTest.ts @@ -9,7 +9,7 @@ import { randomRoomID, randomUserID, RoomEvent, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { isContainingMentionsOverLimit } from "../../../src/protections/MentionLimitProtection"; import expect from "expect"; diff --git a/apps/draupnir/test/unit/protections/RedactionSynchronisationTest.ts b/apps/draupnir/test/unit/protections/RedactionSynchronisationTest.ts index 65e9d8b8..bfe8851b 100644 --- a/apps/draupnir/test/unit/protections/RedactionSynchronisationTest.ts +++ b/apps/draupnir/test/unit/protections/RedactionSynchronisationTest.ts @@ -10,7 +10,7 @@ import { randomRoomID, randomUserID, Recommendation, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RedactionSynchronisationConsequences, StandardRedactionSynchronisation, diff --git a/apps/draupnir/test/unit/protections/RoomTakedownServiceTest.ts b/apps/draupnir/test/unit/protections/RoomTakedownServiceTest.ts index 08b30fde..9c8eec36 100644 --- a/apps/draupnir/test/unit/protections/RoomTakedownServiceTest.ts +++ b/apps/draupnir/test/unit/protections/RoomTakedownServiceTest.ts @@ -14,7 +14,7 @@ import { randomRoomID, Recommendation, StandardPolicyListRevision, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { RoomAuditLog } from "../../../src/protections/RoomTakedown/RoomAuditLog"; import { RoomTakedownCapability } from "../../../src/capabilities/RoomTakedownCapability"; import { StringRoomID } from "@the-draupnir-project/matrix-basic-types"; diff --git a/apps/draupnir/test/unit/protections/serverBanSynchronisationCapabilityRenameTest.ts b/apps/draupnir/test/unit/protections/serverBanSynchronisationCapabilityRenameTest.ts index c3aaefcf..244ad644 100644 --- a/apps/draupnir/test/unit/protections/serverBanSynchronisationCapabilityRenameTest.ts +++ b/apps/draupnir/test/unit/protections/serverBanSynchronisationCapabilityRenameTest.ts @@ -11,7 +11,7 @@ import { SemanticType, ServerACLSynchronisationCapability, SimulatedServerBanSynchronisationCapability, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; const serverBanCapabilityName = "serverConsequences"; diff --git a/apps/draupnir/test/unit/stores/hashStoreTest.ts b/apps/draupnir/test/unit/stores/hashStoreTest.ts index 5b0a06fa..642a094a 100644 --- a/apps/draupnir/test/unit/stores/hashStoreTest.ts +++ b/apps/draupnir/test/unit/stores/hashStoreTest.ts @@ -14,7 +14,7 @@ import { randomRoomID, randomUserID, Recommendation, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { SHA256, enc } from "crypto-js"; import expect from "expect"; import { diff --git a/apps/draupnir/test/unit/stores/roomAuditLogTest.ts b/apps/draupnir/test/unit/stores/roomAuditLogTest.ts index eead9c80..0924fbd6 100644 --- a/apps/draupnir/test/unit/stores/roomAuditLogTest.ts +++ b/apps/draupnir/test/unit/stores/roomAuditLogTest.ts @@ -12,7 +12,7 @@ import { PolicyRuleType, randomRoomID, Recommendation, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import expect from "expect"; import { StringUserID } from "@the-draupnir-project/matrix-basic-types"; diff --git a/apps/draupnir/test/unit/stores/roomStateBackingStoreTest.ts b/apps/draupnir/test/unit/stores/roomStateBackingStoreTest.ts index ccd2bc9b..e4325763 100644 --- a/apps/draupnir/test/unit/stores/roomStateBackingStoreTest.ts +++ b/apps/draupnir/test/unit/stores/roomStateBackingStoreTest.ts @@ -9,14 +9,14 @@ import { DefaultEventDecoder, describeProtectedRoomsSet, describeRoomMember, + FakeRoomStateRevisionIssuer, Membership, PolicyRuleType, PowerLevelsEventContent, randomRoomID, Recommendation, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { StringUserID } from "@the-draupnir-project/matrix-basic-types"; -import { FakeRoomStateRevisionIssuer } from "matrix-protection-suite/dist/StateTracking/FakeRoomStateRevisionIssuer"; import expect from "expect"; function makeStore(): SqliteRoomStateBackingStore { diff --git a/apps/draupnir/test/unit/stores/userRestrictionAuditLogTest.ts b/apps/draupnir/test/unit/stores/userRestrictionAuditLogTest.ts index 9b85931c..dd9939e9 100644 --- a/apps/draupnir/test/unit/stores/userRestrictionAuditLogTest.ts +++ b/apps/draupnir/test/unit/stores/userRestrictionAuditLogTest.ts @@ -12,9 +12,9 @@ import { randomRoomID, randomUserID, Recommendation, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import expect from "expect"; -import { AccountRestriction } from "matrix-protection-suite-for-matrix-bot-sdk"; +import { AccountRestriction } from "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk"; import { SqliteUserRestrictionAuditLog } from "../../../src/protections/HomeserverUserPolicyApplication/SqliteUserRestrictionAuditLog"; describe("UserAuditLog test", function () { diff --git a/package-lock.json b/package-lock.json index 23e1c7d5..bed722a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,6 +36,8 @@ "@sinclair/typebox": "0.34.49", "@the-draupnir-project/interface-manager": "4.2.6", "@the-draupnir-project/matrix-basic-types": "1.5.1", + "@the-draupnir-project/matrix-protection-suite": "7.1.0", + "@the-draupnir-project/matrix-protection-suite-for-matrix-bot-sdk": "5.0.1", "@the-draupnir-project/mps-interface-adaptor": "0.6.0", "@vector-im/matrix-bot-sdk": "^0.8.0-element.3", "better-sqlite3": "^12.8.0", @@ -46,8 +48,6 @@ "js-yaml": "^4.1.0", "jsdom": "^24.0.0", "matrix-appservice-bridge": "^11.2.0", - "matrix-protection-suite": "npm:@the-draupnir-project/matrix-protection-suite@7.1.0", - "matrix-protection-suite-for-matrix-bot-sdk": "npm:@the-draupnir-project/matrix-protection-suite@5.0.1", "pg": "^8.8.0", "yaml": "^2.3.2" }, @@ -10608,14 +10608,6 @@ "nedb": "^1.8.0" } }, - "node_modules/matrix-protection-suite": { - "resolved": "packages/matrix-protection-suite", - "link": true - }, - "node_modules/matrix-protection-suite-for-matrix-bot-sdk": { - "resolved": "packages/matrix-protection-suite-for-matrix-bot-sdk", - "link": true - }, "node_modules/mdast-util-to-hast": { "version": "13.2.1", "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz", @@ -14659,18 +14651,18 @@ "await-lock": "^2.2.2" }, "devDependencies": { + "@the-draupnir-project/matrix-protection-suite": "7.1.0", "@types/crypto-js": "^4.1.2", "@types/glob-to-regexp": "^0.4.1", "@types/node": "^24.12.4", "@vector-im/matrix-bot-sdk": "0.8.0-element.3", - "matrix-protection-suite": "npm:@the-draupnir-project/matrix-protection-suite@7.1.0", "typedoc": "^0.26.3" }, "peerDependencies": { "@sinclair/typebox": "0.34.49", "@the-draupnir-project/matrix-basic-types": "1.5.1", - "@vector-im/matrix-bot-sdk": "^0.8.0-element.3", - "matrix-protection-suite": "npm:@the-draupnir-project/matrix-protection-suite@7.1.0" + "@the-draupnir-project/matrix-protection-suite": "7.1.0", + "@vector-im/matrix-bot-sdk": "^0.8.0-element.3" } }, "packages/matrix-protection-suite-for-matrix-bot-sdk/node_modules/@types/node": { @@ -14789,14 +14781,14 @@ "version": "0.6.0", "license": "Apache-2.0", "devDependencies": { - "@types/node": "^24.12.4", - "matrix-protection-suite": "npm:@the-draupnir-project/matrix-protection-suite@7.1.0" + "@the-draupnir-project/matrix-protection-suite": "7.1.0", + "@types/node": "^24.12.4" }, "peerDependencies": { "@gnuxie/typescript-result": "^1.0.0", "@sinclair/typebox": "^0.34.49", "@the-draupnir-project/interface-manager": "^4.2.3", - "matrix-protection-suite": "npm:@the-draupnir-project/matrix-protection-suite@7.1.0" + "@the-draupnir-project/matrix-protection-suite": "7.1.0" } }, "packages/mps-interface-adaptor/node_modules/@types/node": { diff --git a/package.json b/package.json index bd87a1b3..0f0c9c6b 100644 --- a/package.json +++ b/package.json @@ -17,10 +17,10 @@ }, "homepage": "https://github.com/the-draupnir-project/Draupnir#readme", "scripts": { - "build": "tsc -b && npm run -ws build:assets --if-present", - "build:all": "tsc -b tsconfig.all.json && npm run -ws build:assets --if-present", + "build": "tsc -b && npm run --workspaces build:assets --if-present", + "build:all": "tsc -b tsconfig.all.json && npm run --workspaces build:assets --if-present", "build:clean": "tsc -b --clean", - "test": "npm run -ws test --if-present && npm run -w apps/draupnir test:unit", + "test": "npm run --workspaces test --if-present && npm run -w apps/draupnir test:unit", "lint": "eslint --cache 'packages/**/*.{ts,tsx}' 'apps/**/*.{ts,tsx}' && prettier --cache --ignore-unknown --check ." }, "devDependencies": { diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/package.json b/packages/matrix-protection-suite-for-matrix-bot-sdk/package.json index 0fb4f6ec..80d89bff 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/package.json +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/package.json @@ -22,11 +22,11 @@ "make:docs": "typedoc" }, "devDependencies": { + "@the-draupnir-project/matrix-protection-suite": "7.1.0", "@types/crypto-js": "^4.1.2", "@types/glob-to-regexp": "^0.4.1", "@types/node": "^24.12.4", "@vector-im/matrix-bot-sdk": "0.8.0-element.3", - "matrix-protection-suite": "npm:@the-draupnir-project/matrix-protection-suite@7.1.0", "typedoc": "^0.26.3" }, "dependencies": { @@ -36,8 +36,8 @@ "peerDependencies": { "@sinclair/typebox": "0.34.49", "@the-draupnir-project/matrix-basic-types": "1.5.1", - "@vector-im/matrix-bot-sdk": "^0.8.0-element.3", - "matrix-protection-suite": "npm:@the-draupnir-project/matrix-protection-suite@7.1.0" + "@the-draupnir-project/matrix-protection-suite": "7.1.0", + "@vector-im/matrix-bot-sdk": "^0.8.0-element.3" }, "publishConfig": { "access": "public" diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKAllClient.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKAllClient.ts index c081c91c..eb2a83e0 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKAllClient.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKAllClient.ts @@ -8,7 +8,7 @@ import { RoomCreator, RoomJoiner, RoomStateEventSender, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixSendClient } from "../MatrixEmitter"; import { BotSDKBaseClient } from "./BotSDKBaseClient"; import { StringRoomID } from "@the-draupnir-project/matrix-basic-types"; diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKBaseClient.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKBaseClient.ts index a2c19f76..bae2ee6c 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKBaseClient.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKBaseClient.ts @@ -40,7 +40,9 @@ import { RoomEventRelationsPaginator, RoomEventRelationsOptions, RoomEventRelationsResponse, -} from "matrix-protection-suite"; + RoomEventGetter, + RoomReactionSender, +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixSendClient } from "../MatrixEmitter"; import { MatrixRoomID, @@ -53,8 +55,6 @@ import { } from "@the-draupnir-project/matrix-basic-types"; import { resolveRoomReferenceSafe } from "../SafeMatrixClient"; import { ResultError } from "@gnuxie/typescript-result"; -import { RoomReactionSender } from "matrix-protection-suite/dist/Client/RoomReactionSender"; -import { RoomEventGetter } from "matrix-protection-suite/dist/Client/RoomEventGetter"; import { BotSDKJunkError, toMatrixJunkError } from "./BotSDKJunkErrors"; const log = new Logger("BotSDKBaseClient"); diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKClientPlatform.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKClientPlatform.ts index fe2c6fc1..8bd47495 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKClientPlatform.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKClientPlatform.ts @@ -8,20 +8,20 @@ import { RoomBanner, RoomCreator, RoomEventRedacter, + RoomEventGetter, RoomEventRelations, RoomInviter, RoomJoiner, RoomKicker, RoomMessages, RoomMessageSender, + RoomReactionSender, RoomResolver, RoomStateEventSender, RoomStateGetter, RoomUnbanner, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { BotSDKBaseClient } from "./BotSDKBaseClient"; -import { RoomReactionSender } from "matrix-protection-suite/dist/Client/RoomReactionSender"; -import { RoomEventGetter } from "matrix-protection-suite/dist/Client/RoomEventGetter"; export class BotSDKClientPlatform implements ClientPlatform { constructor(private readonly allClient: BotSDKBaseClient) { diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKJunkErrors.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKJunkErrors.ts index 1f9448d0..5778d8df 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKJunkErrors.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Client/BotSDKJunkErrors.ts @@ -4,7 +4,10 @@ import { Type } from "@sinclair/typebox"; import { MatrixError } from "@vector-im/matrix-bot-sdk"; -import { Value, assertThrowableIsError } from "matrix-protection-suite"; +import { + Value, + assertThrowableIsError, +} from "@the-draupnir-project/matrix-protection-suite"; const MatrixErrorBody = Type.Object({ errcode: Type.String(), diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/ClientCapabilityFactory.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/ClientCapabilityFactory.ts index d8585644..63fd8357 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/ClientCapabilityFactory.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/ClientCapabilityFactory.ts @@ -6,7 +6,7 @@ import { ClientPlatform, ClientsInRoomMap, EventDecoder, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixSendClient } from "../MatrixEmitter"; import { BotSDKClientPlatform } from "../Client/BotSDKClientPlatform"; import { BotSDKAllClient } from "../Client/BotSDKAllClient"; diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/ClientManagement.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/ClientManagement.ts index ce8179f3..1c970e94 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/ClientManagement.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/ClientManagement.ts @@ -10,7 +10,7 @@ import { ClientsInRoomMap, Ok, assertThrowableIsError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixSendClient } from "../MatrixEmitter"; import { StringRoomID, diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/JoinedRoomsSafe.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/JoinedRoomsSafe.ts index 2d62e154..d9ec0505 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/JoinedRoomsSafe.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/JoinedRoomsSafe.ts @@ -8,7 +8,7 @@ import { JoinedRoomsSafe, Ok, assertThrowableIsError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixSendClient } from "../MatrixEmitter"; import { StringRoomID } from "@the-draupnir-project/matrix-basic-types"; diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/RoomStateManagerFactory.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/RoomStateManagerFactory.ts index 12d64652..528783bf 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/RoomStateManagerFactory.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/RoomStateManagerFactory.ts @@ -16,6 +16,7 @@ import { PolicyRoomRevisionIssuer, PolicyRuleType, ResultError, + Redaction, RoomCreateEvent, RoomEvent, RoomMembershipManager, @@ -35,11 +36,10 @@ import { StateEvent, isError, isOk, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { ClientForUserID } from "./ClientManagement"; import { BotSDKRoomMembershipManager } from "../StateTracking/RoomMembershipManager"; import { BotSDKPolicyRoomManager } from "../PolicyList/PolicyListManager"; -import { Redaction } from "matrix-protection-suite/dist/MatrixTypes/Redaction"; import { BotSDKClientPlatform } from "../Client/BotSDKClientPlatform"; import { BotSDKBaseClient } from "../Client/BotSDKBaseClient"; import { diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/RoomStateRefresh.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/RoomStateRefresh.ts index 7dac6f11..fb60a2ad 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/RoomStateRefresh.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/ClientManagement/RoomStateRefresh.ts @@ -6,7 +6,7 @@ import AwaitLock from "await-lock"; import { Logger, StandardRoomStateRevisionIssuer, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; const log = new Logger("RoomStateRefresh"); diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Interface/MatrixData.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Interface/MatrixData.ts index 7d48a750..205968b5 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Interface/MatrixData.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Interface/MatrixData.ts @@ -14,7 +14,7 @@ import { Value, assertThrowableIsError, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixSendClient } from "../MatrixEmitter"; import { is404, diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Logging/BotSDKLogging.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Logging/BotSDKLogging.ts index 0941b78c..a305f4b5 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Logging/BotSDKLogging.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Logging/BotSDKLogging.ts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 import { LogService } from "@vector-im/matrix-bot-sdk"; -import { ILoggerProvider } from "matrix-protection-suite"; +import { ILoggerProvider } from "@the-draupnir-project/matrix-protection-suite"; /** * A logger provider that uses the `LogService` from the bot-sdk to provide logging capability. diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/MatrixEmitter.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/MatrixEmitter.ts index cb880f4b..034f8ecc 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/MatrixEmitter.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/MatrixEmitter.ts @@ -21,7 +21,7 @@ import { Logger, RoomEvent, RoomMessage, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; const log = new Logger("MatrixEmitter"); diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/PolicyList/PolicyListManager.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/PolicyList/PolicyListManager.ts index 61f12320..6d20a148 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/PolicyList/PolicyListManager.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/PolicyList/PolicyListManager.ts @@ -32,7 +32,7 @@ import { ClientPlatform, RoomVersionMirror, RoomEvent, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixSendClient } from "../MatrixEmitter"; import { RoomStateManagerFactory } from "../ClientManagement/RoomStateManagerFactory"; import { diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Protection/MjolnirProtectedRoomsStore.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Protection/MjolnirProtectedRoomsStore.ts index fede0c71..1ba18a93 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Protection/MjolnirProtectedRoomsStore.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Protection/MjolnirProtectedRoomsStore.ts @@ -13,7 +13,7 @@ import { isError, Ok, assertThrowableIsError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixSendClient } from "../MatrixEmitter"; export class BotSDKMjolnirProtectedRoomsStore implements PersistentMatrixData< diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Protection/MjolnirWatchedPolicyRoomsStore.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Protection/MjolnirWatchedPolicyRoomsStore.ts index 0d6f3639..cf6af4ef 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Protection/MjolnirWatchedPolicyRoomsStore.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/Protection/MjolnirWatchedPolicyRoomsStore.ts @@ -13,7 +13,7 @@ import { MjolnirWatchedPolicyRoomsEvent, MJOLNIR_WATCHED_POLICY_ROOMS_EVENT_TYPE, assertThrowableIsError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixSendClient } from "../MatrixEmitter"; export class BotSDKMjolnirWatchedPolicyRoomsStore implements PersistentMatrixData< diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SafeMatrixClient.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SafeMatrixClient.ts index 94f9b14a..5b279a3f 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SafeMatrixClient.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SafeMatrixClient.ts @@ -7,7 +7,7 @@ import { Ok, StringRoomIDSchema, Value, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixSendClient } from "./MatrixEmitter"; import { MatrixRoomReference, diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/StateTracking/RoomMembershipManager.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/StateTracking/RoomMembershipManager.ts index 7bc7c0f7..7dc8c60f 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/StateTracking/RoomMembershipManager.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/StateTracking/RoomMembershipManager.ts @@ -14,8 +14,8 @@ import { Value, assertThrowableIsError, isError, -} from "matrix-protection-suite"; -import { MembershipEvent } from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; +import { MembershipEvent } from "@the-draupnir-project/matrix-protection-suite"; import { MatrixSendClient } from "../MatrixEmitter"; import { RoomStateManagerFactory } from "../ClientManagement/RoomStateManagerFactory"; import { diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/BlockStatusEndpoint.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/BlockStatusEndpoint.ts index 84efd639..e34cddcd 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/BlockStatusEndpoint.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/BlockStatusEndpoint.ts @@ -3,7 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 import { Type } from "@sinclair/typebox"; -import { EDStatic, StringUserIDSchema } from "matrix-protection-suite"; +import { + EDStatic, + StringUserIDSchema, +} from "@the-draupnir-project/matrix-protection-suite"; export type BlockStatusResponse = EDStatic; export const BlockStatusResponse = Type.Object({ diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/RoomDetailsEndpoint.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/RoomDetailsEndpoint.ts index d115cd81..7c2194b7 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/RoomDetailsEndpoint.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/RoomDetailsEndpoint.ts @@ -11,7 +11,7 @@ import { EDStatic, StringRoomAliasSchema, StringRoomIDSchema, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; // There is a bug in Synapse at the moment where the creator can be blank. // https://github.com/element-hq/synapse/issues/18563 diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/RoomListEndpoint.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/RoomListEndpoint.ts index ab5cc1e3..e279f051 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/RoomListEndpoint.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/RoomListEndpoint.ts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 import { Type } from "@sinclair/typebox"; -import { EDStatic } from "matrix-protection-suite"; +import { EDStatic } from "@the-draupnir-project/matrix-protection-suite"; import { RoomDetailsResponse } from "./RoomDetailsEndpoint"; export interface RoomListQueryParams { diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/ShutdownV2Endpoint.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/ShutdownV2Endpoint.ts index 2a2d84ab..091f667a 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/ShutdownV2Endpoint.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/ShutdownV2Endpoint.ts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 import { Type } from "@sinclair/typebox"; -import { EDStatic } from "matrix-protection-suite"; +import { EDStatic } from "@the-draupnir-project/matrix-protection-suite"; export type SynapseRoomShutdownV2RequestBody = EDStatic< typeof SynapseRoomShutdownV2RequestBody diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/SynapseAdminClient.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/SynapseAdminClient.ts index 7babb782..2f019b19 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/SynapseAdminClient.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/SynapseAdminClient.ts @@ -21,7 +21,7 @@ import { Value, assertThrowableIsError, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixSendClient } from "../MatrixEmitter"; import { StringRoomID, diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/UserDetailsEndpoint.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/UserDetailsEndpoint.ts index 0c703409..057173de 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/UserDetailsEndpoint.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/UserDetailsEndpoint.ts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 import { Type } from "@sinclair/typebox"; -import { EDStatic } from "matrix-protection-suite"; +import { EDStatic } from "@the-draupnir-project/matrix-protection-suite"; export type UserDetailsResponse = EDStatic; export const UserDetailsResponse = Type.Object({ diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/UserRedactionEndpoint.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/UserRedactionEndpoint.ts index 85b9ad01..b9a42c73 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/UserRedactionEndpoint.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/SynapseAdmin/UserRedactionEndpoint.ts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 import { Type } from "@sinclair/typebox"; -import { EDStatic } from "matrix-protection-suite"; +import { EDStatic } from "@the-draupnir-project/matrix-protection-suite"; export type UserRedactionResponse = EDStatic; export const UserRedactionResponse = Type.Object({ diff --git a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/index.ts b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/index.ts index 9df17d50..6d086c7e 100644 --- a/packages/matrix-protection-suite-for-matrix-bot-sdk/src/index.ts +++ b/packages/matrix-protection-suite-for-matrix-bot-sdk/src/index.ts @@ -26,5 +26,7 @@ export * from "./Protection/MjolnirWatchedPolicyRoomsStore"; export * from "./StateTracking/RoomMembershipManager"; export * from "./SynapseAdmin/SynapseAdminClient"; +export * from "./SynapseAdmin/RoomListEndpoint"; +export * from "./SynapseAdmin/UserDetailsEndpoint"; export * from "./SafeMatrixClient"; diff --git a/packages/matrix-protection-suite/src/index.ts b/packages/matrix-protection-suite/src/index.ts index c7f83352..4584df3c 100644 --- a/packages/matrix-protection-suite/src/index.ts +++ b/packages/matrix-protection-suite/src/index.ts @@ -17,6 +17,7 @@ export * from "./Client/PowerLevelsMirror"; export * from "./Client/RoomBanner"; export * from "./Client/RoomCreator"; export * from "./Client/RoomEventFilter"; +export * from "./Client/RoomEventGetter"; export * from "./Client/RoomEventRedacter"; export * from "./Client/RoomEventRelations"; export * from "./Client/RoomInviter"; @@ -24,6 +25,7 @@ export * from "./Client/RoomJoiner"; export * from "./Client/RoomKicker"; export * from "./Client/RoomMessages"; export * from "./Client/RoomMessageSender"; +export * from "./Client/RoomReactionSender"; export * from "./Client/RoomResolver"; export * from "./Client/RoomStateGetter"; @@ -214,6 +216,7 @@ export * from "./SafeMatrixEvents/UnsafeEvent"; export * from "./StateTracking/DeclareRoomState"; export * from "./StateTracking/EventBatch"; +export * from "./StateTracking/FakeRoomStateRevisionIssuer"; export * from "./StateTracking/RoomStateBackingStore"; export * from "./StateTracking/SetRoomState"; export * from "./StateTracking/StandardRoomStateRevision"; diff --git a/packages/mps-interface-adaptor/package.json b/packages/mps-interface-adaptor/package.json index ca501d16..816c9973 100644 --- a/packages/mps-interface-adaptor/package.json +++ b/packages/mps-interface-adaptor/package.json @@ -22,14 +22,14 @@ }, "private": false, "devDependencies": { - "@types/node": "^24.12.4", - "matrix-protection-suite": "npm:@the-draupnir-project/matrix-protection-suite@7.1.0" + "@the-draupnir-project/matrix-protection-suite": "7.1.0", + "@types/node": "^24.12.4" }, "peerDependencies": { "@gnuxie/typescript-result": "^1.0.0", "@sinclair/typebox": "^0.34.49", "@the-draupnir-project/interface-manager": "^4.2.3", - "matrix-protection-suite": "npm:@the-draupnir-project/matrix-protection-suite@7.1.0" + "@the-draupnir-project/matrix-protection-suite": "7.1.0" }, "publishConfig": { "access": "public" diff --git a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/CommonRenderers.tsx b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/CommonRenderers.tsx index a5aadbd2..3f58436b 100644 --- a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/CommonRenderers.tsx +++ b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/CommonRenderers.tsx @@ -20,7 +20,7 @@ import { ResultForUsersInRoom, RoomSetResult, isOk, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { StringRoomID, MatrixRoomReference, diff --git a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MPSMatrixInterfaceAdaptor.ts b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MPSMatrixInterfaceAdaptor.ts index d5060606..36ea614e 100644 --- a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MPSMatrixInterfaceAdaptor.ts +++ b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MPSMatrixInterfaceAdaptor.ts @@ -22,7 +22,7 @@ import { RoomEvent, RoomMessageSender, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixReactionHandler } from "./MatrixReactionHandler"; import { BasicInvocationInformation, diff --git a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixHelpRenderer.tsx b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixHelpRenderer.tsx index a8347fce..971e18c4 100644 --- a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixHelpRenderer.tsx +++ b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixHelpRenderer.tsx @@ -15,10 +15,11 @@ import { Ok, RoomEvent, RoomMessageSender, + RoomReactionSender, Task, isError, isOk, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixRoomReference } from "@the-draupnir-project/matrix-basic-types"; import { ArgumentParseError, @@ -27,6 +28,7 @@ import { DeadDocumentJSX, DocumentNode, ParameterDescription, + printPresentationSchema, RestDescription, TextPresentationRenderer, CommandTable, @@ -41,8 +43,6 @@ import { sendMatrixEventsFromDeadDocument, } from "./MPSMatrixInterfaceAdaptor"; import { Result } from "@gnuxie/typescript-result"; -import { printPresentationSchema } from "@the-draupnir-project/interface-manager/dist/Command/PresentationSchema"; -import { RoomReactionSender } from "matrix-protection-suite/dist/Client/RoomReactionSender"; import { replyNoticeText } from "./replyNotice"; import { renderDetailsNotice, diff --git a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixPromptForAccept.tsx b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixPromptForAccept.tsx index 0735dc4f..8aa68ea7 100644 --- a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixPromptForAccept.tsx +++ b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixPromptForAccept.tsx @@ -7,7 +7,12 @@ // https://github.com/the-draupnir-project/Draupnir // -import { Logger, Task, Value, isError } from "matrix-protection-suite"; +import { + Logger, + Task, + Value, + isError, +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixReactionHandler, ReactionListener, diff --git a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixPromptForConfirmation.tsx b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixPromptForConfirmation.tsx index 92e01ce7..9947d914 100644 --- a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixPromptForConfirmation.tsx +++ b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixPromptForConfirmation.tsx @@ -19,7 +19,12 @@ import { MatrixInterfaceCommandDispatcher, TextPresentationRenderer, } from "@the-draupnir-project/interface-manager"; -import { Logger, RoomEvent, Task, Value } from "matrix-protection-suite"; +import { + Logger, + RoomEvent, + Task, + Value, +} from "@the-draupnir-project/matrix-protection-suite"; import { MatrixReactionHandler, ReactionListener, diff --git a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixReactionHandler.ts b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixReactionHandler.ts index dee61794..a27c1c33 100644 --- a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixReactionHandler.ts +++ b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/MatrixReactionHandler.ts @@ -18,7 +18,7 @@ import { Task, Value, isError, -} from "matrix-protection-suite"; +} from "@the-draupnir-project/matrix-protection-suite"; import { StringRoomID, StringUserID, diff --git a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/replyNotice.ts b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/replyNotice.ts index 84c1cb81..53fa52c1 100644 --- a/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/replyNotice.ts +++ b/packages/mps-interface-adaptor/src/MPSInterfaceAdaptor/replyNotice.ts @@ -7,7 +7,7 @@ // https://github.com/the-draupnir-project/Draupnir // -import { RoomMessageSender } from "matrix-protection-suite"; +import { RoomMessageSender } from "@the-draupnir-project/matrix-protection-suite"; import { Result } from "@gnuxie/typescript-result"; import { StringEventID,