diff options
author | ArjixWasTaken <53124886+ArjixWasTaken@users.noreply.github.com> | 2022-08-31 21:53:36 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-31 20:53:36 +0200 |
commit | c3ff092162ef1a98bea78213e473be3207998d72 (patch) | |
tree | 96b5f04944064c7021cdd60e1b44e3bade2aacc2 /src | |
parent | a7ccbcfca4f181790b86199a7f31d1ae19e0253f (diff) | |
download | Vencord-c3ff092162ef1a98bea78213e473be3207998d72.tar.gz Vencord-c3ff092162ef1a98bea78213e473be3207998d72.tar.bz2 Vencord-c3ff092162ef1a98bea78213e473be3207998d72.zip |
Add nitro bypass (#4)
Diffstat (limited to 'src')
-rw-r--r-- | src/api/MessageClicks.ts | 17 | ||||
-rw-r--r-- | src/api/MessageEvents.ts | 73 | ||||
-rw-r--r-- | src/api/index.ts | 2 | ||||
-rw-r--r-- | src/patcher.ts | 8 | ||||
-rw-r--r-- | src/plugins/apiMessageClicks.ts | 16 | ||||
-rw-r--r-- | src/plugins/apiMessageEvents.ts | 28 | ||||
-rw-r--r-- | src/plugins/messageActions.ts | 4 | ||||
-rw-r--r-- | src/plugins/nitroBypass.ts | 58 |
8 files changed, 167 insertions, 39 deletions
diff --git a/src/api/MessageClicks.ts b/src/api/MessageClicks.ts deleted file mode 100644 index 476896d..0000000 --- a/src/api/MessageClicks.ts +++ /dev/null @@ -1,17 +0,0 @@ -type Listener = (message, channel, event) => void; - -const listeners = new Set<Listener>(); - -export function _handleClick(message, channel, event) { - for (const listener of listeners) { - listener(message, channel, event); - } -} - -export function addListener(listener: Listener) { - listeners.add(listener); -} - -export function removeListener(listener: Listener) { - return listeners.delete(listener); -}
\ No newline at end of file diff --git a/src/api/MessageEvents.ts b/src/api/MessageEvents.ts new file mode 100644 index 0000000..9ee54a6 --- /dev/null +++ b/src/api/MessageEvents.ts @@ -0,0 +1,73 @@ +import type { Message, Channel } from 'discord-types/general'; +import Logger from '../utils/logger'; + +const MessageEventsLogger = new Logger("MessageEvents", "#e5c890"); + +interface Emoji { + require_colons: boolean, + originalName: string, + animated: boolean + guildId: string, + name: string, + url: string, + id: string, +} + +interface MessageObject { + content: string, + validNonShortcutEmojis: Emoji[] +} + +type SendListener = (channelId: string, messageObj: MessageObject, extra: any) => void; +type EditListener = (channelId: string, messageId: string, messageObj: MessageObject) => void; + +const sendListeners = new Set<SendListener>(); +const editListeners = new Set<EditListener>(); + +export function _handlePreSend(channelId: string, messageObj: MessageObject, extra: any) { + for (const listener of sendListeners) { + try { + listener(channelId, messageObj, extra); + } catch (e) { MessageEventsLogger.error(`MessageSendHandler: Listener encoutered an unknown error. (${e})`) } + } +} + +export function _handlePreEdit(channeld: string, messageId: string, messageObj: MessageObject) { + for (const listener of editListeners) { + try { + listener(channeld, messageId, messageObj); + } catch (e) { MessageEventsLogger.error(`MessageEditHandler: Listener encoutered an unknown error. (${e})`) } + } +} + +/** + * Note: This event fires off before a message is sent, allowing you to edit the message. + */ +export function addPreSendListener(listener: SendListener) { sendListeners.add(listener) } +/** + * Note: This event fires off before a message's edit is applied, allowing you to further edit the message. + */ +export function addPreEditListener(listener: EditListener) { editListeners.add(listener) } +export function removePreSendListener(listener: SendListener) { sendListeners.delete(listener) } +export function removePreEditListener(listener: EditListener) { editListeners.delete(listener) } + +// Message clicks +type ClickListener = (message: Message, channel: Channel, event: MouseEvent) => void; + +const listeners = new Set<ClickListener>(); + +export function _handleClick(message, channel, event) { + for (const listener of listeners) { + try { + listener(message, channel, event); + } catch (e) { MessageEventsLogger.error(`MessageClickHandler: Listener encoutered an unknown error. (${e})`) } + } +} + +export function addClickListener(listener: ClickListener) { + listeners.add(listener); +} + +export function removeClickListener(listener: ClickListener) { + return listeners.delete(listener); +}
\ No newline at end of file diff --git a/src/api/index.ts b/src/api/index.ts index 6688927..6172418 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1 +1 @@ -export * as MessageClicks from "./MessageClicks";
\ No newline at end of file +export * as MessageEvents from "./MessageEvents";
\ No newline at end of file diff --git a/src/patcher.ts b/src/patcher.ts index e991377..72562f2 100644 --- a/src/patcher.ts +++ b/src/patcher.ts @@ -3,8 +3,10 @@ import electron, { app, BrowserWindowConstructorOptions } from "electron"; import installExt, { REACT_DEVELOPER_TOOLS } from "electron-devtools-installer"; import { join } from "path"; import { initIpc } from './ipcMain'; +import Logger from "./utils/logger"; -console.log("[Vencord] Starting up..."); +const logger = new Logger("Patcher", "#700b90") +logger.log("[Vencord] Starting up..."); class BrowserWindow extends electron.BrowserWindow { constructor(options: BrowserWindowConstructorOptions) { @@ -48,8 +50,8 @@ process.env.DATA_DIR = join(app.getPath("userData"), "..", "Vencord"); electron.app.whenReady().then(() => { installExt(REACT_DEVELOPER_TOOLS) - .then(() => console.log("Installed React DevTools")) - .catch((err) => console.error("Failed to install React DevTools", err)); + .then(() => logger.log("Installed React DevTools")) + .catch((err) => logger.error("Failed to install React DevTools", err)); // Remove CSP electron.session.defaultSession.webRequest.onHeadersReceived(({ responseHeaders, url }, cb) => { diff --git a/src/plugins/apiMessageClicks.ts b/src/plugins/apiMessageClicks.ts deleted file mode 100644 index 7155b94..0000000 --- a/src/plugins/apiMessageClicks.ts +++ /dev/null @@ -1,16 +0,0 @@ -import definePlugin from "../utils/types"; - -export default definePlugin({ - name: "MessageClicksApi", - description: "Api required by anything using message click actions", - author: "Vendicated", - patches: [{ - find: "if(e.altKey){", - replacement: { - match: /\.useClickMessage=function\((.{1,2}),(.{1,2})\).+?function\((.{1,2})\){/, - replace: (m, message, channel, event) => - // the message param is shadowed by the event param, so need to alias them - `${m.replace("{", `{var _msg=${message};var _chan=${channel};`)}Vencord.Api.MessageClicks._handleClick(_msg, _chan, ${event});` - } - }] -}); diff --git a/src/plugins/apiMessageEvents.ts b/src/plugins/apiMessageEvents.ts new file mode 100644 index 0000000..79acd32 --- /dev/null +++ b/src/plugins/apiMessageEvents.ts @@ -0,0 +1,28 @@ +import definePlugin from "../utils/types"; + +export default definePlugin({ + name: "MessageEventsAPI", + description: "Api required by anything using message events.", + author: "ArjixWasTaken", + patches: [ + { + find: "sendMessage:function", + replacement: [{ + match: /(?<=sendMessage:function\(.{1,2},.{1,2},.{1,2},.{1,2}\)){/, + replace: "{Vencord.Api.MessageEvents._handlePreSend(...arguments);" + }, { + match: /(?<=editMessage:function\(.{1,2},.{1,2},.{1,2}\)){/, + replace: "{Vencord.Api.MessageEvents._handlePreEdit(...arguments);" + }] + }, + { + find: "if(e.altKey){", + replacement: { + match: /\.useClickMessage=function\((.{1,2}),(.{1,2})\).+?function\((.{1,2})\){/, + replace: (m, message, channel, event) => + // the message param is shadowed by the event param, so need to alias them + `${m.replace("{", `{var _msg=${message};var _chan=${channel};`)}Vencord.Api.MessageEvents._handleClick(_msg, _chan, ${event});` + } + } + ] +}); diff --git a/src/plugins/messageActions.ts b/src/plugins/messageActions.ts index 5519cf7..88e625e 100644 --- a/src/plugins/messageActions.ts +++ b/src/plugins/messageActions.ts @@ -1,4 +1,4 @@ -import { MessageClicks } from "../api"; +import { addClickListener } from "../api/MessageEvents"; import definePlugin from "../utils/types"; import { find, findByProps } from "../webpack"; @@ -21,7 +21,7 @@ export default definePlugin({ if (e.key === "Backspace") isDeletePressed = false; }); - MessageClicks.addListener((msg, chan, event) => { + addClickListener((msg, chan, event) => { const isMe = msg.author.id === getCurrentUser().id; if (!isDeletePressed) { if (isMe && event.detail >= 2) { diff --git a/src/plugins/nitroBypass.ts b/src/plugins/nitroBypass.ts new file mode 100644 index 0000000..25c1aa6 --- /dev/null +++ b/src/plugins/nitroBypass.ts @@ -0,0 +1,58 @@ +import { addPreSendListener, addPreEditListener } from "../api/MessageEvents"; +import { findByProps } from "../utils/webpack"; +import definePlugin from "../utils/types" + +export default definePlugin({ + name: "Nitro Bypass", + author: "ArjixWasTaken", + description: "Allows you to stream in nitro quality and send fake emojis.", + patches: [ + { + find: `canUseAnimatedEmojis:function`, + replacement: [ + "canUseAnimatedEmojis", + "canUseEmojisEverywhere", + "canUseHigherFramerate" + ].map(func => { + return { + match: new RegExp(`${func}:function\\(.+?}`), + replace: `${func}:function (e) { return true; }` + } + }) + }, + ], + start() { + const { getCustomEmojiById } = findByProps("getCustomEmojiById"); + + // Remove any nitro requirements for any of the streaming settings. + findByProps("ApplicationStreamPresets") + .ApplicationStreamSettingRequirements + .forEach(x => { + delete x.userPremiumType; + delete x.guildPremiumTier + }); + + addPreSendListener((_, messageObj) => { + const guildId = window.location.href.split("channels/")[1].split("/")[0]; + for (const emoji of messageObj.validNonShortcutEmojis) { + if (!emoji.require_colons) continue; + if (emoji.guildId === guildId && !emoji.animated) continue; + + const emojiString = `<${emoji.animated ? 'a' : ''}:${emoji.originalName || emoji.name}:${emoji.id}>`; + const url = emoji.url.replace(/\?size=[0-9]+/, `?size=48`); + messageObj.content = messageObj.content.replace(emojiString, ` ${url} `); + } + }) + addPreEditListener((_, __, messageObj) => { + const guildId = window.location.href.split("channels/")[1].split("/")[0]; + + for (const [emojiStr, _, emojiId] of messageObj.content.matchAll(/(?<!\\)<a?:(\w+):(\d+)>/ig)) { + const emoji = getCustomEmojiById(emojiId); + if (emoji == null || (emoji.guildId === guildId && !emoji.animated)) continue; + + const url = emoji.url.replace(/\?size=[0-9]+/, `?size=48`); + messageObj.content = messageObj.content.replace(emojiStr, ` ${url} `); + } + }) + }, +}) |