mirror of
https://github.com/Vendicated/Vencord.git
synced 2025-02-25 07:48:32 +00:00
Fixed privatechannel stuff
This commit is contained in:
parent
1297636b86
commit
eecb21fd42
1 changed files with 5 additions and 16 deletions
|
@ -5,7 +5,7 @@ import * as DataStore from "@api/DataStore";
|
||||||
import { sleep } from "@utils/misc";
|
import { sleep } from "@utils/misc";
|
||||||
import { findByPropsLazy } from "@webpack";
|
import { findByPropsLazy } from "@webpack";
|
||||||
import { addPreSendListener, removePreSendListener, SendListener } from "@api/MessageEvents";
|
import { addPreSendListener, removePreSendListener, SendListener } from "@api/MessageEvents";
|
||||||
import { useEffect, useState, FluxDispatcher } from "@webpack/common";
|
import { useEffect, useState, FluxDispatcher, PrivateChannelsStore } from "@webpack/common";
|
||||||
import { generateKeys, encryptData, decryptData, formatPemKey } from "./rsa-utils";
|
import { generateKeys, encryptData, decryptData, formatPemKey } from "./rsa-utils";
|
||||||
import { Devs } from "@utils/constants";
|
import { Devs } from "@utils/constants";
|
||||||
import {
|
import {
|
||||||
|
@ -24,7 +24,7 @@ import {
|
||||||
import { Message } from "discord-types/general";
|
import { Message } from "discord-types/general";
|
||||||
const MessageCreator = findByPropsLazy("createBotMessage");
|
const MessageCreator = findByPropsLazy("createBotMessage");
|
||||||
const CloudUtils = findByPropsLazy("CloudUpload");
|
const CloudUtils = findByPropsLazy("CloudUpload");
|
||||||
import { getCurrentChannel } from "@utils/discord";
|
import { getCurrentChannel, openPrivateChannel } from "@utils/discord";
|
||||||
|
|
||||||
let enabled;
|
let enabled;
|
||||||
let setEnabled;
|
let setEnabled;
|
||||||
|
@ -87,6 +87,7 @@ const ChatBarIcon: ChatBarButton = ({ isMainChat }) => {
|
||||||
sendBotMessage(getCurrentChannel().id, { content: "*Leaving current group...*" });
|
sendBotMessage(getCurrentChannel().id, { content: "*Leaving current group...*" });
|
||||||
await leave("", { channel: { id: await DataStore.get('encryptcordChannelId') } });
|
await leave("", { channel: { id: await DataStore.get('encryptcordChannelId') } });
|
||||||
} else if (await DataStore.get('encryptcordGroup') == true) {
|
} else if (await DataStore.get('encryptcordGroup') == true) {
|
||||||
|
setButtonDisabled(false);
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
await startGroup("", { channel: { id: getCurrentChannel().id } });
|
await startGroup("", { channel: { id: getCurrentChannel().id } });
|
||||||
|
@ -191,12 +192,7 @@ export default definePlugin({
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const dmChannelId = await RestAPI.post({
|
const dmChannelId = await PrivateChannelsStore.getOrEnsurePrivateChannel(message.author.id);
|
||||||
url: `/users/@me/channels`,
|
|
||||||
body: {
|
|
||||||
recipient_id: message.author.id,
|
|
||||||
},
|
|
||||||
}).then((response) => response.body.id);
|
|
||||||
if (channelId !== dmChannelId) return;
|
if (channelId !== dmChannelId) return;
|
||||||
const sender = await UserUtils.getUser(message.author.id).catch(() => null);
|
const sender = await UserUtils.getUser(message.author.id).catch(() => null);
|
||||||
if (!sender) return;
|
if (!sender) return;
|
||||||
|
@ -277,14 +273,7 @@ export default definePlugin({
|
||||||
// Send Temporary Message
|
// Send Temporary Message
|
||||||
async function sendTempMessage(recipientId: string, attachment: string, content: string, dm: boolean = true) {
|
async function sendTempMessage(recipientId: string, attachment: string, content: string, dm: boolean = true) {
|
||||||
if (recipientId == UserStore.getCurrentUser().id) return;
|
if (recipientId == UserStore.getCurrentUser().id) return;
|
||||||
|
const dmChannelId = dm ? await PrivateChannelsStore.getOrEnsurePrivateChannel(recipientId) : recipientId;
|
||||||
const dmChannelId = dm ? await RestAPI.post({
|
|
||||||
url: `/users/@me/channels`,
|
|
||||||
body: {
|
|
||||||
recipient_id: recipientId,
|
|
||||||
},
|
|
||||||
}).then((response) => response.body.id) : recipientId;
|
|
||||||
|
|
||||||
if (attachment && attachment != "") {
|
if (attachment && attachment != "") {
|
||||||
const upload = await new CloudUtils.CloudUpload({
|
const upload = await new CloudUtils.CloudUpload({
|
||||||
file: new File([new Blob([attachment])], "file.text", { type: "text/plain; charset=utf-8" }),
|
file: new File([new Blob([attachment])], "file.text", { type: "text/plain; charset=utf-8" }),
|
||||||
|
|
Loading…
Add table
Reference in a new issue