OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Send stable m.policy.rule.* events instead of mjolnir-prefixed unstable ones (#8300)

pull/21833/head
Michael Telatynski 2022-04-13 09:10:55 +01:00 committed by GitHub
parent a4d3da78d7
commit 9edb34a1e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mjolnir/BanList.ts
View File

@ -29,15 +29,15 @@ export const ROOM_RULE_TYPES = [RULE_ROOM, "m.room.rule.room", "org.matrix.mjoln
export const SERVER_RULE_TYPES = [RULE_SERVER, "m.room.rule.server", "org.matrix.mjolnir.rule.server"]; 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 const ALL_RULE_TYPES = [...USER_RULE_TYPES, ...ROOM_RULE_TYPES, ...SERVER_RULE_TYPES];
export function ruleTypeToStable(rule: string, unstable = true): string { export function ruleTypeToStable(rule: string): string {
if (USER_RULE_TYPES.includes(rule)) { if (USER_RULE_TYPES.includes(rule)) {
return unstable ? USER_RULE_TYPES[USER_RULE_TYPES.length - 1] : RULE_USER; return RULE_USER;
} }
if (ROOM_RULE_TYPES.includes(rule)) { if (ROOM_RULE_TYPES.includes(rule)) {
return unstable ? ROOM_RULE_TYPES[ROOM_RULE_TYPES.length - 1] : RULE_ROOM; return RULE_ROOM;
} }
if (SERVER_RULE_TYPES.includes(rule)) { if (SERVER_RULE_TYPES.includes(rule)) {
return unstable ? SERVER_RULE_TYPES[SERVER_RULE_TYPES.length - 1] : RULE_SERVER; return RULE_SERVER;
} }
return null; return null;
} }
@ -68,19 +68,19 @@ export class BanList {
} }
async banEntity(kind: string, entity: string, reason: string): Promise<any> { async banEntity(kind: string, entity: string, reason: string): Promise<any> {
await MatrixClientPeg.get().sendStateEvent(this._roomId, ruleTypeToStable(kind, true), { await MatrixClientPeg.get().sendStateEvent(this._roomId, ruleTypeToStable(kind), {
entity: entity, entity: entity,
reason: reason, reason: reason,
recommendation: recommendationToStable(RECOMMENDATION_BAN, true), recommendation: recommendationToStable(RECOMMENDATION_BAN, true),
}, "rule:" + entity); }, "rule:" + entity);
this._rules.push(new ListRule(entity, RECOMMENDATION_BAN, reason, ruleTypeToStable(kind, false))); this._rules.push(new ListRule(entity, RECOMMENDATION_BAN, reason, ruleTypeToStable(kind)));
} }
async unbanEntity(kind: string, entity: string): Promise<any> { async unbanEntity(kind: string, entity: string): Promise<any> {
// Empty state event is effectively deleting it. // Empty state event is effectively deleting it.
await MatrixClientPeg.get().sendStateEvent(this._roomId, ruleTypeToStable(kind, true), {}, "rule:" + entity); await MatrixClientPeg.get().sendStateEvent(this._roomId, ruleTypeToStable(kind), {}, "rule:" + entity);
this._rules = this._rules.filter(r => { this._rules = this._rules.filter(r => {
if (r.kind !== ruleTypeToStable(kind, false)) return true; if (r.kind !== ruleTypeToStable(kind)) return true;
if (r.entity !== entity) return true; if (r.entity !== entity) return true;
return false; // we just deleted this rule return false; // we just deleted this rule
}); });
@ -97,7 +97,7 @@ export class BanList {
for (const ev of events) { for (const ev of events) {
if (!ev.getStateKey()) continue; if (!ev.getStateKey()) continue;
const kind = ruleTypeToStable(eventType, false); const kind = ruleTypeToStable(eventType);
const entity = ev.getContent()['entity']; const entity = ev.getContent()['entity'];
const recommendation = ev.getContent()['recommendation']; const recommendation = ev.getContent()['recommendation'];