mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Add per-character and per-group overrides for external media
This commit is contained in:
@@ -5,6 +5,7 @@ import {
|
||||
addCopyToCodeBlocks,
|
||||
appendMediaToMessage,
|
||||
callPopup,
|
||||
characters,
|
||||
chat,
|
||||
eventSource,
|
||||
event_types,
|
||||
@@ -12,9 +13,14 @@ import {
|
||||
getRequestHeaders,
|
||||
hideSwipeButtons,
|
||||
name2,
|
||||
reloadCurrentChat,
|
||||
saveChatDebounced,
|
||||
saveSettingsDebounced,
|
||||
showSwipeButtons,
|
||||
this_chid,
|
||||
} from '../script.js';
|
||||
import { selected_group } from './group-chats.js';
|
||||
import { power_user } from './power-user.js';
|
||||
import {
|
||||
extractTextFromHTML,
|
||||
extractTextFromMarkdown,
|
||||
@@ -416,6 +422,56 @@ export function decodeStyleTags(text) {
|
||||
});
|
||||
}
|
||||
|
||||
async function openExternalMediaOverridesDialog() {
|
||||
const entityId = getCurrentEntityId();
|
||||
|
||||
if (!entityId) {
|
||||
toastr.info('No character or group selected');
|
||||
return;
|
||||
}
|
||||
|
||||
const template = $('#forbid_media_override_template > .forbid_media_override').clone();
|
||||
template.find('.forbid_media_global_state_forbidden').toggle(power_user.forbid_external_images);
|
||||
template.find('.forbid_media_global_state_allowed').toggle(!power_user.forbid_external_images);
|
||||
|
||||
if (power_user.external_media_allowed_overrides.includes(entityId)) {
|
||||
template.find('#forbid_media_override_allowed').prop('checked', true);
|
||||
}
|
||||
else if (power_user.external_media_forbidden_overrides.includes(entityId)) {
|
||||
template.find('#forbid_media_override_forbidden').prop('checked', true);
|
||||
}
|
||||
else {
|
||||
template.find('#forbid_media_override_global').prop('checked', true);
|
||||
}
|
||||
|
||||
callPopup(template, 'text', '', { wide: false, large: false });
|
||||
}
|
||||
|
||||
export function getCurrentEntityId() {
|
||||
if (selected_group) {
|
||||
return String(selected_group);
|
||||
}
|
||||
|
||||
return characters[this_chid]?.avatar ?? null;
|
||||
}
|
||||
|
||||
export function isExternalMediaAllowed() {
|
||||
const entityId = getCurrentEntityId();
|
||||
if (!entityId) {
|
||||
return !power_user.forbid_external_images;
|
||||
}
|
||||
|
||||
if (power_user.external_media_allowed_overrides.includes(entityId)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (power_user.external_media_forbidden_overrides.includes(entityId)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return !power_user.forbid_external_images;
|
||||
}
|
||||
|
||||
jQuery(function () {
|
||||
$(document).on('click', '.mes_hide', async function () {
|
||||
const messageBlock = $(this).closest('.mes');
|
||||
@@ -511,6 +567,32 @@ jQuery(function () {
|
||||
$(this).closest('.mes').find('.mes_edit').trigger('click');
|
||||
});
|
||||
|
||||
$(document).on('click', '.open_media_overrides', openExternalMediaOverridesDialog);
|
||||
$(document).on('input', '#forbid_media_override_allowed', function () {
|
||||
const entityId = getCurrentEntityId();
|
||||
if (!entityId) return;
|
||||
power_user.external_media_allowed_overrides.push(entityId);
|
||||
power_user.external_media_forbidden_overrides = power_user.external_media_forbidden_overrides.filter((v) => v !== entityId);
|
||||
saveSettingsDebounced();
|
||||
reloadCurrentChat();
|
||||
});
|
||||
$(document).on('input', '#forbid_media_override_forbidden', function () {
|
||||
const entityId = getCurrentEntityId();
|
||||
if (!entityId) return;
|
||||
power_user.external_media_forbidden_overrides.push(entityId);
|
||||
power_user.external_media_allowed_overrides = power_user.external_media_allowed_overrides.filter((v) => v !== entityId);
|
||||
saveSettingsDebounced();
|
||||
reloadCurrentChat();
|
||||
});
|
||||
$(document).on('input', '#forbid_media_override_global', function () {
|
||||
const entityId = getCurrentEntityId();
|
||||
if (!entityId) return;
|
||||
power_user.external_media_allowed_overrides = power_user.external_media_allowed_overrides.filter((v) => v !== entityId);
|
||||
power_user.external_media_forbidden_overrides = power_user.external_media_forbidden_overrides.filter((v) => v !== entityId);
|
||||
saveSettingsDebounced();
|
||||
reloadCurrentChat();
|
||||
});
|
||||
|
||||
$('#file_form_input').on('change', onFileAttach);
|
||||
$('#file_form').on('reset', function () {
|
||||
$('#file_form').addClass('displayNone');
|
||||
|
@@ -73,6 +73,7 @@ import {
|
||||
} from '../script.js';
|
||||
import { printTagList, createTagMapFromList, applyTagsOnCharacterSelect, tag_map } from './tags.js';
|
||||
import { FILTER_TYPES, FilterHelper } from './filters.js';
|
||||
import { isExternalMediaAllowed } from './chats.js';
|
||||
|
||||
export {
|
||||
selected_group,
|
||||
@@ -176,7 +177,7 @@ async function loadGroupChat(chatId) {
|
||||
return [];
|
||||
}
|
||||
|
||||
export async function getGroupChat(groupId) {
|
||||
export async function getGroupChat(groupId, reload = false) {
|
||||
const group = groups.find((x) => x.id === groupId);
|
||||
const chat_id = group.chat_id;
|
||||
const data = await loadGroupChat(chat_id);
|
||||
@@ -216,6 +217,10 @@ export async function getGroupChat(groupId) {
|
||||
updateChatMetadata(metadata, true);
|
||||
}
|
||||
|
||||
if (reload) {
|
||||
select_group_chats(groupId, true);
|
||||
}
|
||||
|
||||
await eventSource.emit(event_types.CHAT_CHANGED, getCurrentChatId());
|
||||
}
|
||||
|
||||
@@ -1306,6 +1311,10 @@ function select_group_chats(groupId, skipAnimation) {
|
||||
$('#rm_group_delete').show();
|
||||
$('#rm_group_scenario').show();
|
||||
$('#group-metadata-controls .chat_lorebook_button').removeClass('disabled').prop('disabled', false);
|
||||
$('#group_open_media_overrides').show();
|
||||
const isMediaAllowed = isExternalMediaAllowed();
|
||||
$('#group_media_allowed_icon').toggle(isMediaAllowed);
|
||||
$('#group_media_forbidden_icon').toggle(!isMediaAllowed);
|
||||
} else {
|
||||
$('#rm_group_submit').show();
|
||||
if ($('#groupAddMemberListToggle .inline-drawer-content').css('display') !== 'block') {
|
||||
@@ -1314,6 +1323,7 @@ function select_group_chats(groupId, skipAnimation) {
|
||||
$('#rm_group_delete').hide();
|
||||
$('#rm_group_scenario').hide();
|
||||
$('#group-metadata-controls .chat_lorebook_button').addClass('disabled').prop('disabled', true);
|
||||
$('#group_open_media_overrides').hide();
|
||||
}
|
||||
|
||||
updateFavButtonState(group?.fav ?? false);
|
||||
|
@@ -255,6 +255,8 @@ let power_user = {
|
||||
auto_connect: false,
|
||||
auto_load_chat: false,
|
||||
forbid_external_images: false,
|
||||
external_media_allowed_overrides: [],
|
||||
external_media_forbidden_overrides: [],
|
||||
};
|
||||
|
||||
let themes = [];
|
||||
@@ -2761,22 +2763,35 @@ export function getCustomStoppingStrings(limit = undefined) {
|
||||
}
|
||||
|
||||
$(document).ready(() => {
|
||||
const adjustAutocompleteDebounced = debounce(() => {
|
||||
$('.ui-autocomplete-input').each(function () {
|
||||
const isOpen = $(this).autocomplete('widget')[0].style.display !== 'none';
|
||||
if (isOpen) {
|
||||
$(this).autocomplete('search');
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$(window).on('resize', async () => {
|
||||
if (isMobile()) {
|
||||
return;
|
||||
}
|
||||
|
||||
//console.log('Window resized!');
|
||||
const reportZoomLevelDebounced = debounce(() => {
|
||||
const zoomLevel = Number(window.devicePixelRatio).toFixed(2);
|
||||
const winWidth = window.innerWidth;
|
||||
const winHeight = window.innerHeight;
|
||||
console.debug(`Zoom: ${zoomLevel}, X:${winWidth}, Y:${winHeight}`);
|
||||
});
|
||||
|
||||
$(window).on('resize', async () => {
|
||||
adjustAutocompleteDebounced();
|
||||
setHotswapsDebounced();
|
||||
|
||||
if (isMobile()) {
|
||||
return;
|
||||
}
|
||||
|
||||
reportZoomLevelDebounced();
|
||||
|
||||
if (Object.keys(power_user.movingUIState).length > 0) {
|
||||
resetMovablePanels('resize');
|
||||
}
|
||||
// Adjust layout and styling here
|
||||
setHotswapsDebounced();
|
||||
});
|
||||
|
||||
// Settings that go to settings.json
|
||||
|
Reference in New Issue
Block a user