From 2fbecccfe286f82e6ef115989027c10b57493cfa Mon Sep 17 00:00:00 2001 From: thororen <78185467+thororen1234@users.noreply.github.com> Date: Thu, 10 Sep 2026 11:31:11 -0400 Subject: [PATCH] pluralise -> pluralize --- .rules | 2 +- src/components/settings/tabs/plugins/ContributorModal.tsx | 4 ++-- src/equicordplugins/downloadAllAttachments/index.tsx | 4 ++-- src/equicordplugins/messagePeek/index.tsx | 6 +----- src/plugins/addAttachments/index.tsx | 4 ++-- src/plugins/experiments/index.tsx | 3 +-- src/utils/misc.ts | 2 +- 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.rules b/.rules index 5be9f7ed7..4e8138e16 100644 --- a/.rules +++ b/.rules @@ -436,7 +436,7 @@ Deprecated: `@api/Themes`. `classNameFactory` re-export from `@api/Styles`. - `Logger`. `new Logger(name)`. - `css`. `classNameFactory`, `classNameToSelector`. -- `misc`. `classes`, `sleep`, `isObject`, `isObjectEmpty`, `pluralise`, `parseUrl`, `identity`, `interpolateIfDefined`, `tryOrElse`, `isPluginDev`, `removeFromArray`. +- `misc`. `classes`, `sleep`, `isObject`, `isObjectEmpty`, `pluralize`, `parseUrl`, `identity`, `interpolateIfDefined`, `tryOrElse`, `isPluginDev`, `removeFromArray`. - `text`. `formatDuration`, `formatDurationMs`, `humanFriendlyJoin`, `makeCodeblock`, `toInlineCode`, `escapeRegExp`, `stripIndent`, `ZWSP`. - `react`. `useAwaiter`, `useForceUpdater`, `useIntersection`, `useTimer`, `useFixedTimer`, `useCleanupEffect`, `NoopComponent`, `isPrimitiveReactNode`. Re-exports `LazyComponent` from `lazyReact`. - `lazy`. `makeLazy`, `proxyLazy`. diff --git a/src/components/settings/tabs/plugins/ContributorModal.tsx b/src/components/settings/tabs/plugins/ContributorModal.tsx index 685eaf929..6132e0376 100644 --- a/src/components/settings/tabs/plugins/ContributorModal.tsx +++ b/src/components/settings/tabs/plugins/ContributorModal.tsx @@ -13,7 +13,7 @@ import { Paragraph } from "@components/Paragraph"; import { EquicordDevsById, VencordDevsById } from "@utils/constants"; import { classNameFactory } from "@utils/css"; import { fetchUserProfile } from "@utils/discord"; -import { pluralise } from "@utils/misc"; +import { pluralize } from "@utils/misc"; import { RenderModalProps, User } from "@vencord/discord-types"; import { Modal, openModal, showToast, useEffect, useMemo, UserProfileStore, useStateFromStores } from "@webpack/common"; @@ -76,7 +76,7 @@ function ContributorModal({ user, modalProps }: { user: User; modalProps: Render plugins.length ? ( - {user.username} has {ContributedHyperLink} to {pluralise(plugins.length, "plugin")}! + {user.username} has {ContributedHyperLink} to {pluralize(plugins.length, "plugin")}! ) : ( diff --git a/src/equicordplugins/downloadAllAttachments/index.tsx b/src/equicordplugins/downloadAllAttachments/index.tsx index a33964d97..8d2006fa3 100644 --- a/src/equicordplugins/downloadAllAttachments/index.tsx +++ b/src/equicordplugins/downloadAllAttachments/index.tsx @@ -7,7 +7,7 @@ import { CloudDownloadIcon } from "@components/Icons"; import { EquicordDevs } from "@utils/constants"; import { Logger } from "@utils/Logger"; -import { pluralise } from "@utils/misc"; +import { pluralize } from "@utils/misc"; import definePlugin from "@utils/types"; import { Message, MessageAttachment } from "@vencord/discord-types"; import { ChannelStore, showToast, Toasts } from "@webpack/common"; @@ -55,7 +55,7 @@ async function downloadAll(attachments: MessageAttachment[]) { const succeeded = attachments.length - failed; if (failed === 0) - showToast(`Downloaded ${pluralise(succeeded, "attachment")}.`, Toasts.Type.SUCCESS); + showToast(`Downloaded ${pluralize(succeeded, "attachment")}.`, Toasts.Type.SUCCESS); else showToast(`Downloaded ${succeeded} of ${attachments.length} attachments. ${failed} failed.`, Toasts.Type.FAILURE); } diff --git a/src/equicordplugins/messagePeek/index.tsx b/src/equicordplugins/messagePeek/index.tsx index 6aeed53fd..5212e5f2d 100644 --- a/src/equicordplugins/messagePeek/index.tsx +++ b/src/equicordplugins/messagePeek/index.tsx @@ -14,7 +14,7 @@ import betterActivities from "@equicordplugins/betterActivities"; import showMeYourName from "@plugins/showMeYourName"; import { Devs, EquicordDevs } from "@utils/constants"; import { classNameFactory } from "@utils/css"; -import { classes } from "@utils/misc"; +import { classes, pluralize } from "@utils/misc"; import definePlugin, { OptionType } from "@utils/types"; import { Activity, ApplicationStream, Channel, Message, OnlineStatus, User } from "@vencord/discord-types"; import { MessageFlags } from "@vencord/discord-types/enums"; @@ -115,10 +115,6 @@ function formatRelativeTime(timestamp: number): string { return `${Math.max(1, minutes)}m`; } -function pluralize(count: number, singular: string, plural = singular + "s") { - return count === 1 ? `1 ${singular}` : `${count} ${plural}`; -} - function getMessageContent(message: Message): MessageContent | null { if (message.content) { if (/https?:\/\/(\S+\.gif|tenor\.com|giphy\.com|klipy\.com)/i.test(message.content)) { diff --git a/src/plugins/addAttachments/index.tsx b/src/plugins/addAttachments/index.tsx index 8f09666fd..4e6dfd4d7 100644 --- a/src/plugins/addAttachments/index.tsx +++ b/src/plugins/addAttachments/index.tsx @@ -7,7 +7,7 @@ import { ChatBarButton } from "@api/ChatButtons"; import { UploadIcon } from "@components/Icons"; import { Devs } from "@utils/constants"; -import { pluralise } from "@utils/misc"; +import { pluralize } from "@utils/misc"; import definePlugin from "@utils/types"; import { Message } from "@vencord/discord-types"; import { MessageFlags, MessageType } from "@vencord/discord-types/enums"; @@ -43,7 +43,7 @@ async function addAttachments(channelId: string, messageId: string, existingAtta return; } - showToast(`You can only add ${pluralise(remaining, "more attachment")} to this message.`, Toasts.Type.FAILURE); + showToast(`You can only add ${pluralize(remaining, "more attachment")} to this message.`, Toasts.Type.FAILURE); return; } diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx index 42abab4ab..fe18bf468 100644 --- a/src/plugins/experiments/index.tsx +++ b/src/plugins/experiments/index.tsx @@ -5,7 +5,6 @@ */ import { definePluginSettings } from "@api/Settings"; -import { disableStyle, enableStyle } from "@api/Styles"; import { BaseText } from "@components/BaseText"; import ErrorBoundary from "@components/ErrorBoundary"; import { ErrorCard } from "@components/ErrorCard"; @@ -15,7 +14,7 @@ import { Devs, IS_MAC } from "@utils/constants"; import { Margins } from "@utils/margins"; import definePlugin, { OptionType } from "@utils/types"; import { findByPropsLazy } from "@webpack"; -import { ExperimentStore, React } from "@webpack/common"; +import { React } from "@webpack/common"; const KbdStyles = findByPropsLazy("key", "combo"); const modKey = IS_MAC ? "cmd" : "ctrl"; diff --git a/src/utils/misc.ts b/src/utils/misc.ts index 2bde08052..c28ff2a83 100644 --- a/src/utils/misc.ts +++ b/src/utils/misc.ts @@ -86,7 +86,7 @@ export const shouldShowEquicordContributorBadge = (id: string) => isEquicordPlug export const isAnyPluginDev = (id: string) => Object.hasOwn(VencordDevsById, id) || Object.hasOwn(EquicordDevsById, id); -export function pluralise(amount: number, singular: string, plural = singular + "s") { +export function pluralize(amount: number, singular: string, plural = singular + "s") { return amount === 1 ? `${amount} ${singular}` : `${amount} ${plural}`; }