mirrors/Equicord
1
1
Fork 0
mirror of https://github.com/Equicord/Equicord.git synced 2025-03-30 12:11:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

git(revert): "feat(voiceMessages): Added an option to convert to .ogg for ios support. (#197)"

Browse source 
This reverts commit d4858e219c.
broken atm waiting for mohammad fix
This commit is contained in:
Cortex 2025-03-25 18:25:51 -06:00
parent d4858e219c
commit c81b2c087b
1 changed files with 2 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/plugins/voiceMessages/index.tsx
View file

@ -21,9 +21,6 @@ import "./styles.css";
import { NavContextMenuPatchCallback } from "@api/ContextMenu";
import { Microphone } from "@components/Icons";
import { Link } from "@components/Link";
import { loadFFmpeg } from "@equicordplugins/moreStickers/utils";
import { FFmpeg } from "@ffmpeg/ffmpeg";
import { fetchFile } from "@ffmpeg/util";
import { Devs, EquicordDevs } from "@utils/constants";
import { Margins } from "@utils/margins";
import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/modal";
@ -31,7 +28,7 @@ import { useAwaiter } from "@utils/react";
import definePlugin from "@utils/types";
import { chooseFile } from "@utils/web";
import { findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
import { Button, Card, Constants, Flex, FluxDispatcher, Forms, lodash, Menu, MessageActions, PermissionsBits, PermissionStore, React, RestAPI, SelectedChannelStore, showToast, SnowflakeUtils, Toasts, useEffect, useState } from "@webpack/common";
import { Button, Card, Constants, FluxDispatcher, Forms, lodash, Menu, MessageActions, PermissionsBits, PermissionStore, RestAPI, SelectedChannelStore, showToast, SnowflakeUtils, Toasts, useEffect, useState } from "@webpack/common";
import { ComponentType } from "react";
import { lastState as silentMessageEnabled } from "../silentMessageToggle";
@ -185,17 +182,6 @@ function Modal({ modalProps }: { modalProps: ModalProps; }) {
!blob.type.startsWith("audio/ogg")
|| blob.type.includes("codecs") && !blob.type.includes("opus")
);
const ffmpegLoaded = React.useState(false);
const ffmpeg = React.useState<FFmpeg>(new FFmpeg());
React.useEffect(() => {
if (ffmpegLoaded[0]) return;
loadFFmpeg(ffmpeg[0], () => {
ffmpegLoaded[1](true);
});
}, []);
return (
<ModalRoot {...modalProps}>
@ -240,13 +226,12 @@ function Modal({ modalProps }: { modalProps: ModalProps; }) {
<Forms.FormText className={Margins.top8}>
To fix it, first convert it to OggOpus, for example using the <Link href="https://convertio.co/mp3-opus/">convertio web converter</Link>
</Forms.FormText>
</Card>
)}
</ModalContent>
<ModalFooter justify={Flex.Justify.BETWEEN} direction={Flex.Direction.HORIZONTAL_REVERSE} align={Flex.Align.STRETCH} wrap={Flex.Wrap.NO_WRAP} separator>
<ModalFooter>
<Button
disabled={!blob}
onClick={() => {
@ -257,28 +242,7 @@ function Modal({ modalProps }: { modalProps: ModalProps; }) {
>
Send
</Button>
{isUnsupportedFormat && <Button
disabled={!blob}
onClick={async () => {
setBlob(undefined); // so the button disables while converting
const ffmpegInstance = ffmpeg[0];
const blobUrl = URL.createObjectURL(blob!);
const filename = "voice-message-converted.ogg";
ffmpegInstance.writeFile(filename, await fetchFile(blobUrl));
ffmpegInstance.exec(["-i", filename, "-c:a", "libopus", "-b:a", "128k", "-vbr", "on", filename]);
const data = await ffmpegInstance.readFile(filename);
const convertedBlob = new Blob([data], { type: "audio/ogg; codecs=opus" });
setBlob(convertedBlob);
setBlobUrl(convertedBlob);
}}
>
Convert to OggOpus
</Button>}
</ModalFooter>
</ModalRoot>
);
}