From 89ee808f6afe5a45a870cf2a56782b4a074e3602 Mon Sep 17 00:00:00 2001
From: gnuxie <Gnuxie@protonmail.com>
Date: Fri, 16 Feb 2024 14:56:40 +0000
Subject: [PATCH] Change leftover references to matrix-bot-sdk `UserID`.

These should now reference the MPS equivalent.
---
 src/commands/Ban.tsx                                   | 3 +--
 src/commands/Rules.tsx                                 | 3 +--
 src/commands/interface-manager/MatrixPresentations.tsx | 3 +--
 src/protections/BanPropagation.tsx                     | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/commands/Ban.tsx b/src/commands/Ban.tsx
index c0f4c1a2..efa70a8b 100644
--- a/src/commands/Ban.tsx
+++ b/src/commands/Ban.tsx
@@ -25,7 +25,6 @@ limitations under the License.
  * are NOT distributed, contributed, committed, or licensed under the Apache License.
  */
 
-import { UserID } from "matrix-bot-sdk";
 import { DraupnirContext } from "./CommandHandler";
 import { defineInterfaceCommand,findTableCommand } from "./interface-manager/InterfaceCommand";
 import { findPresentationType, ParameterDescription, parameters, ParsedKeywords, RestDescription, union } from "./interface-manager/ParameterParsing";
@@ -34,7 +33,7 @@ import { defineMatrixInterfaceAdaptor } from "./interface-manager/MatrixInterfac
 import { tickCrossRenderer } from "./interface-manager/MatrixHelpRenderer";
 import { PromptOptions } from "./interface-manager/PromptForAccept";
 import { Draupnir } from "../Draupnir";
-import { ActionResult, MatrixRoomReference, PolicyRoomEditor, PolicyRuleType, isError } from "matrix-protection-suite";
+import { ActionResult, MatrixRoomReference, PolicyRoomEditor, PolicyRuleType, isError, UserID } from "matrix-protection-suite";
 import { resolveRoomReferenceSafe } from "matrix-protection-suite-for-matrix-bot-sdk";
 
 
diff --git a/src/commands/Rules.tsx b/src/commands/Rules.tsx
index dc0ee527..eb150c76 100644
--- a/src/commands/Rules.tsx
+++ b/src/commands/Rules.tsx
@@ -33,8 +33,7 @@ import { JSXFactory } from "./interface-manager/JSXFactory";
 import { tickCrossRenderer } from "./interface-manager/MatrixHelpRenderer";
 import { defineMatrixInterfaceAdaptor, MatrixContext, MatrixInterfaceAdaptor } from "./interface-manager/MatrixInterfaceAdaptor";
 import { findPresentationType, parameters, union } from "./interface-manager/ParameterParsing";
-import { UserID } from "matrix-bot-sdk";
-import { ActionResult, MatrixRoomID, MatrixRoomReference, Ok, PolicyRoomWatchProfile, PolicyRule, StringRoomID, isError } from "matrix-protection-suite";
+import { ActionResult, MatrixRoomID, MatrixRoomReference, Ok, PolicyRoomWatchProfile, PolicyRule, StringRoomID, isError, UserID } from "matrix-protection-suite";
 import { listInfo } from "./StatusCommand";
 
 async function renderListMatches(
diff --git a/src/commands/interface-manager/MatrixPresentations.tsx b/src/commands/interface-manager/MatrixPresentations.tsx
index 7b0f5b0d..8729caf1 100644
--- a/src/commands/interface-manager/MatrixPresentations.tsx
+++ b/src/commands/interface-manager/MatrixPresentations.tsx
@@ -5,11 +5,10 @@
 
 import { ReadItem } from "./CommandReader";
 import { findPresentationType, makePresentationType, simpleTypeValidator } from "./ParameterParsing";
-import { UserID } from "matrix-bot-sdk";
 import { definePresentationRenderer } from "./DeadDocumentPresentation";
 import { JSXFactory } from "./JSXFactory";
 import { DocumentNode } from "./DeadDocument";
-import { MatrixEventViaAlias, MatrixEventViaRoomID, MatrixRoomAlias, MatrixRoomID } from "matrix-protection-suite";
+import { MatrixEventViaAlias, MatrixEventViaRoomID, MatrixRoomAlias, MatrixRoomID, UserID } from "matrix-protection-suite";
 
 
 makePresentationType({
diff --git a/src/protections/BanPropagation.tsx b/src/protections/BanPropagation.tsx
index e4e16b94..d09fdacf 100644
--- a/src/protections/BanPropagation.tsx
+++ b/src/protections/BanPropagation.tsx
@@ -31,10 +31,9 @@ limitations under the License.
 import { JSXFactory } from "../commands/interface-manager/JSXFactory";
 import { renderMatrixAndSend } from "../commands/interface-manager/DeadDocumentMatrix";
 import { renderMentionPill } from "../commands/interface-manager/MatrixHelpRenderer";
-import { UserID } from "matrix-bot-sdk";
 import { ListMatches, renderListRules } from "../commands/Rules";
 import { printActionResult } from "../models/RoomUpdateError";
-import { AbstractProtection, ActionResult, BasicConsequenceProvider, Logger, MatrixRoomID, MatrixRoomReference, MembershipChange, MembershipChangeType, Ok, PermissionError, PolicyRule, PolicyRuleType, ProtectedRoomsSet, ProtectionDescription, Recommendation, RoomActionError, RoomMembershipRevision, RoomUpdateError, StringRoomID, StringUserID, Task, describeProtection, isError, serverName } from "matrix-protection-suite";
+import { AbstractProtection, ActionResult, BasicConsequenceProvider, Logger, MatrixRoomID, MatrixRoomReference, MembershipChange, MembershipChangeType, Ok, PermissionError, PolicyRule, PolicyRuleType, ProtectedRoomsSet, ProtectionDescription, Recommendation, RoomActionError, RoomMembershipRevision, RoomUpdateError, StringRoomID, StringUserID, Task, describeProtection, isError, serverName, UserID } from "matrix-protection-suite";
 import { Draupnir } from "../Draupnir";
 import { resolveRoomReferenceSafe } from "matrix-protection-suite-for-matrix-bot-sdk";
 import { DraupnirProtection } from "./Protection";