This commit is contained in:
Mirco Wittrien 2022-04-10 10:18:04 +02:00
parent 617a7ca9dc
commit a2c9b5d62f
5 changed files with 25 additions and 35 deletions

View File

@ -9,6 +9,7 @@
"Messages": {"props": ["jumpToMessage", "hasAfterCached", "forEach"]},
"Relationship": {"strings": ["status", "mutualGuilds", "nickname"], "value": "Row"},
"Timestamp": {"props": ["add", "dayOfYear", "hasAlignedHourOffset"]},
"Upload": {"strings": ["this.item", "this.classification", "this.showLargeMessageDialog"], "value": "Upload"},
"User": {"props": ["hasFlag", "isLocalBot", "isClaimed"]}
},
"LibraryModules": {

View File

@ -2,7 +2,7 @@
* @name ChatAliases
* @author DevilBro
* @authorId 278543574059057154
* @version 2.3.5
* @version 2.3.6
* @description Allows you to configure your own Aliases/Commands
* @invite Jx3TjNS
* @donate https://www.paypal.me/MircoWittrien
@ -17,7 +17,7 @@ module.exports = (_ => {
"info": {
"name": "ChatAliases",
"author": "DevilBro",
"version": "2.3.5",
"version": "2.3.6",
"description": "Allows you to configure your own Aliases/Commands"
}
};
@ -389,14 +389,13 @@ module.exports = (_ => {
handleSubmit (e, e2) {
if (!this.settings.general.replaceBeforeSend || BDFDB.LibraryModules.SlowmodeUtils.getSlowmodeCooldownGuess(e.instance.props.channel.id) > 0) return;
let originalMethodArguments = e2.methodArguments[0];
let isObject = BDFDB.ObjectUtils.is(originalMethodArguments);
let textValue = isObject ? e2.methodArguments[0].value : e2.methodArguments[0];
let messageData = this.formatText(textValue);
let messageData = this.formatText(e2.methodArguments[0].value);
if (messageData) {
if (messageData.text != null && textValue != messageData.text) {
if (isObject) e2.methodArguments[0].value = messageData.text;
else e2.methodArguments[0] = messageData.text;
if (messageData.files.length > 0 && (BDFDB.DMUtils.isDMChannel(e.instance.props.channel.id) || BDFDB.UserUtils.can("ATTACH_FILES"))) {
for (let file of messageData.files) e2.methodArguments[0].uploads.push(new BDFDB.DiscordObjects.Upload({file: file, platform: 1}));
}
if (messageData.text != null && e2.methodArguments[0].value != messageData.text) {
e2.methodArguments[0].value = messageData.text;
e.instance.props.textValue = "";
if (e.instance.props.richValue) e.instance.props.richValue = BDFDB.SlateUtils.toRichValue("");
if (e.instance.state) {
@ -405,11 +404,6 @@ module.exports = (_ => {
}
BDFDB.ReactUtils.forceUpdate(e.instance);
}
if (messageData.files.length > 0 && (BDFDB.DMUtils.isDMChannel(e.instance.props.channel.id) || BDFDB.UserUtils.can("ATTACH_FILES"))) {
let reply = BDFDB.LibraryModules.MessageReplyStore.getPendingReply(e.instance.props.channel.id);
if (reply && !messageData.text) BDFDB.LibraryModules.UploadUtils.upload(e.instance.props.channel.id, messageData.files.shift(), "", false);
BDFDB.LibraryModules.UploadUtils.instantBatchUpload(e.instance.props.channel.id, messageData.files);
}
}
}

View File

@ -132,15 +132,12 @@ module.exports = (_ => {
processChannelTextAreaForm (e) {
BDFDB.PatchUtils.patch(this, e.instance, "handleSendMessage", {instead: e2 => {
let originalMethodArguments = e2.methodArguments[0];
let isObject = BDFDB.ObjectUtils.is(originalMethodArguments);
let textValue = isObject ? e2.methodArguments[0].value : e2.methodArguments[0];
if (textValue.length > maxMessageLength) {
if (e2.methodArguments[0].value.length > maxMessageLength) {
e2.stopOriginalMethodCall();
let messages = this.formatText(textValue).filter(n => n);
let messages = this.formatText(e2.methodArguments[0].value).filter(n => n);
for (let i in messages) BDFDB.TimeUtils.timeout(_ => {
let last = i >= messages.length-1;
e2.originalMethod(!isObject ? messages[i] : (last ? Object.assign({}, originalMethodArguments, {value: messages[i]}) : {stickers: [], uploads: [], value: messages[i]}));
e2.originalMethod(last ? Object.assign({}, e2.methodArguments[0], {value: messages[i]}) : {stickers: [], uploads: [], value: messages[i]});
if (i >= messages.length-1) BDFDB.NotificationUtils.toast(this.labels.toast_allsent, {type: "success"});
}, messageDelay * i * (messages > 4 ? 2 : 1));
return Promise.resolve({

View File

@ -637,21 +637,16 @@ module.exports = (_ => {
processChannelTextAreaForm (e) {
BDFDB.PatchUtils.patch(this, e.instance, "handleSendMessage", {instead: e2 => {
if (this.isTranslationEnabled(e.instance.props.channel.id)) {
let originalMethodArguments = e2.methodArguments[0];
let isObject = BDFDB.ObjectUtils.is(originalMethodArguments);
let textValue = isObject ? e2.methodArguments[0].value : e2.methodArguments[0];
if (textValue) {
e2.stopOriginalMethodCall();
this.translateText(textValue, messageTypes.SENT, (translation, input, output) => {
translation = !translation ? textValue : (this.settings.general.sendOriginalMessage ? (translation + "\n\n> *" + textValue.split("\n").join("*\n> *") + "*") : translation);
e2.originalMethod(!isObject ? translation : Object.assign({}, originalMethodArguments, {value: translation}));
});
return Promise.resolve({
shouldClear: true,
shouldRefocus: true
});
}
if (this.isTranslationEnabled(e.instance.props.channel.id) && e2.methodArguments[0].value) {
e2.stopOriginalMethodCall();
this.translateText(e2.methodArguments[0].value, messageTypes.SENT, (translation, input, output) => {
translation = !translation ? e2.methodArguments[0].value : (this.settings.general.sendOriginalMessage ? (translation + "\n\n> *" + e2.methodArguments[0].value.split("\n").join("*\n> *") + "*") : translation);
e2.originalMethod(Object.assign({}, e2.methodArguments[0], {value: translation}));
});
return Promise.resolve({
shouldClear: true,
shouldRefocus: true
});
}
return e2.callOriginalMethodAfterwards();
}}, {force: true, noCache: true});

View File

@ -1348,6 +1348,9 @@ img[src="/assets/4697ec960e57790ad4f6251af4c246b4.svg"] { /* widgetsettings wid
.uploadModalIn-2w48Zf .uploadDropModal-13Kd20 .inner-rBP-MS .icon-HW4tZ-.two-1t2_74 {
filter: drop-shadow(0 0 48px rgba(var(--accentcolor),.5));
}
.uploadModalIn-2w48Zf .uploadDropModal-13Kd20.error-3lNz4C .inner-rBP-MS .icon-HW4tZ-.two-1t2_74 {
filter: drop-shadow(0 0 48px rgba(216,60,63,.5));
}
.attachment-1PZZB2 {
position: relative;