feat: Add Character Quick Reply Sets (#4215) * charQR * fix * fix_2 * fix_3 * Fix refresh errors and Implement confirmation dialog logic * FIX : The character's quick reply set is executed three times during the initial authorization and import. * Enhance warning dialog content and layout * refactor: Use local linking for Char QR sets instead of embedding * Lint fixes * Clean-up * Emit CHAT_CHANGED on character deletion * Remove isVisible filter, I'm sure it was by design * Revert order of search in executeQuickReplyByName * fix: Address review comments * Add private tag to Char Sets * Add QR rebind on renamed character * Clean-up diff * Don't save empty config lists --------- Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>

f107df8ca6196470005497187959e85aeb4eb292

MAX-TAB <60381043+MAX-TAB@users.noreply.github.com>

Signed

Parents: deb07bd6cb1bd3bb500eca1ec32f1422d52fda69

public/script.js+1 -0 Viewed

     await getCharacters();
     await printMessages();
     saveSettingsDebounced();
 +    await eventSource.emit(event_types.CHAT_CHANGED, getCurrentChatId());
+}
 /**

public/scripts/extensions/quick-reply/html/settings.html+13 -0 Viewed

 			<hr>
 +			<div id="qr--character">
 +				<div class="qr--head">
 +					<div class="qr--title" data-i18n="Character Quick Reply Sets">Character Quick Reply Sets</div>
 +					<small data-i18n="(Private)">(Private)</small>
 +					<div class="qr--actions">
 +						<div class="qr--setListAdd menu_button menu_button_icon fa-solid fa-plus" id="qr--character-setListAdd" title="Add quick reply set"></div>
 +					</div>
 +				</div>
 +				<div id="qr--character-setList" class="qr--setList"></div>
 +			</div>
++
 +			<hr>
++
 			<div id="qr--editor">
 				<div class="qr--head">
 					<div class="qr--title" data-i18n="Edit Quick Replies">Edit Quick Replies</div>

public/scripts/extensions/quick-reply/index.js+68 -3 Viewed

 import { chat, chat_metadata, eventSource, event_types, getRequestHeaders, this_chid, characters } from '../../../script.js';
 import { extension_settings } from '../../extensions.js';
 import { QuickReplyApi } from './api/QuickReplyApi.js';
 import { AutoExecuteHandler } from './src/AutoExecuteHandler.js';

 import { ButtonUi } from './src/ui/ButtonUi.js';
 import { SettingsUi } from './src/ui/SettingsUi.js';
 import { debounceAsync } from '../../utils.js';
 +import { selected_group } from '../../group-chats.js';
 export { debounceAsync };

 let isReady = false;
 /** @type {Function[]}*/
 let executeQueue = [];
 +/** @type {string}*/
 +let lastCharId;
 /** @type {QuickReplySettings}*/
 let settings;
 /** @type {SettingsUi} */

@@ -123,6 +126,8 @@ const loadSettings = async () => {
123	126	}
124	127	try {
125	128	settings = QuickReplySettings.from(extension_settings.quickReplyV2);
	129	+ settings.config.scope = 'global';
	130	+ settings.config.onUpdate = () => settings.save();
126	131	} catch (ex) {
127	132	settings = QuickReplySettings.from(defaultSettings);
128	133	}

+    }
 };
 +const handleCharChange = () => {
 +    if (lastCharId === this_chid) return;
 +    // Unload the old character's config and update the character ID cache.
 +    settings.charConfig = null;
 +    lastCharId = this_chid;
 +    // If no character is loaded, there's nothing more to do.
 +    /** @type {import('../../char-data.js').v1CharData} */
 +    const character = characters[this_chid];
 +    if (!character || selected_group) {
 +        return;
 +    }
++
 +    // Get the character-specific config from the local settings storage.
 +    let charConfig = settings.characterConfigs[character.avatar];
++
 +    // If no config exists for this character, create a new one.
 +    if (!charConfig) {
 +        charConfig = QuickReplyConfig.from({ setList: [] });
 +        settings.characterConfigs[character.avatar] = charConfig;
 +    }
++
 +    charConfig.scope = 'character';
 +    // The main settings save function will handle persistence.
 +    charConfig.onUpdate = () => settings.save();
 +    settings.charConfig = charConfig;
 +};
 const init = async () => {
     await loadSets();

     settings.onSave = ()=>buttons.refresh();
     window['executeQuickReplyByName'] = async(name, args = {}, options = {}) => {
 -        let qr = [...settings.config.setList, ...(settings.chatConfig?.setList ?? [])]
 +        let qr = [
 +            ...settings.config.setList,
 +            ...(settings.chatConfig?.setList ?? []),
 +            ...(settings.charConfig?.setList ?? []),
 +        ]
             .map(it => it.set.qrList)
             .flat()
             .find(it=>it.label == name)

 };
 await init();
 +const purgeCharacterQuickReplySets = ({ character }) => {
 +    // Remove the character's Quick Reply Sets from the settings.
 +    const avatar = character?.avatar;
 +    if (avatar && avatar in settings.characterConfigs) {
 +        log(`Purging Quick Reply Sets for character: ${avatar}`);
 +        delete settings.characterConfigs[avatar];
 +        settings.save();
 +    }
 +};
++
 +const updateCharacterQuickReplySets = (oldAvatar, newAvatar) => {
 +    // Update the character's Quick Reply Sets in the settings.
 +    if (oldAvatar && newAvatar && oldAvatar !== newAvatar) {
 +        log(`Updating Quick Reply Sets for character: ${oldAvatar} -> ${newAvatar}`);
 +        if (settings.characterConfigs[oldAvatar]) {
 +            settings.characterConfigs[newAvatar] = settings.characterConfigs[oldAvatar];
 +            delete settings.characterConfigs[oldAvatar];
 +            settings.save();
 +        }
 +    }
 +};
++
 const onChatChanged = async (chatIdx) => {
     log('CHAT_CHANGED', chatIdx);
++
 +    handleCharChange();
++
     if (chatIdx) {
         settings.const chatConfig = QuickReplyConfig.from(chat_metadata.quickReply ?? {});
 +        chatConfig.scope = 'chat';
 +        chatConfig.onUpdate = () => settings.save();
 +        settings.chatConfig = chatConfig;
     } else {
         settings.chatConfig = null;
+    }

     await autoExec.handleChatChanged();
 };
 eventSource.on(event_types.CHAT_CHANGED, (...args)=>executeIfReadyElseQueue(onChatChanged, args));
 +eventSource.on(event_types.CHARACTER_DELETED, purgeCharacterQuickReplySets);
 +eventSource.on(event_types.CHARACTER_RENAMED, updateCharacterQuickReplySets);
 const onUserMessage = async () => {
     await autoExec.handleUser();

public/scripts/extensions/quick-reply/src/AutoExecuteHandler.js+27 -32 Viewed

+    }
 +    getCommands(eventName) {
 +        const getFromConfig = (config) => {
 +            // This safely handles cases where a link exists but the set hasn't been loaded (link.set is null)
 +            return config?.setList?.map(link => link.set ? link.set.qrList.filter(qr => qr[eventName]) : [])?.flat() ?? [];
 +        };
 +        return [
 +            ...getFromConfig(this.settings.config),
 +            ...getFromConfig(this.settings.chatConfig),
 +            ...getFromConfig(this.settings.charConfig),
 +        ];
 +    }
++
     async handleStartup() {
         if (!this.checkExecute()) return;
 -        const qrList = [
 +        await this.performAutoExecute(this.getCommands('executeOnStartup'));
 -            ...this.settings.config.setList.map(link=>link.set.qrList.filter(qr=>qr.executeOnStartup)).flat(),
 -            ...(this.settings.chatConfig?.setList?.map(link=>link.set.qrList.filter(qr=>qr.executeOnStartup))?.flat() ?? []),
 -        ];
 -        await this.performAutoExecute(qrList);
+    }
     async handleUser() {
         if (!this.checkExecute()) return;
 -        const qrList = [
 +        await this.performAutoExecute(this.getCommands('executeOnUser'));
 -            ...this.settings.config.setList.map(link=>link.set.qrList.filter(qr=>qr.executeOnUser)).flat(),
 -            ...(this.settings.chatConfig?.setList?.map(link=>link.set.qrList.filter(qr=>qr.executeOnUser))?.flat() ?? []),
 -        ];
 -        await this.performAutoExecute(qrList);
+    }
     async handleAi() {
         if (!this.checkExecute()) return;
 -        const qrList = [
 +        await this.performAutoExecute(this.getCommands('executeOnAi'));
 -            ...this.settings.config.setList.map(link=>link.set.qrList.filter(qr=>qr.executeOnAi)).flat(),
 -            ...(this.settings.chatConfig?.setList?.map(link=>link.set.qrList.filter(qr=>qr.executeOnAi))?.flat() ?? []),
 -        ];
 -        await this.performAutoExecute(qrList);
+    }
     async handleChatChanged() {
         if (!this.checkExecute()) return;
 -        const qrList = [
 +        await this.performAutoExecute(this.getCommands('executeOnChatChange'));
 -            ...this.settings.config.setList.map(link=>link.set.qrList.filter(qr=>qr.executeOnChatChange)).flat(),
 -            ...(this.settings.chatConfig?.setList?.map(link=>link.set.qrList.filter(qr=>qr.executeOnChatChange))?.flat() ?? []),
 -        ];
 -        await this.performAutoExecute(qrList);
+    }
     async handleGroupMemberDraft() {
         if (!this.checkExecute()) return;
 -        const qrList = [
 +        await this.performAutoExecute(this.getCommands('executeOnGroupMemberDraft'));
 -            ...this.settings.config.setList.map(link=>link.set.qrList.filter(qr=>qr.executeOnGroupMemberDraft)).flat(),
 -            ...(this.settings.chatConfig?.setList?.map(link=>link.set.qrList.filter(qr=>qr.executeOnGroupMemberDraft))?.flat() ?? []),
 -        ];
 -        await this.performAutoExecute(qrList);
+    }
     async handleNewChat() {
         if (!this.checkExecute()) return;
 -        const qrList = [
 +        await this.performAutoExecute(this.getCommands('executeOnNewChat'));
 -            ...this.settings.config.setList.map(link=>link.set.qrList.filter(qr=>qr.executeOnNewChat)).flat(),
 -            ...(this.settings.chatConfig?.setList?.map(link=>link.set.qrList.filter(qr=>qr.executeOnNewChat))?.flat() ?? []),
 -        ];
 -        await this.performAutoExecute(qrList);
+    }
     /**

         const automationIds = entries.map(entry => entry.automationId).filter(Boolean);
         if (automationIds.length === 0) return;
 +        const getFromConfig = (config) => {
 +            return config?.setList
 +                ?.map(link => link.set ? link.set.qrList.filter(qr => qr.automationId && automationIds.includes(qr.automationId)) : [])
 +                ?.flat() ?? [];
 +        };
++
         const qrList = [
 -            ...this.settings.config.setList.map(link=>link.set.qrList.filter(qr=>qr.automationId && automationIds.includes(qr.automationId))).flat(),
 +            ...getFromConfig(this.settings.config),
 -            ...(this.settings.chatConfig?.setList?.map(link=>link.set.qrList.filter(qr=>qr.automationId && automationIds.includes(qr.automationId)))?.flat() ?? []),
 +            ...getFromConfig(this.settings.chatConfig),
 +            ...getFromConfig(this.settings.charConfig),
         ];
         await this.performAutoExecute(qrList);

public/scripts/extensions/quick-reply/src/QuickReply.js+15 -0 Viewed

                 this.updateLabel(label.value);
             });
             let switcherList;
 +            // @ts-ignore
             dom.querySelector('#qr--modal-switcher').addEventListener('click', (evt)=>{
                 if (switcherList) {
                     switcherList.remove();

                 accountStorage.setItem('qr--syntax', JSON.stringify(syntax.checked));
                 updateSyntaxEnabled();
             });
 +            // @ts-ignore
             if (navigator.keyboard) {
 +                // @ts-ignore
                 navigator.keyboard.getLayoutMap().then(it=>dom.querySelector('#qr--modal-commentKey').textContent = it.get('Backslash'));
             } else {
                 dom.querySelector('#qr--modal-commentKey').closest('small').remove();

             message.addEventListener('wheel', (evt)=>{
                 updateScrollDebounced(evt);
             });
 +            // @ts-ignore
             message.addEventListener('scroll', (evt)=>{
                 updateScrollDebounced();
             });

             /**@type {HTMLTextAreaElement} */
             const inputOg = document.querySelector('#send_textarea');
             const inputMirror = dom.querySelector('#qr--modal-send_textarea');
 +            // @ts-ignore
             inputMirror.value = inputOg.value;
             const inputOgMo = new MutationObserver(muts=>{
                 if (muts.find(it=>[...it.removedNodes].includes(inputMirror) || [...it.removedNodes].find(n=>n.contains(inputMirror)))) {

             });
             inputOgMo.observe(document.body, { childList:true });
             const inputOgListener = ()=>{
 +                // @ts-ignore
                 inputMirror.value = inputOg.value;
             };
             inputOg.addEventListener('input', inputOgListener);
             inputMirror.addEventListener('input', ()=>{
 +                // @ts-ignore
                 inputOg.value = inputMirror.value;
             });

                 isResizing = true;
                 evt.preventDefault();
                 resizeStart = evt.x;
 +                // @ts-ignore
                 wStart = dom.querySelector('#qr--qrOptions').offsetWidth;
                 const dragListener = debounce((evt)=>{
                     const w = wStart + resizeStart - evt.x;
 +                    // @ts-ignore
                     dom.querySelector('#qr--qrOptions').style.setProperty('--width', `${w}px`);
                 }, 5);
                 window.addEventListener('pointerup', ()=>{
 +                    // @ts-ignore
                     window.removeEventListener('pointermove', dragListener);
                     isResizing = false;
                 }, { once:true });
 +                // @ts-ignore
                 window.addEventListener('pointermove', dragListener);
             });

         syntax.addEventListener('wheel', (evt)=>{
             updateScrollDebounced(evt);
         });
 +        // @ts-ignore
         syntax.addEventListener('scroll', (evt)=>{
             updateScrollDebounced();
         });

                                 let i = 0;
                                 let unnamed = this.debugController.unnamedArguments ?? [];
                                 if (!Array.isArray(unnamed)) unnamed = [unnamed];
 +                                // @ts-ignore
                                 while (unnamed.length < executor.unnamedArgumentList?.length ?? 0) unnamed.push(undefined);
 +                                // @ts-ignore
                                 unnamed = unnamed.map((it,idx)=>[executor.unnamedArgumentList?.[idx], it]);
 +                                // @ts-ignore
                                 for (const arg of unnamed) {
                                     i++;
                                     const item = document.createElement('div'); {

public/scripts/extensions/quick-reply/src/QuickReplyConfig.js+1 -1 Viewed

 export class QuickReplyConfig {
     /**@type {QuickReplySetLink[]}*/ setList = [];
     /**@type {Boolean'global'|'chat'|'character'}*/ isGlobalscope;
     /**@type {Function}*/ onUpdate;
     /**@type {Function}*/ onRequestEditSet;

public/scripts/extensions/quick-reply/src/QuickReplySet.js+5 -0 Viewed

+    }
     /**@type {string}*/ name;
 +    /**@type {'global'|'chat'|'character'}*/ scope = 'global';
     /**@type {boolean}*/ disableSend = false;
     /**@type {boolean}*/ placeBeforeInput = false;
     /**@type {boolean}*/ injectInput = false;

      * @param {QuickReply} qr
      */
     hookQuickReply(qr) {
 +        // @ts-ignore
         qr.onDebug = ()=>this.debug(qr);
         qr.onExecute = (_, options)=>this.executeWithOptions(qr, options);
         qr.onDelete = ()=>this.removeQuickReply(qr);

@@ -301,12 +303,14 @@ export class QuickReplySet {
301	303	}
302	304	sel.addEventListener('keyup', (evt)=>{
303	305	if (evt.key == 'Shift') {
	306	+ // @ts-ignore
304	307	(dlg.dom ?? dlg.dlg).classList.remove('qr--isCopy');
305	308	return;
306	309	}
307	310	});
308	311	sel.addEventListener('keydown', (evt)=>{
309	312	if (evt.key == 'Shift') {
	313	+ // @ts-ignore
310	314	(dlg.dom ?? dlg.dlg).classList.add('qr--isCopy');
311	315	return;
312	316	}

                     isCopy = true;
                     dlg.completeAffirmative();
                 });
 +                // @ts-ignore
                 (dlg.ok ?? dlg.okButton).insertAdjacentElement('afterend', copyBtn);
+            }
             const prom = dlg.show();

public/scripts/extensions/quick-reply/src/QuickReplySettings.js+25 -0 Viewed

 export class QuickReplySettings {
     static from(props) {
         props.config = QuickReplyConfig.from(props.config);
 +        props.characterConfigs = props.characterConfigs ?? {};
 +        for (const key of Object.keys(props.characterConfigs)) {
 +            props.characterConfigs[key] = QuickReplyConfig.from(props.characterConfigs[key]);
 +        }
         const instance = Object.assign(new this(), props);
         instance.init();
         return instance;

     /**@type {Boolean}*/ isPopout = false;
     /**@type {Boolean}*/ showPopoutButton = true;
     /**@type {QuickReplyConfig}*/ config;
 +    /**@type {{[key:string]: QuickReplyConfig}}*/ characterConfigs = {};
     /**@type {QuickReplyConfig}*/ _chatConfig;
 +    /**@type {QuickReplyConfig}*/ _charConfig;
     get chatConfig() {
         return this._chatConfig;
+    }

             this.hookConfig(this._chatConfig);
+        }
+    }
 +    get charConfig() {
 +        return this._charConfig;
 +    }
 +    set charConfig(value) {
 +        if (this._charConfig != value) {
 +            this.unhookConfig(this._charConfig);
 +            this._charConfig = value;
 +            this.hookConfig(this._charConfig);
 +        }
 +    }
     /**@type {Function}*/ onSave;
     /**@type {Function}*/ onRequestEditSet;

     init() {
         this.hookConfig(this.config);
         this.hookConfig(this.chatConfig);
 +        this.hookConfig(this.charConfig);
+    }
     hookConfig(config) {

+    }
     toJSON() {
 +        const characterConfigs = {};
 +        for (const key of Object.keys(this.characterConfigs)) {
 +            if (this.characterConfigs[key]?.setList?.length === 0) {
 +                continue;
 +            }
 +            characterConfigs[key] = this.characterConfigs[key].toJSON();
 +        }
         return {
             isEnabled: this.isEnabled,
             isCombined: this.isCombined,
             isPopout: this.isPopout,
             showPopoutButton: this.showPopoutButton,
             config: this.config,
 +            characterConfigs,
         };
+    }
+}

public/scripts/extensions/quick-reply/src/ui/ButtonUi.js+2 -2 Viewed

@@ -90,7 +90,7 @@ export class ButtonUi {
90	90	root.append(buttons);
91	91	}
92	92	}
93	93	[...this.settings.config.setList, ...(this.settings.chatConfig?.setList ?? []), ...(this.settings.charConfig?.setList ?? [])]
94	94	.filter(link=>link.isVisible)
95	95	.forEach(link=>buttonHolder.append(link.set.render()))
96	96	;

@@ -150,7 +150,7 @@ export class ButtonUi {
150	150	body.append(buttons);
151	151	}
152	152	}
153	153	[...this.settings.config.setList, ...(this.settings.chatConfig?.setList ?? []), ...(this.settings.charConfig?.setList ?? [])]
154	154	.filter(link=>link.isVisible)
155	155	.forEach(link=>buttonHolder.append(link.set.render()))
156	156	;

public/scripts/extensions/quick-reply/src/ui/SettingsUi.js+45 -0 Viewed

     /**@type {HTMLElement}*/ globalSetList;
     /**@type {HTMLElement}*/ chatSetList;
 +    /**@type {HTMLElement}*/ characterSetList;
     /**@type {QuickReplySet}*/ currentQrSet;
     /**@type {HTMLInputElement}*/ disableSend;

+        }
         this.dom.querySelector('#qr--chat').replaceWith(clone);
+    }
 +    prepareCharacterSetList() {
 +        const dom = this.template.querySelector('#qr--character');
 +        const clone = /** @type {HTMLElement} */ (dom.cloneNode(true));
++
 +        if (!this.settings.charConfig) {
 +            const setListContainer = /** @type {HTMLElement} */ (clone.querySelector('.qr--setList'));
 +            setListContainer.innerHTML = '';
 +            const info = document.createElement('div');
 +            info.textContent = 'No character is currently loaded.';
 +            setListContainer.append(info);
 +        } else {
 +            // Let the config object handle its own rendering. It will render an empty list if there are no sets,
 +            // but the "add" button will always be functional.
 +            this.settings.charConfig.renderSettingsInto(clone);
 +        }
++
 +        // Replace the old DOM element with our newly prepared clone.
 +        this.dom.querySelector('#qr--character').replaceWith(clone);
 +    }
     prepareQrEditor() {
         // qr editor

         });
         let initialColorChange = true;
         this.color = this.dom.querySelector('#qr--color');
 +        // @ts-ignore
         this.color.color = this.currentQrSet?.color ?? 'transparent';
         this.color.addEventListener('change', (evt)=>{
             if (!this.dom.closest('body')) return;
             const qrs = this.currentQrSet;
             if (initialColorChange) {
                 initialColorChange = false;
 +                // @ts-ignore
                 this.color.color = qrs.color;
                 return;
+            }
 +            // @ts-ignore
             qrs.color = evt.detail.rgb;
             qrs.save();
             this.currentQrSet.updateColor();
         });
 +        // @ts-ignore
         this.dom.querySelector('#qr--colorClear').addEventListener('click', (evt)=>{
             const qrs = this.currentQrSet;
 +            // @ts-ignore
             this.color.color = 'transparent';
             qrs.save();
             this.currentQrSet.updateColor();

         this.disableSend.checked = this.currentQrSet.disableSend;
         this.placeBeforeInput.checked = this.currentQrSet.placeBeforeInput;
         this.injectInput.checked = this.currentQrSet.injectInput;
 +        // @ts-ignore
         this.color.color = this.currentQrSet.color ?? 'transparent';
         this.onlyBorderColor.checked = this.currentQrSet.onlyBorderColor;
         this.qrList.innerHTML = '';

         this.prepareGeneralSettings();
         this.prepareGlobalSetList();
         this.prepareChatSetList();
 +        this.prepareCharacterSetList();
         this.prepareQrEditor();
+    }

@@ -301,6 +328,13 @@ export class SettingsUi {
301	328	}
302	329	}
303	330	}
	331	+ if (this.settings.charConfig) {
	332	+ for (let i = this.settings.charConfig.setList.length - 1; i >= 0; i--) {
	333	+ if (this.settings.charConfig.setList[i].set == qrs) {
	334	+ this.settings.charConfig.setList.splice(i, 1);
	335	+ }
	336	+ }
	337	+ }
304	338	this.settings.save();
305	339	}
306	340

                     set.set.name = newName;
+                }
             });
 +            this.settings.charConfig?.setList.forEach(set => {
 +                if (set.set.name === oldName) {
 +                    set.set.name = newName;
 +                }
 +            });
             this.settings.save();
             // Update the option in the current selected QR dropdown. All others will be refreshed via the prepare calls below.

             this.onQrSetChange();
             this.prepareGlobalSetList();
             this.prepareChatSetList();
 +            this.prepareCharacterSetList();
             console.info(`Quick Reply Set renamed from ""${oldName}" to "${newName}".`);
+        }

                     this.onQrSetChange();
                     this.prepareGlobalSetList();
                     this.prepareChatSetList();
 +                    this.prepareCharacterSetList();
+                }
             } else {
                 const qrs = new QuickReplySet();

@@ -386,6 +427,7 @@ export class SettingsUi {
386	427	this.onQrSetChange();
387	428	this.prepareGlobalSetList();
388	429	this.prepareChatSetList();
	430	+ this.prepareCharacterSetList();
389	431	}
390	432	}
391	433	}

                         this.onQrSetChange();
                         this.prepareGlobalSetList();
                         this.prepareChatSetList();
 +                        this.prepareCharacterSetList();
+                    }
                 } else {
                     const idx = QuickReplySet.list.findIndex(it=>it.name.toLowerCase().localeCompare(qrs.name.toLowerCase()) == 1);

@@ -443,6 +486,7 @@ export class SettingsUi {
443	486	this.onQrSetChange();
444	487	this.prepareGlobalSetList();
445	488	this.prepareChatSetList();
	489	+ this.prepareCharacterSetList();
446	490	}
447	491	}
448	492	} catch (ex) {

@@ -493,6 +537,7 @@ export class SettingsUi {
493	537	this.onQrSetChange();
494	538	this.prepareGlobalSetList();
495	539	this.prepareChatSetList();
	540	+ this.prepareCharacterSetList();
496	541	}
497	542	}
498	543