Skip to content

Commit

Permalink
Add more eslint rules
Browse files Browse the repository at this point in the history
  • Loading branch information
Vendicated committed Oct 8, 2022
1 parent 0109381 commit dea3450
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 21 deletions.
14 changes: 13 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,18 @@
"semi-style": ["error", "last"],
"space-in-parens": ["error", "never"],
"block-spacing": ["error", "always"],
"object-curly-spacing": ["error", "always"]
"object-curly-spacing": ["error", "always"],
"eqeqeq": ["error", "always", { "null": "ignore" }],
"spaced-comment": ["error", "always"],
"yoda": "error",
"prefer-destructuring": ["error", { "object": true, "array": false }],
"operator-assignment": ["error", "always"],
"no-useless-computed-key": "error",
"no-unneeded-ternary": ["error", { "defaultAssignment": false }],
"no-invalid-regexp": "error",
"no-constant-condition": ["error", { "checkLoops": false }],
"no-duplicate-imports": "error",
"no-extra-semi": "error",
"consistent-return": ["error", { "treatUndefinedAsUnspecified": true }]
}
}
2 changes: 1 addition & 1 deletion browser/VencordNativeStub.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import IpcEvents from "../src/utils/IpcEvents";

// Discord deletes this so need to store in variable
var localStorage = window.localStorage;
var { localStorage } = window;

const handlers = {
[IpcEvents.GET_REPO]: () => "", // TODO
Expand Down
2 changes: 1 addition & 1 deletion scripts/patcher/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ async function install(installations) {
// Attempt to give flatpak perms
if (selected.isFlatpak) {
try {
const branch = selected.branch;
const { branch } = selected;
const cwd = process.cwd();
const globalCmd = `flatpak override ${branch} --filesystem=${cwd}`;
const userCmd = `flatpak override --user ${branch} --filesystem=${cwd}`;
Expand Down
2 changes: 2 additions & 0 deletions src/api/Commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ export function unregisterCommand(name: string) {

BUILT_IN.splice(idx, 1);
delete commands[name];

return true;
}

export interface CommandContext {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Updater.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function withDispatcher(dispatcher: React.Dispatch<React.SetStateAction<boolean>
dispatcher(false);
}
};
};
}

interface CommonProps {
repo: string;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/betterGifAltText.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default definePlugin({
],

altify(props: any) {
if (props.alt !== "GIF") return;
if (props.alt !== "GIF") return props.alt;

let url: string = props.original || props.src;
try {
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/nitroBypass.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default definePlugin({
}

this.preSend = addPreSendListener((_, messageObj) => {
const guildId = this.guildId;
const { guildId } = this;
for (const emoji of messageObj.validNonShortcutEmojis) {
if (!emoji.require_colons) continue;
if (emoji.guildId === guildId && !emoji.animated) continue;
Expand All @@ -69,7 +69,7 @@ export default definePlugin({
});

this.preEdit = addPreEditListener((_, __, messageObj) => {
const guildId = this.guildId;
const { guildId } = this;

for (const [emojiStr, _, emojiId] of messageObj.content.matchAll(/(?<!\\)<a?:(\w+):(\d+)>/ig)) {
const emoji = getCustomEmojiById(emojiId);
Expand Down
14 changes: 7 additions & 7 deletions src/plugins/quickreply.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ export default definePlugin({

start() {
Dispatcher.subscribe("DELETE_PENDING_REPLY", onDeletePendingReply);
document.addEventListener("keydown", keydown);
document.addEventListener("keydown", onKeydown);
},

stop() {
Dispatcher.unsubscribe("DELETE_PENDING_REPLY", onDeletePendingReply);
document.removeEventListener("keydown", keydown);
document.removeEventListener("keydown", onKeydown);
},
});

let idx = -1;
const onDeletePendingReply = () => {
function onDeletePendingReply() {
idx = -1;
};
}

const keydown = e => {
function onKeydown(e: KeyboardEvent) {
if (
(!e.ctrlKey && !e.metaKey) ||
(e.key !== "ArrowUp" && e.key !== "ArrowDown")
Expand All @@ -46,7 +46,7 @@ const keydown = e => {

if (idx > messages.length) idx = messages.length;
if (idx < 0) {
return Dispatcher.dispatch({
return void Dispatcher.dispatch({
type: "DELETE_PENDING_REPLY",
channelId,
});
Expand All @@ -58,4 +58,4 @@ const keydown = e => {
message: messages[idx],
showMentionToggle: channel.guild_id !== null,
});
};
}
3 changes: 1 addition & 2 deletions src/preload.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import electron, { contextBridge, webFrame } from "electron";
import electron, { contextBridge, webFrame, ipcRenderer } from "electron";
import { readFileSync } from "fs";
import { join } from "path";
import VencordNative from "./VencordNative";
import { ipcRenderer } from "electron";
import IpcEvents from "./utils/IpcEvents";

if (electron.desktopCapturer === void 0) {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/IpcEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function strEnum<T extends Record<string, string>>(obj: T): T {
for (const key in obj) {
o[key] = obj[key] as any;
o[obj[key]] = key as any;
};
}
return Object.freeze(o);
}

Expand Down
2 changes: 1 addition & 1 deletion src/utils/misc.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export function useAwaiter<T>(factory: () => Promise<T>, fallbackValue: T | null
}, []);

return [state.value, state.error, state.pending];
};
}

/**
* A lazy component. The factory method is called on first render. For example useful
Expand Down
2 changes: 1 addition & 1 deletion src/utils/modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function openModal(Component: React.ComponentType, modalProps: Record<str
), { modalKey: key });

return key;
};
}

/**
* Close a modal by key. The id you need for this is returned by openModal.
Expand Down
3 changes: 1 addition & 2 deletions src/webpack/patchWebpack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function patchPush() {
if (mod === originalMod) throw err;

logger.error("Error in patched chunk", err);
return originalMod(module, exports, require);
return void originalMod(module, exports, require);
}

// There are (at the time of writing) 11 modules exporting the window
Expand Down Expand Up @@ -145,4 +145,3 @@ function patchPush() {
configurable: true
});
}

0 comments on commit dea3450

Please sign in to comment.