Remove the aliases for the matrix-protection-suite packages. (#1162)

* Remove old matrix-protection-suite package aliases.

This was leading to issues with monorepo package management.
https://github.com/the-draupnir-project/Draupnir/issues/1124

* Fix badly imported symbols from packages that already export them.

* Cleanup build command arguments.

There was a deprecation warning for short workspaces flag.

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"

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";

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";

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,

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,

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,

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,

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 {

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;

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,

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.",

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.",

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 {

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,

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,

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");

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";

apps/draupnir/src/backingstore/better-sqlite3/BetterSqliteStore.ts

@@ -9,7 +9,7 @@
 // </text>
 
 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 {

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";

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,

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)[];

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,

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",

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<Result<RoomBasicDetails>>;

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 {

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 {

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 {

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 {

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.

apps/draupnir/src/commands/AliasCommands.ts

@@ -8,7 +8,11 @@
 // https://github.com/matrix-org/mjolnir
 // </text>
 
-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",

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,

apps/draupnir/src/commands/CreateBanListCommand.ts

@@ -8,7 +8,10 @@
 // https://github.com/matrix-org/mjolnir
 // </text>
 
-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 {

apps/draupnir/src/commands/Help.tsx

@@ -8,16 +8,16 @@
 // https://github.com/matrix-org/mjolnir
 // </text>
 
-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";

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,

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,

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";
 

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,

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";
 

apps/draupnir/src/commands/RedactCommand.ts

@@ -8,9 +8,13 @@
 // https://github.com/matrix-org/mjolnir
 // </text>
 
-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,

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,

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,

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:

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:

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,

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,

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,

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";

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,

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({

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,

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 {

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,

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";

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";

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());

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 {

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";

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";

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 () {

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";

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;

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,

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";
 

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,

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");

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";

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";

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");
 

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";

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";
 

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,

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";

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";

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");
 

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");

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<Result<boolean>>;

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<Result<boolean>>;

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,

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";

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");

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,

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";

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,

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,

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,

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,

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,

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";

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<

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 {

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,

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");

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";

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,

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");
 

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";

apps/draupnir/src/protections/Protection.ts

@@ -8,7 +8,7 @@
 // https://github.com/matrix-org/mjolnir
 // </text>
 
-import { Protection } from "matrix-protection-suite";
+import { Protection } from "@the-draupnir-project/matrix-protection-suite";
 
 export interface DraupnirProtection<
   TProtectionDescription,

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,

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";

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<RoomBasicDetails, "avatar"> & {
   policy_id: StringEventID;