diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index 6e324ad3fb..d3ab2b8722 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -42,7 +42,7 @@ export default class UserSettingsDialog extends React.Component {
this.state = {
mjolnirEnabled: SettingsStore.isFeatureEnabled("feature_mjolnir"),
- }
+ };
}
componentDidMount(): void {
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index 2e353794d7..0d22658884 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -88,7 +88,8 @@ module.exports = createReactClass({
}
if (SettingsStore.isFeatureEnabled("feature_mjolnir")) {
- const allowRender = localStorage.getItem(`mx_mjolnir_render_${this.props.mxEvent.getRoomId()}__${this.props.mxEvent.getId()}`) === "true";
+ const key = `mx_mjolnir_render_${this.props.mxEvent.getRoomId()}__${this.props.mxEvent.getId()}`;
+ const allowRender = localStorage.getItem(key) === "true";
if (!allowRender) {
const userDomain = this.props.mxEvent.getSender().split(':').slice(1).join(':');
diff --git a/src/components/views/messages/MjolnirBody.js b/src/components/views/messages/MjolnirBody.js
index 994642863b..d03c6c658d 100644
--- a/src/components/views/messages/MjolnirBody.js
+++ b/src/components/views/messages/MjolnirBody.js
@@ -32,7 +32,8 @@ export default class MjolnirBody extends React.Component {
e.preventDefault();
e.stopPropagation();
- localStorage.setItem(`mx_mjolnir_render_${this.props.mxEvent.getRoomId()}__${this.props.mxEvent.getId()}`, "true");
+ const key = `mx_mjolnir_render_${this.props.mxEvent.getRoomId()}__${this.props.mxEvent.getId()}`;
+ localStorage.setItem(key, "true");
this.props.onTileUpdate();
};
diff --git a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
index a02ca2c570..608be0b129 100644
--- a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
@@ -194,7 +194,9 @@ export default class MjolnirUserSettingsTab extends React.Component {
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
const personalList = Mjolnir.sharedInstance().getPersonalList();
- const lists = Mjolnir.sharedInstance().lists.filter(b => personalList ? personalList.roomId !== b.roomId : true);
+ const lists = Mjolnir.sharedInstance().lists.filter(b => {
+ return personalList? personalList.roomId !== b.roomId : true;
+ });
if (!lists || lists.length <= 0) return {_t("You are not subscribed to any lists")};
const tiles = [];
@@ -239,19 +241,19 @@ export default class MjolnirUserSettingsTab extends React.Component {
{_t("Ignored users")}
- {_t("⚠ These settings are meant for advanced users.")}
-
+ {_t("⚠ These settings are meant for advanced users.")}
+
{_t(
"Add users and servers you want to ignore here. Use asterisks " +
"to have Riot match any characters. For example, @bot:*
" +
"would ignore all users that have the name 'bot' on any server.",
{}, {code: (s) => {s}
},
- )}
-
+ )}
+
{_t(
"Ignoring people is done through ban lists which contain rules for " +
"who to ban. Subscribing to a ban list means the users/servers blocked by " +
- "that list will be hidden from you."
+ "that list will be hidden from you.",
)}
diff --git a/src/mjolnir/BanList.js b/src/mjolnir/BanList.js
index 026005420a..60a924a52b 100644
--- a/src/mjolnir/BanList.js
+++ b/src/mjolnir/BanList.js
@@ -29,9 +29,15 @@ export const SERVER_RULE_TYPES = [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 {
- if (USER_RULE_TYPES.includes(rule)) return unstable ? USER_RULE_TYPES[USER_RULE_TYPES.length - 1] : RULE_USER;
- if (ROOM_RULE_TYPES.includes(rule)) return unstable ? ROOM_RULE_TYPES[ROOM_RULE_TYPES.length - 1] : RULE_ROOM;
- if (SERVER_RULE_TYPES.includes(rule)) return unstable ? SERVER_RULE_TYPES[SERVER_RULE_TYPES.length - 1] : RULE_SERVER;
+ if (USER_RULE_TYPES.includes(rule)) {
+ return unstable ? USER_RULE_TYPES[USER_RULE_TYPES.length - 1] : RULE_USER;
+ }
+ if (ROOM_RULE_TYPES.includes(rule)) {
+ return unstable ? ROOM_RULE_TYPES[ROOM_RULE_TYPES.length - 1] : RULE_ROOM;
+ }
+ if (SERVER_RULE_TYPES.includes(rule)) {
+ return unstable ? SERVER_RULE_TYPES[SERVER_RULE_TYPES.length - 1] : RULE_SERVER;
+ }
return null;
}
diff --git a/src/mjolnir/ListRule.js b/src/mjolnir/ListRule.js
index d33248d24c..1d472e06d6 100644
--- a/src/mjolnir/ListRule.js
+++ b/src/mjolnir/ListRule.js
@@ -22,7 +22,9 @@ export const RECOMMENDATION_BAN = "m.ban";
export const RECOMMENDATION_BAN_TYPES = [RECOMMENDATION_BAN, "org.matrix.mjolnir.ban"];
export function recommendationToStable(recommendation: string, unstable = true): string {
- if (RECOMMENDATION_BAN_TYPES.includes(recommendation)) return unstable ? RECOMMENDATION_BAN_TYPES[RECOMMENDATION_BAN_TYPES.length - 1] : RECOMMENDATION_BAN;
+ if (RECOMMENDATION_BAN_TYPES.includes(recommendation)) {
+ return unstable ? RECOMMENDATION_BAN_TYPES[RECOMMENDATION_BAN_TYPES.length - 1] : RECOMMENDATION_BAN;
+ }
return null;
}
diff --git a/src/mjolnir/Mjolnir.js b/src/mjolnir/Mjolnir.js
index 5edfe3750e..9177c621d1 100644
--- a/src/mjolnir/Mjolnir.js
+++ b/src/mjolnir/Mjolnir.js
@@ -78,11 +78,13 @@ export class Mjolnir {
const resp = await MatrixClientPeg.get().createRoom({
name: _t("My Ban List"),
topic: _t("This is your list of users/servers you have blocked - don't leave the room!"),
- preset: "private_chat"
+ preset: "private_chat",
});
personalRoomId = resp['room_id'];
- await SettingsStore.setValue("mjolnirPersonalRoom", null, SettingLevel.ACCOUNT, personalRoomId);
- await SettingsStore.setValue("mjolnirRooms", null, SettingLevel.ACCOUNT, [personalRoomId, ...this._roomIds]);
+ await SettingsStore.setValue(
+ "mjolnirPersonalRoom", null, SettingLevel.ACCOUNT, personalRoomId);
+ await SettingsStore.setValue(
+ "mjolnirRooms", null, SettingLevel.ACCOUNT, [personalRoomId, ...this._roomIds]);
}
if (!personalRoomId) {
throw new Error("Error finding a room ID to use");
diff --git a/src/utils/MatrixGlob.js b/src/utils/MatrixGlob.js
index b18e20ecf4..e07aaab541 100644
--- a/src/utils/MatrixGlob.js
+++ b/src/utils/MatrixGlob.js
@@ -50,5 +50,4 @@ export class MatrixGlob {
test(val: string): boolean {
return this._regex.test(val);
}
-
}