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

Reformat code

This commit is contained in:
Cohee 2023-08-20 12:37:38 +03:00
parent 84e5a63c34
commit 94754af013
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/script.js
View File

@ -7518,7 +7518,7 @@ $(document).ready(function () {
$("#character_search_bar").val("").trigger("input"); $("#character_search_bar").val("").trigger("input");
}); });
$(document).on("click", ".character_select", function() { $(document).on("click", ".character_select", function () {
const id = $(this).attr("chid"); const id = $(this).attr("chid");
selectCharacterById(id); selectCharacterById(id);
}); });

2
public/scripts/extensions/stable-diffusion/index.js
View File

@ -651,7 +651,7 @@ async function generatePrompt(quiet_prompt) {
return processReply(reply); return processReply(reply);
} }
async function sendGenerationRequest(generationType, prompt, characterName=null, callback) { async function sendGenerationRequest(generationType, prompt, characterName = null, callback) {
const prefix = generationType !== generationMode.BACKGROUND const prefix = generationType !== generationMode.BACKGROUND
? combinePrefixes(extension_settings.sd.prompt_prefix, getCharacterPrefix()) ? combinePrefixes(extension_settings.sd.prompt_prefix, getCharacterPrefix())
: extension_settings.sd.prompt_prefix; : extension_settings.sd.prompt_prefix;

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

@ -337,25 +337,25 @@ async function getGroups() {
} }
export function getGroupBlock(group) { export function getGroupBlock(group) {
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); template.find(".ch_name").html(group.name);
template.find('.group_fav_icon').css("display", 'none'); template.find('.group_fav_icon').css("display", 'none');
template.addClass(group.fav ? 'is_fav' : ''); template.addClass(group.fav ? 'is_fav' : '');
template.find(".ch_fav").val(group.fav); template.find(".ch_fav").val(group.fav);
// Display inline tags // Display inline tags
const tags = getTagsList(group.id); const tags = getTagsList(group.id);
const tagsElement = template.find('.tags'); const tagsElement = template.find('.tags');
tags.forEach(tag => appendTagToList(tagsElement, tag, {})); tags.forEach(tag => appendTagToList(tagsElement, tag, {}));
const avatar = getGroupAvatar(group); const avatar = getGroupAvatar(group);
if (avatar) { if (avatar) {
$(template).find(".avatar").replaceWith(avatar); $(template).find(".avatar").replaceWith(avatar);
} }
return template; return template;
} }
function updateGroupAvatar(group) { function updateGroupAvatar(group) {
@ -363,7 +363,7 @@ function updateGroupAvatar(group) {
$(".group_select").each(function () { $(".group_select").each(function () {
if ($(this).data("id") == group.id) { if ($(this).data("id") == group.id) {
$(this).find(".avatar").replaceWith(getGroupAvatar(group)); $(this).find(".avatar").replaceWith(getGroupAvatar(group));
} }
}); });
} }
@ -382,7 +382,7 @@ function getGroupAvatar(group) {
if (!group) { if (!group) {
return $(`<div class="avatar"><img src="${default_avatar}"></div>`); return $(`<div class="avatar"><img src="${default_avatar}"></div>`);
} }
// if isDataURL or if it's a valid local file url // if isDataURL or if it's a valid local file url
if (isValidImageUrl(group.avatar_url)) { if (isValidImageUrl(group.avatar_url)) {
return $(`<div class="avatar"><img src="${group.avatar_url}"></div>`); return $(`<div class="avatar"><img src="${group.avatar_url}"></div>`);
} }
@ -1132,7 +1132,7 @@ function select_group_chats(groupId, skipAnimation) {
$("#rm_group_automode_label").hide(); $("#rm_group_automode_label").hide();
} }
eventSource.emit('groupSelected', {detail: {id: openGroupId, group: group}}); eventSource.emit('groupSelected', { detail: { id: openGroupId, group: group } });
} }
/** /**

2
public/scripts/utils.js
View File

@ -565,7 +565,7 @@ export function extractDataFromPng(data, identifier = 'chara') {
* @returns {Promise<string>} - Resolves to the saved image's path on the server. * @returns {Promise<string>} - Resolves to the saved image's path on the server.
* Rejects with an error if the upload fails. * Rejects with an error if the upload fails.
*/ */
export async function saveBase64AsFile(base64Data, characterName, filename="", ext) { export async function saveBase64AsFile(base64Data, characterName, filename = "", ext) {
// Construct the full data URL // Construct the full data URL
const format = ext; // Extract the file extension (jpg, png, webp) const format = ext; // Extract the file extension (jpg, png, webp)
const dataURL = `data:image/${format};base64,${base64Data}`; const dataURL = `data:image/${format};base64,${base64Data}`;

8
server.js
View File

@ -2656,13 +2656,13 @@ app.post('/uploadimage', jsonParser, async (request, response) => {
// Constructing filename and path // Constructing filename and path
let filename = `${Date.now()}.${format}`; let filename = `${Date.now()}.${format}`;
if(request.body.filename){ if (request.body.filename) {
filename = `${request.body.filename}.${format}`; filename = `${request.body.filename}.${format}`;
} }
// if character is defined, save to a sub folder for that character // if character is defined, save to a sub folder for that character
let pathToNewFile = path.join(directories.userImages, filename); let pathToNewFile = path.join(directories.userImages, filename);
if(request.body.ch_name){ if (request.body.ch_name) {
pathToNewFile = path.join(directories.userImages, request.body.ch_name, filename); pathToNewFile = path.join(directories.userImages, request.body.ch_name, filename);
} }
@ -2672,7 +2672,7 @@ app.post('/uploadimage', jsonParser, async (request, response) => {
await fs.promises.writeFile(pathToNewFile, imageBuffer); await fs.promises.writeFile(pathToNewFile, imageBuffer);
// send the path to the image, relative to the client folder, which means removing the first folder from the path which is 'public' // send the path to the image, relative to the client folder, which means removing the first folder from the path which is 'public'
pathToNewFile = pathToNewFile.split(path.sep).slice(1).join(path.sep); pathToNewFile = pathToNewFile.split(path.sep).slice(1).join(path.sep);
response.send({ path:pathToNewFile }); response.send({ path: pathToNewFile });
} catch (error) { } catch (error) {
console.log(error); console.log(error);
response.status(500).send({ error: "Failed to save the image" }); response.status(500).send({ error: "Failed to save the image" });