mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
#2515 Use /cut in /del
This commit is contained in:
@ -2734,45 +2734,26 @@ async function doDelMode(_, text) {
|
|||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
//first enter delmode
|
// Just enter the delete mode.
|
||||||
|
if (!text) {
|
||||||
$('#option_delete_mes').trigger('click', { fromSlashCommand: true });
|
$('#option_delete_mes').trigger('click', { fromSlashCommand: true });
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
//parse valid args
|
const count = Number(text);
|
||||||
if (text) {
|
|
||||||
await delay(300); //same as above, need event signal for 'entered del mode'
|
|
||||||
console.debug('parsing msgs to del');
|
|
||||||
let numMesToDel = Number(text);
|
|
||||||
let lastMesID = Number($('#chat .mes').last().attr('mesid'));
|
|
||||||
let oldestMesIDToDel = lastMesID - numMesToDel + 1;
|
|
||||||
|
|
||||||
if (oldestMesIDToDel < 0) {
|
// Nothing to delete.
|
||||||
|
if (count < 1) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (count > chat.length) {
|
||||||
toastr.warning(`Cannot delete more than ${chat.length} messages.`);
|
toastr.warning(`Cannot delete more than ${chat.length} messages.`);
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
let oldestMesToDel = $('#chat').find(`.mes[mesid=${oldestMesIDToDel}]`);
|
const range = `${chat.length - count}-${chat.length - 1}`;
|
||||||
|
return doMesCut(_, range);
|
||||||
if (!oldestMesIDToDel && lastMesID > 0) {
|
|
||||||
oldestMesToDel = await loadUntilMesId(oldestMesIDToDel);
|
|
||||||
|
|
||||||
if (!oldestMesToDel || !oldestMesToDel.length) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let oldestDelMesCheckbox = $(oldestMesToDel).find('.del_checkbox');
|
|
||||||
let newLastMesID = oldestMesIDToDel - 1;
|
|
||||||
console.debug(`DelMesReport -- numMesToDel: ${numMesToDel}, lastMesID: ${lastMesID}, oldestMesIDToDel:${oldestMesIDToDel}, newLastMesID: ${newLastMesID}`);
|
|
||||||
oldestDelMesCheckbox.trigger('click');
|
|
||||||
let trueNumberOfDeletedMessage = lastMesID - oldestMesIDToDel + 1;
|
|
||||||
|
|
||||||
//await delay(1)
|
|
||||||
$('#dialogue_del_mes_ok').trigger('click');
|
|
||||||
toastr.success(`Deleted ${trueNumberOfDeletedMessage} messages.`);
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
|
|
||||||
return '';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function doResetPanels() {
|
function doResetPanels() {
|
||||||
|
Reference in New Issue
Block a user