rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't try to parse empty qrJson on add from text

This commit is contained in:
LenAnderson 2024-07-23 11:40:23 -04:00
parent 3b2dcd60da
commit 80879e0c51
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
public/scripts/extensions/quick-reply/src/QuickReplySet.js
View File

@ -241,22 +241,26 @@ export class QuickReplySet {
}
addQuickReplyFromText(qrJson) {
let data;
try {
data = JSON.parse(qrJson ?? '{}');
delete data.id;
} catch {
// not JSON data
}
if (data) {
// JSON data
if (data.label === undefined || data.message === undefined) {
// not a QR
toastr.error('Not a QR.');
return;
if (qrJson) {
try {
data = JSON.parse(qrJson ?? '{}');
delete data.id;
} catch {
// not JSON data
}
if (data) {
// JSON data
if (data.label === undefined || data.message === undefined) {
// not a QR
toastr.error('Not a QR.');
return;
}
} else {
// no JSON, use plaintext as QR message
data = { message: qrJson };
}
} else {
// no JSON, use plaintext as QR message
data = { message: qrJson };
data = {};
}
const newQr = this.addQuickReply(data);
return newQr;