From 12e967a97c07ddaff1a72431f3088351ea9cf48c Mon Sep 17 00:00:00 2001
From: Gnuxie <50846879+Gnuxie@users.noreply.github.com>
Date: Mon, 17 Jan 2022 16:48:09 +0000
Subject: [PATCH] Add stable prefix for MSC2313 policy rules. (#7511)

https://github.com/matrix-org/mjolnir/issues/177
---
 src/mjolnir/BanList.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/mjolnir/BanList.ts b/src/mjolnir/BanList.ts
index 8b466c8a06..5a84970b25 100644
--- a/src/mjolnir/BanList.ts
+++ b/src/mjolnir/BanList.ts
@@ -19,13 +19,14 @@ limitations under the License.
 import { ListRule, RECOMMENDATION_BAN, recommendationToStable } from "./ListRule";
 import { MatrixClientPeg } from "../MatrixClientPeg";
 
-export const RULE_USER = "m.room.rule.user";
-export const RULE_ROOM = "m.room.rule.room";
-export const RULE_SERVER = "m.room.rule.server";
+export const RULE_USER = "m.policy.rule.user";
+export const RULE_ROOM = "m.policy.rule.room";
+export const RULE_SERVER = "m.policy.rule.server";
 
-export const USER_RULE_TYPES = [RULE_USER, "org.matrix.mjolnir.rule.user"];
-export const ROOM_RULE_TYPES = [RULE_ROOM, "org.matrix.mjolnir.rule.room"];
-export const SERVER_RULE_TYPES = [RULE_SERVER, "org.matrix.mjolnir.rule.server"];
+// m.room.* events are legacy from when MSC2313 changed to m.policy.* last minute.
+export const USER_RULE_TYPES = [RULE_USER, "m.room.rule.user", "org.matrix.mjolnir.rule.user"];
+export const ROOM_RULE_TYPES = [RULE_ROOM, "m.room.rule.room", "org.matrix.mjolnir.rule.room"];
+export const SERVER_RULE_TYPES = [RULE_SERVER, "m.room.rule.server", "org.matrix.mjolnir.rule.server"];
 export const ALL_RULE_TYPES = [...USER_RULE_TYPES, ...ROOM_RULE_TYPES, ...SERVER_RULE_TYPES];
 
 export function ruleTypeToStable(rule: string, unstable = true): string {