mirror of
https://github.com/Vendicated/Vencord
synced 2024-09-13 04:29:24 -04:00
Merge branch 'dev' into ClientThemeStyleListener
This commit is contained in:
commit
e40949859b
27 changed files with 188 additions and 330 deletions
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "vencord",
|
"name": "vencord",
|
||||||
"private": "true",
|
"private": "true",
|
||||||
"version": "1.9.3",
|
"version": "1.9.4",
|
||||||
"description": "The cutest Discord client mod",
|
"description": "The cutest Discord client mod",
|
||||||
"homepage": "https://github.com/Vendicated/Vencord#readme",
|
"homepage": "https://github.com/Vendicated/Vencord#readme",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { useSettings } from "@api/Settings";
|
import { Settings, useSettings } from "@api/Settings";
|
||||||
import { classNameFactory } from "@api/Styles";
|
import { classNameFactory } from "@api/Styles";
|
||||||
import { Flex } from "@components/Flex";
|
import { Flex } from "@components/Flex";
|
||||||
import { DeleteIcon, FolderIcon, PaintbrushIcon, PencilIcon, PlusIcon, RestartIcon } from "@components/Icons";
|
import { DeleteIcon, FolderIcon, PaintbrushIcon, PencilIcon, PlusIcon, RestartIcon } from "@components/Icons";
|
||||||
|
@ -32,6 +32,8 @@ import { findByPropsLazy, findLazy } from "@webpack";
|
||||||
import { Card, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
|
import { Card, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
|
||||||
import type { ComponentType, Ref, SyntheticEvent } from "react";
|
import type { ComponentType, Ref, SyntheticEvent } from "react";
|
||||||
|
|
||||||
|
import Plugins from "~plugins";
|
||||||
|
|
||||||
import { AddonCard } from "./AddonCard";
|
import { AddonCard } from "./AddonCard";
|
||||||
import { QuickAction, QuickActionCard } from "./quickActions";
|
import { QuickAction, QuickActionCard } from "./quickActions";
|
||||||
import { SettingsTab, wrapTab } from "./shared";
|
import { SettingsTab, wrapTab } from "./shared";
|
||||||
|
@ -250,10 +252,10 @@ function ThemesTab() {
|
||||||
Icon={PaintbrushIcon}
|
Icon={PaintbrushIcon}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{Vencord.Settings.plugins.ClientTheme.enabled && (
|
{Settings.plugins.ClientTheme.enabled && (
|
||||||
<QuickAction
|
<QuickAction
|
||||||
text="Edit ClientTheme"
|
text="Edit ClientTheme"
|
||||||
action={() => openPluginModal(Vencord.Plugins.plugins.ClientTheme)}
|
action={() => openPluginModal(Plugins.ClientTheme)}
|
||||||
Icon={PencilIcon}
|
Icon={PencilIcon}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -16,28 +16,34 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import { definePluginSettings } from "@api/Settings";
|
||||||
import { Devs } from "@utils/constants";
|
import { Devs } from "@utils/constants";
|
||||||
import definePlugin, { OptionType } from "@utils/types";
|
import definePlugin, { OptionType } from "@utils/types";
|
||||||
|
|
||||||
|
const settings = definePluginSettings({
|
||||||
|
source: {
|
||||||
|
description: "Source to replace ban GIF with (Video or Gif)",
|
||||||
|
type: OptionType.STRING,
|
||||||
|
default: "https://i.imgur.com/wp5q52C.mp4",
|
||||||
|
restartNeeded: true,
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
export default definePlugin({
|
export default definePlugin({
|
||||||
name: "BANger",
|
name: "BANger",
|
||||||
description: "Replaces the GIF in the ban dialogue with a custom one.",
|
description: "Replaces the GIF in the ban dialogue with a custom one.",
|
||||||
authors: [Devs.Xinto, Devs.Glitch],
|
authors: [Devs.Xinto, Devs.Glitch],
|
||||||
|
settings,
|
||||||
patches: [
|
patches: [
|
||||||
{
|
{
|
||||||
find: "BAN_CONFIRM_TITLE.",
|
find: "BAN_CONFIRM_TITLE.",
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /src:\i\("?\d+"?\)/g,
|
match: /src:\i\("?\d+"?\)/g,
|
||||||
replace: "src: Vencord.Settings.plugins.BANger.source"
|
replace: "src:$self.source"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
options: {
|
get source() {
|
||||||
source: {
|
return settings.store.source;
|
||||||
description: "Source to replace ban GIF with (Video or Gif)",
|
|
||||||
type: OptionType.STRING,
|
|
||||||
default: "https://i.imgur.com/wp5q52C.mp4",
|
|
||||||
restartNeeded: true,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { Settings } from "@api/Settings";
|
import { definePluginSettings, Settings } from "@api/Settings";
|
||||||
import ErrorBoundary from "@components/ErrorBoundary";
|
import ErrorBoundary from "@components/ErrorBoundary";
|
||||||
import { Devs } from "@utils/constants";
|
import { Devs } from "@utils/constants";
|
||||||
import { canonicalizeMatch } from "@utils/patches";
|
import { canonicalizeMatch } from "@utils/patches";
|
||||||
|
@ -25,10 +25,26 @@ import { findByPropsLazy } from "@webpack";
|
||||||
|
|
||||||
const UserPopoutSectionCssClasses = findByPropsLazy("section", "lastSection");
|
const UserPopoutSectionCssClasses = findByPropsLazy("section", "lastSection");
|
||||||
|
|
||||||
|
const settings = definePluginSettings({
|
||||||
|
hide: {
|
||||||
|
type: OptionType.BOOLEAN,
|
||||||
|
description: "Hide notes",
|
||||||
|
default: false,
|
||||||
|
restartNeeded: true
|
||||||
|
},
|
||||||
|
noSpellCheck: {
|
||||||
|
type: OptionType.BOOLEAN,
|
||||||
|
description: "Disable spellcheck in notes",
|
||||||
|
disabled: () => Settings.plugins.BetterNotesBox.hide,
|
||||||
|
default: false
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
export default definePlugin({
|
export default definePlugin({
|
||||||
name: "BetterNotesBox",
|
name: "BetterNotesBox",
|
||||||
description: "Hide notes or disable spellcheck (Configure in settings!!)",
|
description: "Hide notes or disable spellcheck (Configure in settings!!)",
|
||||||
authors: [Devs.Ven],
|
authors: [Devs.Ven],
|
||||||
|
settings,
|
||||||
|
|
||||||
patches: [
|
patches: [
|
||||||
{
|
{
|
||||||
|
@ -36,7 +52,7 @@ export default definePlugin({
|
||||||
all: true,
|
all: true,
|
||||||
// Some modules match the find but the replacement is returned untouched
|
// Some modules match the find but the replacement is returned untouched
|
||||||
noWarn: true,
|
noWarn: true,
|
||||||
predicate: () => Vencord.Settings.plugins.BetterNotesBox.hide,
|
predicate: () => settings.store.hide,
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /hideNote:.+?(?=([,}].*?\)))/g,
|
match: /hideNote:.+?(?=([,}].*?\)))/g,
|
||||||
replace: (m, rest) => {
|
replace: (m, rest) => {
|
||||||
|
@ -54,7 +70,7 @@ export default definePlugin({
|
||||||
find: "Messages.NOTE_PLACEHOLDER",
|
find: "Messages.NOTE_PLACEHOLDER",
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /\.NOTE_PLACEHOLDER,/,
|
match: /\.NOTE_PLACEHOLDER,/,
|
||||||
replace: "$&spellCheck:!Vencord.Settings.plugins.BetterNotesBox.noSpellCheck,"
|
replace: "$&spellCheck:!$self.noSpellCheck,"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -66,25 +82,14 @@ export default definePlugin({
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
||||||
options: {
|
|
||||||
hide: {
|
|
||||||
type: OptionType.BOOLEAN,
|
|
||||||
description: "Hide notes",
|
|
||||||
default: false,
|
|
||||||
restartNeeded: true
|
|
||||||
},
|
|
||||||
noSpellCheck: {
|
|
||||||
type: OptionType.BOOLEAN,
|
|
||||||
description: "Disable spellcheck in notes",
|
|
||||||
disabled: () => Settings.plugins.BetterNotesBox.hide,
|
|
||||||
default: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
patchPadding: ErrorBoundary.wrap(({ lastSection }) => {
|
patchPadding: ErrorBoundary.wrap(({ lastSection }) => {
|
||||||
if (!lastSection) return null;
|
if (!lastSection) return null;
|
||||||
return (
|
return (
|
||||||
<div className={UserPopoutSectionCssClasses.lastSection} ></div>
|
<div className={UserPopoutSectionCssClasses.lastSection} ></div>
|
||||||
);
|
);
|
||||||
})
|
}),
|
||||||
|
|
||||||
|
get noSpellCheck() {
|
||||||
|
return settings.store.noSpellCheck;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -114,7 +114,7 @@ export default definePlugin({
|
||||||
'("MessageActionCreators")', '("ChannelMessages")',
|
'("MessageActionCreators")', '("ChannelMessages")',
|
||||||
'("Routing/Utils")', '("RTCControlSocket")',
|
'("Routing/Utils")', '("RTCControlSocket")',
|
||||||
'("ConnectionEventFramerateReducer")', '("RTCLatencyTestManager")',
|
'("ConnectionEventFramerateReducer")', '("RTCLatencyTestManager")',
|
||||||
'("OverlayBridgeStore")', '("RPCServer:WSS")'
|
'("OverlayBridgeStore")', '("RPCServer:WSS")', '("RPCServer:IPC")'
|
||||||
].map(logger => ({
|
].map(logger => ({
|
||||||
find: logger,
|
find: logger,
|
||||||
predicate: () => settings.store.disableNoisyLoggers,
|
predicate: () => settings.store.disableNoisyLoggers,
|
||||||
|
|
|
@ -39,6 +39,15 @@ export default definePlugin({
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
patches: [
|
patches: [
|
||||||
|
// Only one of the two patches will be at effect; Discord often updates to switch between them.
|
||||||
|
// See: https://discord.com/channels/1015060230222131221/1032770730703716362/1261398512017477673
|
||||||
|
{
|
||||||
|
find: ".ENTER&&(!",
|
||||||
|
replacement: {
|
||||||
|
match: /(?<=(\i)\.which===\i\.\i.ENTER&&).{0,100}(\(0,\i\.\i\)\(\i\)).{0,100}(?=&&\(\i\.preventDefault)/,
|
||||||
|
replace: "$self.shouldSubmit($1, $2)"
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
find: "!this.hasOpenCodeBlock()",
|
find: "!this.hasOpenCodeBlock()",
|
||||||
replacement: {
|
replacement: {
|
||||||
|
|
|
@ -88,8 +88,8 @@ export default definePlugin({
|
||||||
{
|
{
|
||||||
find: "useCanFavoriteChannel",
|
find: "useCanFavoriteChannel",
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /!\(\i\.isDM\(\)\|\|\i\.isThread\(\)\)/,
|
match: /\i\.isDM\(\)\|\|\i\.isThread\(\)/,
|
||||||
replace: "true",
|
replace: "false",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
@ -24,7 +24,7 @@ import { getCurrentGuild } from "@utils/discord";
|
||||||
import { Logger } from "@utils/Logger";
|
import { Logger } from "@utils/Logger";
|
||||||
import definePlugin, { OptionType } from "@utils/types";
|
import definePlugin, { OptionType } from "@utils/types";
|
||||||
import { findByCodeLazy, findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
|
import { findByCodeLazy, findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
|
||||||
import { Alerts, ChannelStore, DraftType, EmojiStore, FluxDispatcher, Forms, IconUtils, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
|
import { Alerts, ChannelStore, DraftType, EmojiStore, FluxDispatcher, Forms, GuildMemberStore, IconUtils, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
|
||||||
import type { Emoji } from "@webpack/types";
|
import type { Emoji } from "@webpack/types";
|
||||||
import type { Message } from "discord-types/general";
|
import type { Message } from "discord-types/general";
|
||||||
import { applyPalette, GIFEncoder, quantize } from "gifenc";
|
import { applyPalette, GIFEncoder, quantize } from "gifenc";
|
||||||
|
@ -818,7 +818,14 @@ export default definePlugin({
|
||||||
|
|
||||||
if (isUnusableRoleSubscriptionEmoji(e, this.guildId, true)) return false;
|
if (isUnusableRoleSubscriptionEmoji(e, this.guildId, true)) return false;
|
||||||
|
|
||||||
if (this.canUseEmotes)
|
let isUsableTwitchSubEmote = false;
|
||||||
|
if (e.managed && e.guildId) {
|
||||||
|
// @ts-ignore outdated type
|
||||||
|
const myRoles = GuildMemberStore.getSelfMember(e.guildId)?.roles ?? [];
|
||||||
|
isUsableTwitchSubEmote = e.roles.some(r => myRoles.includes(r));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.canUseEmotes || isUsableTwitchSubEmote)
|
||||||
return e.guildId === this.guildId || hasExternalEmojiPerms(channelId);
|
return e.guildId === this.guildId || hasExternalEmojiPerms(channelId);
|
||||||
else
|
else
|
||||||
return !e.animated && e.guildId === this.guildId;
|
return !e.animated && e.guildId === this.guildId;
|
||||||
|
|
|
@ -17,7 +17,7 @@ const container = findByPropsLazy("memberSince");
|
||||||
const getCreatedAtDate = findByCodeLazy('month:"short",day:"numeric"');
|
const getCreatedAtDate = findByCodeLazy('month:"short",day:"numeric"');
|
||||||
const locale = findByPropsLazy("getLocale");
|
const locale = findByPropsLazy("getLocale");
|
||||||
const lastSection = findByPropsLazy("lastSection");
|
const lastSection = findByPropsLazy("lastSection");
|
||||||
const section = findLazy((m: any) => m.section !== void 0 && Object.values(m).length === 1);
|
const section = findLazy((m: any) => m.section !== void 0 && m.heading !== void 0 && Object.values(m).length === 2);
|
||||||
|
|
||||||
export default definePlugin({
|
export default definePlugin({
|
||||||
name: "FriendsSince",
|
name: "FriendsSince",
|
||||||
|
|
|
@ -133,10 +133,12 @@ export default definePlugin({
|
||||||
message: message,
|
message: message,
|
||||||
channel: ChannelStore.getChannel(message.channel_id),
|
channel: ChannelStore.getChannel(message.channel_id),
|
||||||
onClick: async () => {
|
onClick: async () => {
|
||||||
await iteratePasswords(message).then((res: string | false) => {
|
const res = await iteratePasswords(message);
|
||||||
if (res) return void this.buildEmbed(message, res);
|
|
||||||
return void buildDecModal({ message });
|
if (res)
|
||||||
});
|
this.buildEmbed(message, res);
|
||||||
|
else
|
||||||
|
buildDecModal({ message });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
: null;
|
: null;
|
||||||
|
@ -169,9 +171,9 @@ export default definePlugin({
|
||||||
|
|
||||||
message.embeds.push({
|
message.embeds.push({
|
||||||
type: "rich",
|
type: "rich",
|
||||||
title: "Decrypted Message",
|
rawTitle: "Decrypted Message",
|
||||||
color: "0x45f5f5",
|
color: "0x45f5f5",
|
||||||
description: revealed,
|
rawDescription: revealed,
|
||||||
footer: {
|
footer: {
|
||||||
text: "Made with ❤️ by c0dine and Sammy!",
|
text: "Made with ❤️ by c0dine and Sammy!",
|
||||||
},
|
},
|
||||||
|
|
5
src/plugins/mentionAvatars/README.md
Normal file
5
src/plugins/mentionAvatars/README.md
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
# MentionAvatars
|
||||||
|
|
||||||
|
Shows user avatars inside mentions
|
||||||
|
|
||||||
|
![](https://github.com/user-attachments/assets/fc76ea47-5e19-4063-a592-c57785a75cc7)
|
44
src/plugins/mentionAvatars/index.tsx
Normal file
44
src/plugins/mentionAvatars/index.tsx
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a Discord client mod
|
||||||
|
* Copyright (c) 2024 Vendicated and contributors
|
||||||
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
*/
|
||||||
|
|
||||||
|
import "./styles.css";
|
||||||
|
|
||||||
|
import ErrorBoundary from "@components/ErrorBoundary";
|
||||||
|
import { Devs } from "@utils/constants";
|
||||||
|
import definePlugin from "@utils/types";
|
||||||
|
import { SelectedGuildStore, useState } from "@webpack/common";
|
||||||
|
import { User } from "discord-types/general";
|
||||||
|
|
||||||
|
export default definePlugin({
|
||||||
|
name: "MentionAvatars",
|
||||||
|
description: "Shows user avatars inside mentions",
|
||||||
|
authors: [Devs.Ven],
|
||||||
|
|
||||||
|
patches: [{
|
||||||
|
find: ".USER_MENTION)",
|
||||||
|
replacement: {
|
||||||
|
match: /children:"@"\.concat\((null!=\i\?\i:\i)\)(?<=\.useName\((\i)\).+?)/,
|
||||||
|
replace: "children:$self.renderUsername({username:$1,user:$2})"
|
||||||
|
}
|
||||||
|
}],
|
||||||
|
|
||||||
|
renderUsername: ErrorBoundary.wrap((props: { user: User, username: string; }) => {
|
||||||
|
const { user, username } = props;
|
||||||
|
const [isHovering, setIsHovering] = useState(false);
|
||||||
|
|
||||||
|
if (!user) return <>@{username}</>;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
onMouseEnter={() => setIsHovering(true)}
|
||||||
|
onMouseLeave={() => setIsHovering(false)}
|
||||||
|
>
|
||||||
|
<img src={user.getAvatarURL(SelectedGuildStore.getGuildId(), 16, isHovering)} className="vc-mentionAvatars-avatar" />
|
||||||
|
@{username}
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}, { noop: true })
|
||||||
|
});
|
8
src/plugins/mentionAvatars/styles.css
Normal file
8
src/plugins/mentionAvatars/styles.css
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
.vc-mentionAvatars-avatar {
|
||||||
|
vertical-align: middle;
|
||||||
|
width: 1em;
|
||||||
|
height: 1em;
|
||||||
|
margin: 0 4px 0.2rem 2px;
|
||||||
|
border-radius: 50%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
|
@ -27,7 +27,7 @@ import { Devs } from "@utils/constants";
|
||||||
import { Logger } from "@utils/Logger";
|
import { Logger } from "@utils/Logger";
|
||||||
import definePlugin, { OptionType } from "@utils/types";
|
import definePlugin, { OptionType } from "@utils/types";
|
||||||
import { findByPropsLazy } from "@webpack";
|
import { findByPropsLazy } from "@webpack";
|
||||||
import { ChannelStore, FluxDispatcher, i18n, Menu, MessageStore, Parser, Timestamp, UserStore, useStateFromStores } from "@webpack/common";
|
import { ChannelStore, FluxDispatcher, i18n, Menu, MessageStore, Parser, SelectedChannelStore, Timestamp, UserStore, useStateFromStores } from "@webpack/common";
|
||||||
import { Message } from "discord-types/general";
|
import { Message } from "discord-types/general";
|
||||||
|
|
||||||
import overlayStyle from "./deleteStyleOverlay.css?managed";
|
import overlayStyle from "./deleteStyleOverlay.css?managed";
|
||||||
|
@ -154,7 +154,15 @@ export default definePlugin({
|
||||||
<>
|
<>
|
||||||
{message.editHistory?.map(edit => (
|
{message.editHistory?.map(edit => (
|
||||||
<div className="messagelogger-edited">
|
<div className="messagelogger-edited">
|
||||||
{Parser.parse(edit.content)}
|
{Parser.parse(edit.content, true, {
|
||||||
|
channelId,
|
||||||
|
messageId,
|
||||||
|
allowLinks: true,
|
||||||
|
allowHeading: true,
|
||||||
|
allowList: true,
|
||||||
|
allowEmojiLinks: true,
|
||||||
|
viewingChannelId: SelectedChannelStore.getChannelId(),
|
||||||
|
})}
|
||||||
<Timestamp
|
<Timestamp
|
||||||
timestamp={edit.timestamp}
|
timestamp={edit.timestamp}
|
||||||
isEdited={true}
|
isEdited={true}
|
||||||
|
@ -337,7 +345,7 @@ export default definePlugin({
|
||||||
// Pass through editHistory & deleted & original attachments to the "edited message" transformer
|
// Pass through editHistory & deleted & original attachments to the "edited message" transformer
|
||||||
match: /(?<=null!=\i\.edited_timestamp\)return )\i\(\i,\{reactions:(\i)\.reactions.{0,50}\}\)/,
|
match: /(?<=null!=\i\.edited_timestamp\)return )\i\(\i,\{reactions:(\i)\.reactions.{0,50}\}\)/,
|
||||||
replace:
|
replace:
|
||||||
"Object.assign($&,{ deleted:$1.deleted, editHistory:$1.editHistory, attachments:$1.attachments })"
|
"Object.assign($&,{ deleted:$1.deleted, editHistory:$1.editHistory })"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
@ -8,11 +8,15 @@
|
||||||
.emoji,
|
.emoji,
|
||||||
[data-type="sticker"],
|
[data-type="sticker"],
|
||||||
iframe,
|
iframe,
|
||||||
.messagelogger-deleted-attachment:not([class*="hiddenAttachment_"]),
|
.messagelogger-deleted-attachment,
|
||||||
[class|="inlineMediaEmbed"]
|
[class|="inlineMediaEmbed"]
|
||||||
) {
|
) {
|
||||||
filter: grayscale(1) !important;
|
filter: grayscale(1) !important;
|
||||||
transition: 150ms filter ease-in-out;
|
transition: 150ms filter ease-in-out;
|
||||||
|
|
||||||
|
&[class*="hiddenMosaicItem_"] {
|
||||||
|
filter: grayscale(1) blur(var(--custom-message-attachment-spoiler-blur-radius, 44px)) !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.messagelogger-deleted
|
.messagelogger-deleted
|
||||||
|
@ -23,8 +27,7 @@
|
||||||
iframe,
|
iframe,
|
||||||
.messagelogger-deleted-attachment,
|
.messagelogger-deleted-attachment,
|
||||||
[class|="inlineMediaEmbed"]
|
[class|="inlineMediaEmbed"]
|
||||||
):hover,
|
):hover {
|
||||||
.messagelogger-deleted {
|
|
||||||
filter: grayscale(0) !important;
|
filter: grayscale(0) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -256,6 +256,7 @@ export default definePlugin({
|
||||||
// in profiles
|
// in profiles
|
||||||
{
|
{
|
||||||
find: ",overrideDiscriminator:",
|
find: ",overrideDiscriminator:",
|
||||||
|
group: true,
|
||||||
replacement: [
|
replacement: [
|
||||||
{
|
{
|
||||||
// prevent channel id from getting ghosted
|
// prevent channel id from getting ghosted
|
||||||
|
@ -263,7 +264,7 @@ export default definePlugin({
|
||||||
match: /user:\i,nick:\i,/,
|
match: /user:\i,nick:\i,/,
|
||||||
replace: "$&moreTags_channelId,"
|
replace: "$&moreTags_channelId,"
|
||||||
}, {
|
}, {
|
||||||
match: /,botType:(\i\((\i)\)),/g,
|
match: /,botType:(\i),(?<=user:(\i).+?)/g,
|
||||||
replace: ",botType:$self.getTag({user:$2,channelId:moreTags_channelId,origType:$1,location:'not-chat'}),"
|
replace: ",botType:$self.getTag({user:$2,channelId:moreTags_channelId,origType:$1,location:'not-chat'}),"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -34,7 +34,7 @@ import UserPermissions from "./components/UserPermissions";
|
||||||
import { getSortedRoles, sortPermissionOverwrites } from "./utils";
|
import { getSortedRoles, sortPermissionOverwrites } from "./utils";
|
||||||
|
|
||||||
const PopoutClasses = findByPropsLazy("container", "scroller", "list");
|
const PopoutClasses = findByPropsLazy("container", "scroller", "list");
|
||||||
const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "text");
|
const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "banner");
|
||||||
|
|
||||||
export const enum PermissionsSortOrder {
|
export const enum PermissionsSortOrder {
|
||||||
HighestRole,
|
HighestRole,
|
||||||
|
|
|
@ -37,8 +37,7 @@ import { getCurrentUserInfo, readNotification } from "./reviewDbApi";
|
||||||
import { settings } from "./settings";
|
import { settings } from "./settings";
|
||||||
import { showToast } from "./utils";
|
import { showToast } from "./utils";
|
||||||
|
|
||||||
const PopoutClasses = findByPropsLazy("container", "scroller", "list");
|
const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "banner");
|
||||||
const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "text");
|
|
||||||
|
|
||||||
const guildPopoutPatch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild, onClose(): void; }) => {
|
const guildPopoutPatch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild, onClose(): void; }) => {
|
||||||
if (!guild) return;
|
if (!guild) return;
|
||||||
|
@ -181,9 +180,9 @@ export default definePlugin({
|
||||||
onClick={() => openReviewsModal(user.id, user.username)}
|
onClick={() => openReviewsModal(user.id, user.username)}
|
||||||
look={Button.Looks.FILLED}
|
look={Button.Looks.FILLED}
|
||||||
size={Button.Sizes.NONE}
|
size={Button.Sizes.NONE}
|
||||||
color={RoleButtonClasses.color}
|
color={RoleButtonClasses.bannerColor}
|
||||||
className={classes(RoleButtonClasses.button, RoleButtonClasses.banner)}
|
className={classes(RoleButtonClasses.button, RoleButtonClasses.icon, RoleButtonClasses.banner)}
|
||||||
innerClassName={classes(RoleButtonClasses.buttonInner, RoleButtonClasses.banner)}
|
innerClassName={classes(RoleButtonClasses.buttonInner, RoleButtonClasses.icon, RoleButtonClasses.banner)}
|
||||||
>
|
>
|
||||||
<NotesIcon height={16} width={16} />
|
<NotesIcon height={16} width={16} />
|
||||||
</Button>
|
</Button>
|
||||||
|
|
|
@ -60,7 +60,7 @@ export default definePlugin({
|
||||||
find: 'location:"UserMention',
|
find: 'location:"UserMention',
|
||||||
replacement: [
|
replacement: [
|
||||||
{
|
{
|
||||||
match: /user:(\i),channel:(\i).{0,400}?"@"\.concat\(.+?\)/,
|
match: /onContextMenu:\i,color:\i,\.\.\.\i(?=,children:)(?<=user:(\i),channel:(\i).{0,500}?)/,
|
||||||
replace: "$&,color:$self.getUserColor($1?.id,{channelId:$2?.id})"
|
replace: "$&,color:$self.getUserColor($1?.id,{channelId:$2?.id})"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
@ -15,8 +15,8 @@ export default definePlugin({
|
||||||
{
|
{
|
||||||
find: ".Messages.VIEW_ALL_ROLES",
|
find: ".Messages.VIEW_ALL_ROLES",
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /return null!=\i(?=\?\i\.slice)/,
|
match: /(\i)\.slice\(0,\i\)/,
|
||||||
replace: "return false"
|
replace: "$1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -257,7 +257,7 @@ export default definePlugin({
|
||||||
{
|
{
|
||||||
find: '"alt+shift+down"',
|
find: '"alt+shift+down"',
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /(?<=getChannel\(\i\);return null!=(\i))(?=.{0,150}?>0\)&&\(0,\i\.\i\)\(\i\))/,
|
match: /(?<=getChannel\(\i\);return null!=(\i))(?=.{0,200}?>0\)&&\(0,\i\.\i\)\(\i\))/,
|
||||||
replace: (_, channel) => `&&!$self.isHiddenChannel(${channel})`
|
replace: (_, channel) => `&&!$self.isHiddenChannel(${channel})`
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -265,8 +265,8 @@ export default definePlugin({
|
||||||
{
|
{
|
||||||
find: ".APPLICATION_STORE&&null!=",
|
find: ".APPLICATION_STORE&&null!=",
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /(?<=getState\(\)\.channelId.{0,30}?\(0,\i\.\i\)\(\i\))(?=\.map\()/,
|
match: /getState\(\)\.channelId.+?(?=\.map\(\i=>\i\.id)/,
|
||||||
replace: ".filter(e=>!$self.isHiddenChannel(e))"
|
replace: "$&.filter(e=>!$self.isHiddenChannel(e))"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,34 +18,21 @@
|
||||||
|
|
||||||
import { definePluginSettings, migratePluginSettings } from "@api/Settings";
|
import { definePluginSettings, migratePluginSettings } from "@api/Settings";
|
||||||
import { Devs } from "@utils/constants";
|
import { Devs } from "@utils/constants";
|
||||||
import definePlugin, { OptionType } from "@utils/types";
|
import definePlugin, { OptionType, PluginSettingDef } from "@utils/types";
|
||||||
|
|
||||||
|
const opt = (description: string) => ({
|
||||||
|
type: OptionType.BOOLEAN,
|
||||||
|
description,
|
||||||
|
default: true,
|
||||||
|
restartNeeded: true
|
||||||
|
} satisfies PluginSettingDef);
|
||||||
|
|
||||||
const settings = definePluginSettings({
|
const settings = definePluginSettings({
|
||||||
showTimeouts: {
|
showTimeouts: opt("Show member timeout icons in chat."),
|
||||||
type: OptionType.BOOLEAN,
|
showInvitesPaused: opt("Show the invites paused tooltip in the server list."),
|
||||||
description: "Show member timeout icons in chat.",
|
showModView: opt("Show the member mod view context menu item in all servers."),
|
||||||
default: true,
|
disableDiscoveryFilters: opt("Disable filters in Server Discovery search that hide servers that don't meet discovery criteria."),
|
||||||
},
|
disableDisallowedDiscoveryFilters: opt("Disable filters in Server Discovery search that hide NSFW & disallowed servers."),
|
||||||
showInvitesPaused: {
|
|
||||||
type: OptionType.BOOLEAN,
|
|
||||||
description: "Show the invites paused tooltip in the server list.",
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
showModView: {
|
|
||||||
type: OptionType.BOOLEAN,
|
|
||||||
description: "Show the member mod view context menu item in all servers.",
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
disableDiscoveryFilters: {
|
|
||||||
type: OptionType.BOOLEAN,
|
|
||||||
description: "Disable filters in Server Discovery search that hide servers that don't meet discovery criteria.",
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
disableDisallowedDiscoveryFilters: {
|
|
||||||
type: OptionType.BOOLEAN,
|
|
||||||
description: "Disable filters in Server Discovery search that hide NSFW & disallowed servers.",
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
migratePluginSettings("ShowHiddenThings", "ShowTimeouts");
|
migratePluginSettings("ShowHiddenThings", "ShowTimeouts");
|
||||||
|
|
|
@ -67,7 +67,7 @@ export default definePlugin({
|
||||||
const { nick } = author;
|
const { nick } = author;
|
||||||
const prefix = withMentionPrefix ? "@" : "";
|
const prefix = withMentionPrefix ? "@" : "";
|
||||||
|
|
||||||
if (isRepliedMessage && !settings.store.inReplies || username === nick.toLowerCase())
|
if (isRepliedMessage && !settings.store.inReplies || username.toLowerCase() === nick.toLowerCase())
|
||||||
return <>{prefix}{nick}</>;
|
return <>{prefix}{nick}</>;
|
||||||
|
|
||||||
if (settings.store.mode === "user-nick")
|
if (settings.store.mode === "user-nick")
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
# Urban Dictionary
|
|
||||||
|
|
||||||
Use /urban slash command to search for a definition for a word on [Urban Dictionary](https://www.urbandictionary.com/).
|
|
||||||
|
|
||||||
## Preview
|
|
||||||
|
|
||||||
![preview](https://i.imgur.com/1zwzj38.png)
|
|
||||||
|
|
||||||
## Usage
|
|
||||||
|
|
||||||
- Enable this plugin
|
|
||||||
- Set plugin settings as desired
|
|
||||||
- Type /urban and start getting definitions right into your Discord client.
|
|
|
@ -1,105 +0,0 @@
|
||||||
/*
|
|
||||||
* Vencord, a modification for Discord's desktop app
|
|
||||||
* Copyright (c) 2022 Vendicated and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { ApplicationCommandOptionType, sendBotMessage } from "@api/Commands";
|
|
||||||
import { ApplicationCommandInputType } from "@api/Commands/types";
|
|
||||||
import { definePluginSettings } from "@api/Settings";
|
|
||||||
import { Devs } from "@utils/constants";
|
|
||||||
import definePlugin, { OptionType } from "@utils/types";
|
|
||||||
|
|
||||||
const settings = definePluginSettings({
|
|
||||||
resultsAmount: {
|
|
||||||
type: OptionType.NUMBER,
|
|
||||||
description: "The amount of results you want to get (more gives better results, but is slower)",
|
|
||||||
default: 10
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
export default definePlugin({
|
|
||||||
name: "UrbanDictionary",
|
|
||||||
description: "Search for a word on Urban Dictionary via /urban slash command",
|
|
||||||
authors: [Devs.jewdev],
|
|
||||||
dependencies: ["CommandsAPI"],
|
|
||||||
settings,
|
|
||||||
commands: [
|
|
||||||
{
|
|
||||||
name: "urban",
|
|
||||||
description: "Returns the definition of a word from Urban Dictionary",
|
|
||||||
inputType: ApplicationCommandInputType.BUILT_IN,
|
|
||||||
options: [
|
|
||||||
{
|
|
||||||
type: ApplicationCommandOptionType.STRING,
|
|
||||||
name: "word",
|
|
||||||
description: "The word to search for on Urban Dictionary",
|
|
||||||
required: true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
execute: async (args, ctx) => {
|
|
||||||
try {
|
|
||||||
const query: string = encodeURIComponent(args[0].value);
|
|
||||||
const { list } = await fetch(`https://api.urbandictionary.com/v0/define?term=${query}&per_page=${settings.store.resultsAmount}`).then(response => response.json());
|
|
||||||
|
|
||||||
if (!list.length)
|
|
||||||
return void sendBotMessage(ctx.channel.id, { content: "No results found." });
|
|
||||||
|
|
||||||
const definition = list.reduce((prev, curr) => {
|
|
||||||
return prev.thumbs_up > curr.thumbs_up ? prev : curr;
|
|
||||||
});
|
|
||||||
|
|
||||||
const linkify = (text: string) => text
|
|
||||||
.replaceAll("\r\n", "\n")
|
|
||||||
.replace(/([*>_`~\\])/gsi, "\\$1")
|
|
||||||
.replace(/\[(.+?)\]/g, (_, word) => `[${word}](https://www.urbandictionary.com/define.php?term=${encodeURIComponent(word)} "Define '${word}' on Urban Dictionary")`)
|
|
||||||
.trim();
|
|
||||||
|
|
||||||
return void sendBotMessage(ctx.channel.id, {
|
|
||||||
embeds: [
|
|
||||||
{
|
|
||||||
type: "rich",
|
|
||||||
author: {
|
|
||||||
name: `Uploaded by "${definition.author}"`,
|
|
||||||
url: `https://www.urbandictionary.com/author.php?author=${encodeURIComponent(definition.author)}`,
|
|
||||||
},
|
|
||||||
title: definition.word,
|
|
||||||
url: `https://www.urbandictionary.com/define.php?term=${encodeURIComponent(definition.word)}`,
|
|
||||||
description: linkify(definition.definition),
|
|
||||||
fields: [
|
|
||||||
{
|
|
||||||
name: "Example",
|
|
||||||
value: linkify(definition.example),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Want more definitions?",
|
|
||||||
value: `Check out [more definitions](https://www.urbandictionary.com/define.php?term=${query} "Define "${args[0].value}" on Urban Dictionary") on Urban Dictionary.`,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
color: 0xFF9900,
|
|
||||||
footer: { text: `👍 ${definition.thumbs_up.toString()} | 👎 ${definition.thumbs_down.toString()}`, icon_url: "https://www.urbandictionary.com/favicon.ico" },
|
|
||||||
timestamp: new Date(definition.written_on).toISOString(),
|
|
||||||
},
|
|
||||||
] as any,
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
sendBotMessage(ctx.channel.id, {
|
|
||||||
content: `Something went wrong: \`${error}\``,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
});
|
|
|
@ -183,14 +183,22 @@ export default definePlugin({
|
||||||
},
|
},
|
||||||
|
|
||||||
patches: [
|
patches: [
|
||||||
// Profiles Modal pfp
|
// Avatar component used in User DMs "User Profile" popup in the right and Profiles Modal pfp
|
||||||
...[".MODAL,hasProfileEffect", ".FULL_SIZE,hasProfileEffect:"].map(find => ({
|
{
|
||||||
find,
|
find: ".overlay:void 0,status:",
|
||||||
|
replacement: {
|
||||||
|
match: /avatarSrc:(\i),eventHandlers:(\i).+?"div",{...\2,/,
|
||||||
|
replace: "$&style:{cursor:\"pointer\"},onClick:()=>{$self.openImage($1)},"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// Old Profiles Modal pfp
|
||||||
|
{
|
||||||
|
find: ".MODAL,hasProfileEffect",
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /\{src:(\i)(?=,avatarDecoration)/,
|
match: /\{src:(\i)(?=,avatarDecoration)/,
|
||||||
replace: "{src:$1,onClick:()=>$self.openImage($1)"
|
replace: "{src:$1,onClick:()=>$self.openImage($1)"
|
||||||
}
|
}
|
||||||
})),
|
},
|
||||||
// Banners
|
// Banners
|
||||||
...[".NITRO_BANNER,", "=!1,canUsePremiumCustomization:"].map(find => ({
|
...[".NITRO_BANNER,", "=!1,canUsePremiumCustomization:"].map(find => ({
|
||||||
find,
|
find,
|
||||||
|
@ -202,7 +210,7 @@ export default definePlugin({
|
||||||
'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'
|
'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'
|
||||||
}
|
}
|
||||||
})),
|
})),
|
||||||
// User DMs "User Profile" popup in the right
|
// Old User DMs "User Profile" popup in the right
|
||||||
{
|
{
|
||||||
find: ".avatarPositionPanel",
|
find: ".avatarPositionPanel",
|
||||||
replacement: {
|
replacement: {
|
||||||
|
@ -210,14 +218,6 @@ export default definePlugin({
|
||||||
replace: "$1style:($2)?{cursor:\"pointer\"}:{},onClick:$2?()=>{$self.openImage($3)}"
|
replace: "$1style:($2)?{cursor:\"pointer\"}:{},onClick:$2?()=>{$self.openImage($3)}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
find: ".canUsePremiumProfileCustomization,{avatarSrc:",
|
|
||||||
replacement: {
|
|
||||||
match: /children:\(0,\i\.jsx\)\(\i,{src:(\i)/,
|
|
||||||
replace: "style:{cursor:\"pointer\"},onClick:()=>{$self.openImage($1)},$&"
|
|
||||||
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// Group DMs top small & large icon
|
// Group DMs top small & large icon
|
||||||
{
|
{
|
||||||
find: /\.recipients\.length>=2(?!<isMultiUserDM.{0,50})/,
|
find: /\.recipients\.length>=2(?!<isMultiUserDM.{0,50})/,
|
||||||
|
|
|
@ -1,110 +0,0 @@
|
||||||
/*
|
|
||||||
* Vencord, a modification for Discord's desktop app
|
|
||||||
* Copyright (c) 2023 Vendicated and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands";
|
|
||||||
import { Devs } from "@utils/constants";
|
|
||||||
import definePlugin from "@utils/types";
|
|
||||||
|
|
||||||
export default definePlugin({
|
|
||||||
name: "Wikisearch",
|
|
||||||
description: "Searches Wikipedia for your requested query. (/wikisearch)",
|
|
||||||
authors: [Devs.Samu],
|
|
||||||
dependencies: ["CommandsAPI"],
|
|
||||||
commands: [
|
|
||||||
{
|
|
||||||
name: "wikisearch",
|
|
||||||
description: "Searches Wikipedia for your request.",
|
|
||||||
inputType: ApplicationCommandInputType.BUILT_IN,
|
|
||||||
options: [
|
|
||||||
{
|
|
||||||
name: "search",
|
|
||||||
description: "Word to search for",
|
|
||||||
type: ApplicationCommandOptionType.STRING,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
],
|
|
||||||
execute: async (_, ctx) => {
|
|
||||||
const word = findOption(_, "search", "");
|
|
||||||
|
|
||||||
if (!word) {
|
|
||||||
return sendBotMessage(ctx.channel.id, {
|
|
||||||
content: "No word was defined!"
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const dataSearchParams = new URLSearchParams({
|
|
||||||
action: "query",
|
|
||||||
format: "json",
|
|
||||||
list: "search",
|
|
||||||
formatversion: "2",
|
|
||||||
origin: "*",
|
|
||||||
srsearch: word
|
|
||||||
});
|
|
||||||
|
|
||||||
const data = await fetch("https://en.wikipedia.org/w/api.php?" + dataSearchParams).then(response => response.json())
|
|
||||||
.catch(err => {
|
|
||||||
console.log(err);
|
|
||||||
sendBotMessage(ctx.channel.id, { content: "There was an error. Check the console for more info" });
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!data) return;
|
|
||||||
|
|
||||||
if (!data.query?.search?.length) {
|
|
||||||
console.log(data);
|
|
||||||
return sendBotMessage(ctx.channel.id, { content: "No results given" });
|
|
||||||
}
|
|
||||||
|
|
||||||
const altData = await fetch(`https://en.wikipedia.org/w/api.php?action=query&format=json&prop=info%7Cdescription%7Cimages%7Cimageinfo%7Cpageimages&list=&meta=&indexpageids=1&pageids=${data.query.search[0].pageid}&formatversion=2&origin=*`)
|
|
||||||
.then(res => res.json())
|
|
||||||
.then(data => data.query.pages[0])
|
|
||||||
.catch(err => {
|
|
||||||
console.log(err);
|
|
||||||
sendBotMessage(ctx.channel.id, { content: "There was an error. Check the console for more info" });
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!altData) return;
|
|
||||||
|
|
||||||
const thumbnailData = altData.thumbnail;
|
|
||||||
|
|
||||||
const thumbnail = thumbnailData && {
|
|
||||||
url: thumbnailData.source.replace(/(50px-)/ig, "1000px-"),
|
|
||||||
height: thumbnailData.height * 100,
|
|
||||||
width: thumbnailData.width * 100
|
|
||||||
};
|
|
||||||
|
|
||||||
sendBotMessage(ctx.channel.id, {
|
|
||||||
embeds: [
|
|
||||||
{
|
|
||||||
type: "rich",
|
|
||||||
title: data.query.search[0].title,
|
|
||||||
url: `https://wikipedia.org/w/index.php?curid=${data.query.search[0].pageid}`,
|
|
||||||
color: "0x8663BE",
|
|
||||||
description: data.query.search[0].snippet.replace(/( |<([^>]+)>)/ig, "").replace(/(")/ig, "\"") + "...",
|
|
||||||
image: thumbnail,
|
|
||||||
footer: {
|
|
||||||
text: "Powered by the Wikimedia API",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
] as any
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
});
|
|
Loading…
Reference in a new issue