Merge pull request #1431 from valadaptive/eslint-fixes-3

ESLint fixes part 3 - more significant changes

public/scripts/extensions/assets/index.js

@@ -13,8 +13,6 @@ const DEBUG_PREFIX = "<Assets module> ";
 let previewAudio = null;
 let ASSETS_JSON_URL = "https://raw.githubusercontent.com/SillyTavern/SillyTavern-Content/main/index.json"
 
-const extensionName = "assets";
-const extensionFolderPath = `scripts/extensions/${extensionName}`;
 
 // DBG
 //if (DEBUG_TONY_SAMA_FORK_MODE)
@@ -26,9 +24,6 @@ let currentAssets = {};
 //  Extension UI and Settings  //
 //#############################//
 
-const defaultSettings = {
-}
-
 function downloadAssetsList(url) {
     updateCurrentAssets().then(function () {
         fetch(url, { cache: "no-cache" })

public/scripts/extensions/expressions/index.js

@@ -1,4 +1,4 @@
-import { callPopup, eventSource, event_types, getRequestHeaders, saveSettingsDebounced, this_chid } from "../../../script.js";
+import { callPopup, eventSource, event_types, getRequestHeaders, saveSettingsDebounced } from "../../../script.js";
 import { dragElement, isMobile } from "../../RossAscends-mods.js";
 import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper, doExtrasFetch, renderExtensionTemplate } from "../../extensions.js";
 import { loadMovingUIState, power_user } from "../../power-user.js";
@@ -393,7 +393,6 @@ async function unloadLiveChar() {
         if (!loadResponse.ok) {
             throw new Error(loadResponse.statusText);
         }
-        const loadResponseText = await loadResponse.text();
         //console.log(`Response: ${loadResponseText}`);
     } catch (error) {
         //console.error(`Error unloading - ${error}`);

public/scripts/extensions/quick-reply/index.js

@@ -623,7 +623,6 @@ function generateQuickReplyElements() {
     let quickReplyHtml = '';
 
     for (let i = 1; i <= extension_settings.quickReply.numberOfSlots; i++) {
-        let itemNumber = i + 1
         quickReplyHtml += `
         <div class="flex-container alignitemscenter" data-order="${i}">
             <span class="drag-handle ui-sortable-handle">☰</span>

public/scripts/extensions/quick-reply/src/ContextMenu.js

@@ -1,4 +1,6 @@
-import { MenuItem } from "./MenuItem.js";
+/**
+ * @typedef {import('./MenuItem.js').MenuItem} MenuItem
+ */
 
 export class ContextMenu {
     /**@type {MenuItem[]}*/ itemList = [];

public/scripts/extensions/quick-reply/src/SubMenu.js

@@ -1,4 +1,6 @@
-import { MenuItem } from "./MenuItem.js";
+/**
+ * @typedef {import('./MenuItem.js').MenuItem} MenuItem
+ */
 
 export class SubMenu {
     /**@type {MenuItem[]}*/ itemList = [];

public/scripts/extensions/stable-diffusion/index.js

@@ -2362,7 +2362,6 @@ async function sdMessageButton(e) {
     const $mes = $icon.closest('.mes');
     const message_id = $mes.attr('mesid');
     const message = context.chat[message_id];
-    const characterName = message?.name || context.name2;
     const characterFileName = context.characterId ? context.characters[context.characterId].name : context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString();
     const messageText = message?.mes;
     const hasSavedImage = message?.extra?.image && message?.extra?.title;

public/scripts/extensions/token-counter/index.js

@@ -71,16 +71,6 @@ async function doTokenCounter() {
  * @param {number[]} ids
  */
 function drawChunks(chunks, ids) {
-    const main_text_color = rgb2hex((getComputedStyle(document.documentElement).getPropertyValue('--SmartThemeBodyColor').trim()))
-    const italics_text_color = rgb2hex((getComputedStyle(document.documentElement).getPropertyValue('--SmartThemeEmColor').trim()))
-    const quote_text_color = rgb2hex((getComputedStyle(document.documentElement).getPropertyValue('--SmartThemeQuoteColor').trim()))
-    const blur_tint_color = rgb2hex((getComputedStyle(document.documentElement).getPropertyValue('--SmartThemeBlurTintColor').trim()))
-    const chat_tint_color = rgb2hex((getComputedStyle(document.documentElement).getPropertyValue('--SmartThemeChatTintColor').trim()))
-    const user_mes_blur_tint_color = rgb2hex((getComputedStyle(document.documentElement).getPropertyValue('--SmartThemeUserMesBlurTintColor').trim()))
-    const bot_mes_blur_tint_color = rgb2hex((getComputedStyle(document.documentElement).getPropertyValue('--SmartThemeBotMesBlurTintColor').trim()))
-    const shadow_color = rgb2hex((getComputedStyle(document.documentElement).getPropertyValue('--SmartThemeShadowColor').trim()))
-    const border_color = rgb2hex((getComputedStyle(document.documentElement).getPropertyValue('--SmartThemeBorderColor').trim()))
-
     const pastelRainbow = [
         //main_text_color,
         //italics_text_color,

public/scripts/extensions/tts/coqui.js

@@ -4,17 +4,15 @@ TODO:
  - Delete useless call
 */
 
-import { doExtrasFetch, extension_settings, getApiUrl, getContext, modules, ModuleWorkerWrapper } from "../../extensions.js"
+import { doExtrasFetch, extension_settings, getApiUrl, modules } from "../../extensions.js"
 import { callPopup } from "../../../script.js"
 import { initVoiceMap } from "./index.js"
 
 export { CoquiTtsProvider }
 
 const DEBUG_PREFIX = "<Coqui TTS module> ";
-const UPDATE_INTERVAL = 1000;
 
 let inApiCall = false;
-let voiceIdList = []; // Updated with module worker
 let coquiApiModels = {}; // Initialized only once
 let coquiApiModelsFull = {}; // Initialized only once
 let coquiLocalModels = []; // Initialized only once
@@ -495,7 +493,7 @@ class CoquiTtsProvider {
                 .append('<option value="none">Select language</option>')
                 .val('none');
 
-            for (var i = 0; i < model_settings["languages"].length; i++) {
+            for (let i = 0; i < model_settings["languages"].length; i++) {
                 const language_label = JSON.stringify(model_settings["languages"][i]).replaceAll("\"", "");
                 $("#coqui_api_model_settings_language").append(new Option(language_label, i));
             }
@@ -514,7 +512,7 @@ class CoquiTtsProvider {
                 .append('<option value="none">Select speaker</option>')
                 .val('none');
 
-            for (var i = 0; i < model_settings["speakers"].length; i++) {
+            for (let i = 0; i < model_settings["speakers"].length; i++) {
                 const speaker_label = JSON.stringify(model_settings["speakers"][i]).replaceAll("\"", "");
                 $("#coqui_api_model_settings_speaker").append(new Option(speaker_label, i));
             }

public/scripts/extensions/tts/index.js

@@ -17,10 +17,7 @@ const UPDATE_INTERVAL = 1000
 
 let voiceMapEntries = []
 let voiceMap = {} // {charName:voiceid, charName2:voiceid2}
-let audioControl
 let storedvalue = false;
-let lastCharacterId = null
-let lastGroupId = null
 let lastChatId = null
 let lastMessageHash = null
 
@@ -314,8 +311,6 @@ let currentAudioJob
 let audioPaused = false
 let audioQueueProcessorReady = true
 
-let lastAudioPosition = 0
-
 async function playAudioData(audioBlob) {
     // Since current audio job can be cancelled, don't playback if it is null
     if (currentAudioJob == null) {
@@ -407,14 +402,12 @@ function addAudioControl() {
             TTS Playback
         </div>`)
     $('#ttsExtensionMenuItem').attr('title', 'TTS play/pause').on('click', onAudioControlClicked)
-    audioControl = document.getElementById('tts_media_control')
     updateUiAudioPlayState()
 }
 
 function completeCurrentAudioJob() {
     audioQueueProcessorReady = true
     currentAudioJob = null
-    lastAudioPosition = 0
     talkingAnimation(false) //stop lip animation
     // updateUiPlayState();
 }
@@ -463,8 +456,6 @@ function completeTtsJob() {
 
 function saveLastValues() {
     const context = getContext()
-    lastGroupId = context.groupId
-    lastCharacterId = context.characterId
     lastChatId = context.chatId
     lastMessageHash = getStringHash(
         (context.chat.length && context.chat[context.chat.length - 1].mes) ?? ''

public/scripts/extensions/tts/system.js

@@ -191,7 +191,7 @@ class SystemTtsProvider {
         const voice = speechSynthesis.getVoices().find(x => x.voiceURI === voiceId);
 
         if (!voice) {
-            throw `TTS Voice name ${voiceName} not found`
+            throw `TTS Voice id ${voiceId} not found`
         }
 
         speechSynthesis.cancel();

public/scripts/extensions/tts/xtts.js

@@ -133,8 +133,7 @@ class XTTSTtsProvider {
 
     // Perform a simple readiness check by trying to fetch voiceIds
     async checkReady() {
-
-        const response = await this.fetchTtsVoiceObjects()
+        await this.fetchTtsVoiceObjects()
     }
 
     async onRefreshClick() {