rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

code clean up, change fav to use bool, use template instead of dynamic html, etc

Browse Source
This commit is contained in:
Wilfred Chen
2023-04-23 02:38:24 +08:00
parent be3eb37b6e
commit 2aa42991fd
5 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/index.html
View File

@ -1423,7 +1423,7 @@
</a> </a>
</div> </div>
<div> <div>
<input type="checkbox" id="fav_checkbox" name="fav" value="1"/> <input type="checkbox" id="fav_checkbox" name="fav"/>
</div> </div>
</div> </div>
@ -1533,6 +1533,7 @@
<div class="fa-solid fa-user-group"></div> <div class="fa-solid fa-user-group"></div>
</div> </div>
<div class="ch_name"></div> <div class="ch_name"></div>
<i class='group_fav_icon fa-solid fa-star fa-2xs'></i>
<input class="ch_fav" value="" hidden /> <input class="ch_fav" value="" hidden />
</div> </div>
</div> </div>
@ -1549,7 +1550,7 @@
<div id="rm_button_create" title="Create New Character" class="menu_button fa-solid fa-user-plus "></div> <div id="rm_button_create" title="Create New Character" class="menu_button fa-solid fa-user-plus "></div>
<div id="character_import_button" title="Import Character from File" class="menu_button fa-solid fa-file-arrow-up "></div> <div id="character_import_button" title="Import Character from File" class="menu_button fa-solid fa-file-arrow-up "></div>
<div id="rm_button_group_chats" title="Create New Chat Group" class="menu_button fa-solid fa-users-gear "></div> <div id="rm_button_group_chats" title="Create New Chat Group" class="menu_button fa-solid fa-users-gear "></div>
<div id="filter_by_fav" title="Filter By Favorite" class="menu_button fa-solid fa-star "></div> <div id="filter_by_fav" title="Filter By Favorite" class="menu_button fa-solid fa-star"></div>
</div> </div>
<form id="form_character_search_form" action="javascript:void(null);"> <form id="form_character_search_form" action="javascript:void(null);">
<input id="character_search_bar" class="text_pole" type="search" placeholder="Character search..." maxlength="50" /> <input id="character_search_bar" class="text_pole" type="search" placeholder="Character search..." maxlength="50" />

21
public/script.js
View File

@ -203,6 +203,7 @@ let dialogueResolve = null;
let chat_metadata = {}; let chat_metadata = {};
let streamingProcessor = null; let streamingProcessor = null;
let fav_ch_checked = false;
window.filterByFav = false; window.filterByFav = false;
const durationSaveEdit = 200; const durationSaveEdit = 200;
@ -647,7 +648,7 @@ function printCharacters() {
`<div class=character_select chid=${i} id="CharID${i}"> `<div class=character_select chid=${i} id="CharID${i}">
<div class=avatar><img src="${this_avatar}"></div> <div class=avatar><img src="${this_avatar}"></div>
<div class=ch_name>${item.name} ${item.fav === "1" ? '<i class="fa-solid fa-star fa-2xs"></i>' : ''}</div> <div class=ch_name>${item.name} ${item.fav ? '<i class="fa-solid fa-star fa-2xs"></i>' : ''}</div>
<input class="ch_fav" value=${item.fav} hidden /> <input class="ch_fav" value=${item.fav} hidden />
</div>` </div>`
); );
@ -3156,7 +3157,7 @@ function select_selected_character(chid) {
this_avatar = getThumbnailUrl('avatar', characters[chid].avatar); this_avatar = getThumbnailUrl('avatar', characters[chid].avatar);
} }
characters[chid].fav === "1" ? $("#fav_checkbox").prop("checked", true) : $("#fav_checkbox").prop("checked", false); $("#fav_checkbox").prop("checked", characters[chid].fav);
$("#avatar_load_preview").attr("src", this_avatar); $("#avatar_load_preview").attr("src", this_avatar);
$("#name_div").css("display", "none"); $("#name_div").css("display", "none");
@ -3755,21 +3756,23 @@ $(document).ready(function () {
}); });
$("#filter_by_fav").click(function() { $("#filter_by_fav").click(function() {
filterByFav === true ? filterByFav = false : filterByFav = true; filterByFav = !filterByFav;
const selector = ['#rm_print_characters_block .character_select', '#rm_print_characters_block .group_select'].join(','); const selector = ['#rm_print_characters_block .character_select', '#rm_print_characters_block .group_select'].join(',');
if(filterByFav === true){ if(filterByFav){
$(selector).each(function () { $(selector).each(function () {
if($(this).children(".ch_fav").length !== 0){ if($(this).children(".ch_fav").length !== 0){
$(this).children(".ch_fav").val().toLowerCase().includes(1) $(this).children(".ch_fav").val().toLowerCase().includes(true)
? $(this).show() ? $(this).show()
: $(this).hide(); : $(this).hide();
} }
}); });
$("#filter_by_fav").css("color","#FFFF00"); $("#filter_by_fav").removeClass("fav_off");
$("#filter_by_fav").addClass("fav_on");
}else{ }else{
$(selector).show(); $(selector).show();
$("#filter_by_fav").css("color","#FFFFFF"); $("#filter_by_fav").removeClass("fav_on");
$("#filter_by_fav").addClass("fav_off");
} }
}); });
@ -3815,6 +3818,7 @@ $(document).ready(function () {
selected_button = "character_edit"; selected_button = "character_edit";
select_selected_character(this_chid); select_selected_character(this_chid);
} }
$("#character_search_bar").val("").trigger("input");
}); });
$(document).on("click", ".character_select", function () { $(document).on("click", ".character_select", function () {
@ -4108,6 +4112,8 @@ $(document).ready(function () {
$("#rm_info_avatar").html(""); $("#rm_info_avatar").html("");
let save_name = create_save_name; let save_name = create_save_name;
var formData = new FormData($("#form_create").get(0)); var formData = new FormData($("#form_create").get(0));
formData.set('fav', fav_ch_checked);
console.log(formData.get('fav'));
if ($("#form_create").attr("actiontype") == "createcharacter") { if ($("#form_create").attr("actiontype") == "createcharacter") {
if ($("#character_name_pole").val().length > 0) { if ($("#character_name_pole").val().length > 0) {
//if the character name text area isn't empty (only posible when creating a new character) //if the character name text area isn't empty (only posible when creating a new character)
@ -4281,6 +4287,7 @@ $(document).ready(function () {
}); });
$("#fav_checkbox").change(function(){ $("#fav_checkbox").change(function(){
fav_ch_checked = $(this).prop("checked");
saveCharacterDebounced(); saveCharacterDebounced();
}); });

18
public/scripts/group-chats.js
View File

@ -211,11 +211,11 @@ async function getGroups() {
function printGroups() { function printGroups() {
for (let group of groups) { for (let group of groups) {
const renderStar = group.fav === "1" ? "<i class='fa-solid fa-star fa-2xs'></i>" : ""
const template = $("#group_list_template .group_select").clone(); const template = $("#group_list_template .group_select").clone();
template.data("id", group.id); template.data("id", group.id);
template.attr("grid", group.id); template.attr("grid", group.id);
template.find(".ch_name").html(group.name + " " + renderStar); template.find(".ch_name").html(group.name);
group.fav ? template.find(".group_fav_icon").show() : template.find(".group_fav_icon").hide();
template.find(".ch_fav").val(group.fav); template.find(".ch_fav").val(group.fav);
$("#rm_print_characters_block").prepend(template); $("#rm_print_characters_block").prepend(template);
updateGroupAvatar(group); updateGroupAvatar(group);
@ -754,7 +754,7 @@ function select_group_chats(chat_id, skipAnimation) {
const groupHasMembers = !!$("#rm_group_members").children().length; const groupHasMembers = !!$("#rm_group_members").children().length;
$("#rm_group_submit").prop("disabled", !groupHasMembers); $("#rm_group_submit").prop("disabled", !groupHasMembers);
$("#rm_group_allow_self_responses").prop("checked", group && group.allow_self_responses); $("#rm_group_allow_self_responses").prop("checked", group && group.allow_self_responses);
$("#rm_group_fav").prop("checked", group && group.fav === "1"); $("#rm_group_fav").prop("checked", group && group.fav);
// bottom buttons // bottom buttons
if (chat_id) { if (chat_id) {
@ -780,11 +780,7 @@ function select_group_chats(chat_id, skipAnimation) {
$("#rm_group_fav").on("input", async function(){ $("#rm_group_fav").on("input", async function(){
if (group) { if (group) {
const value = $(this).prop("checked"); const value = $(this).prop("checked");
if(value === true){ group.fav = value;
group.fav = "1";
}else{
group.fav = "0";
}
await editGroup(chat_id); await editGroup(chat_id);
} }
}); });
@ -845,7 +841,8 @@ $(document).ready(() => {
chat.length = 0; chat.length = 0;
await getGroupChat(id); await getGroupChat(id);
//to avoid the filter being lit up yellow and left at true while the list of character and group reseted. //to avoid the filter being lit up yellow and left at true while the list of character and group reseted.
$("#filter_by_fav").css("color","#ffffff"); $("#filter_by_fav").removeClass("fav_on");
$("#filter_by_fav").addClass("fav_off");
filterByFav = false; filterByFav = false;
} }
@ -870,8 +867,7 @@ $(document).ready(() => {
$("#rm_group_submit").click(async function () { $("#rm_group_submit").click(async function () {
let name = $("#rm_group_chat_name").val(); let name = $("#rm_group_chat_name").val();
let allow_self_responses = !!$("#rm_group_allow_self_responses").prop("checked"); let allow_self_responses = !!$("#rm_group_allow_self_responses").prop("checked");
let fav = !!$("#rm_group_fav").prop("checked"); let fav = $("#rm_group_fav").prop("checked");
fav === true ? fav ="1" : fav = "0"
let activation_strategy = $('input[name="rm_group_activation_strategy"]:checked').val() ?? group_activation_strategy.NATURAL; let activation_strategy = $('input[name="rm_group_activation_strategy"]:checked').val() ?? group_activation_strategy.NATURAL;
const members = $("#rm_group_members .group_member") const members = $("#rm_group_members .group_member")
.map((_, x) => $(x).data("id")) .map((_, x) => $(x).data("id"))

13
public/style.css
View File

@ -909,6 +909,12 @@ select option:not(:checked) {
cursor: not-allowed; cursor: not-allowed;
} }
.fav_on {
color: #ffff00 !important;
}
.fav_off {
color: #fff !important;
}
#api_url_text, #api_url_text,
#textgenerationwebui_api_url_text { #textgenerationwebui_api_url_text {
@ -1145,7 +1151,7 @@ input[type=search]:focus::-webkit-search-cancel-button {
#fav_chara { #fav_chara {
border: none; border: none;
font-size: 14px; font-size: var(--mainFontSize);
display: flex; display: flex;
} }
@ -2495,12 +2501,15 @@ h5 {
} }
.group_select .ch_name { .group_select .ch_name {
flex-grow: 1;
max-width: calc(100% - 100px); max-width: calc(100% - 100px);
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.group_select .group_fav_icon{
margin-left: 5px;
}
#typing_indicator_template { #typing_indicator_template {
display: none !important; display: none !important;
} }

2
server.js
View File

@ -675,7 +675,7 @@ function checkServer() {
//***************** Main functions //***************** Main functions
function charaFormatData(data) { function charaFormatData(data) {
var char = { "name": data.ch_name, "description": data.description, "personality": data.personality, "first_mes": data.first_mes, "avatar": 'none', "chat": data.ch_name + ' - ' + humanizedISO8601DateTime(), "mes_example": data.mes_example, "scenario": data.scenario, "create_date": humanizedISO8601DateTime(), "talkativeness": data.talkativeness, "fav": data.fav ? data.fav : "0" }; var char = { "name": data.ch_name, "description": data.description, "personality": data.personality, "first_mes": data.first_mes, "avatar": 'none', "chat": data.ch_name + ' - ' + humanizedISO8601DateTime(), "mes_example": data.mes_example, "scenario": data.scenario, "create_date": humanizedISO8601DateTime(), "talkativeness": data.talkativeness, "fav": data.fav ? data.fav : false };
return char; return char;
} }
app.post("/createcharacter", urlencodedParser, function (request, response) { app.post("/createcharacter", urlencodedParser, function (request, response) {