flashii/mami
1
0
Fork 0
Code Pull requests Releases Activity

Use getters and setters where possible instead of getX/setX methods.

Browse source
This commit is contained in:
flash 2024-06-26 00:53:12 +00:00
parent fff461ac2a
commit 3949d8daed
37 changed files with 222 additions and 204 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mami.js/animate.js
View file

@ -120,8 +120,8 @@ const MamiAnimate = info => {
} }
return { return {
getCompletion: () => tCompletion, get completion() { return tCompletion; },
getRawCompletion: () => tRawCompletion, get rawCompletion() { return tRawCompletion; },
start: () => { start: () => {
if(!started) { if(!started) {
started = true; started = true;

16
src/mami.js/audio/context.js
View file

@ -35,24 +35,24 @@ const MamiAudioContext = function() {
reset(); reset();
return { return {
getAudioContext: () => ctx, get audioContext() { return ctx; },
getAudioContextGain: () => mainGain, get audioContextGain() { return mainGain; },
isReady: () => ctx !== undefined, get ready() { return ctx !== undefined; },
reset: reset, reset: reset,
onReset: handler => { onReset: handler => {
if(!onReset.includes(handler)) if(!onReset.includes(handler))
onReset.push(handler); onReset.push(handler);
}, },
getVolume: () => volume, get volume() { return volume; },
setVolume: vol => { set volume(value) {
volume = vol; volume = value;
if(!isMuted && mainGain !== undefined) if(!isMuted && mainGain !== undefined)
mainGain.gain.value = volume; mainGain.gain.value = volume;
}, },
isMuted: () => isMuted, get muted() { return isMuted; },
setMuted: mute => { set muted(mute) {
isMuted = mute; isMuted = mute;
if(mainGain !== undefined) if(mainGain !== undefined)
mainGain.gain.value = isMuted ? 0 : volume; mainGain.gain.value = isMuted ? 0 : volume;

34
src/mami.js/audio/source.js
View file

@ -2,14 +2,14 @@ const MamiAudioSourceDummy = function() {
return { return {
play: async () => {}, play: async () => {},
stop: () => {}, stop: () => {},
getRate: () => 0, get rate() { return 0; },
setRate: rate => {}, set rate(rate) {},
getDetune: () => 0, get detune() { return 0; },
setDetune: rate => {}, set detune(rate) {},
getVolume: () => 0, get volume() { return 0; },
setVolume: volume => {}, set volume(value) {},
isMuted: () => true, get muted() { return true; },
setMuted: mute => {}, set muted(mute) {},
setLoop: (loop, start, end) => {}, setLoop: (loop, start, end) => {},
}; };
}; };
@ -43,8 +43,8 @@ const MamiAudioSource = function(source, gain, buffer) {
disconnect(); disconnect();
}, },
getRate: () => source.playbackRate.value, get rate() { return source.playbackRate.value; },
setRate: rate => { set rate(rate) {
source.playbackRate.value = Math.min( source.playbackRate.value = Math.min(
source.playbackRate.maxValue, source.playbackRate.maxValue,
Math.max( Math.max(
@ -53,8 +53,8 @@ const MamiAudioSource = function(source, gain, buffer) {
) )
); );
}, },
getDetune: () => source.detune.value, get detune() { return source.detune.value; },
setDetune: rate => { set detune(rate) {
source.detune.value = Math.min( source.detune.value = Math.min(
source.detune.maxValue, source.detune.maxValue,
Math.max( Math.max(
@ -64,14 +64,14 @@ const MamiAudioSource = function(source, gain, buffer) {
); );
}, },
getVolume: () => volume, get volume() { return volume; },
setVolume: vol => { set volume(value) {
volume = vol; volume = value;
if(!isMuted) if(!isMuted)
gain.gain.value = volume; gain.gain.value = volume;
}, },
isMuted: () => isMuted, get muted() { return isMuted; },
setMuted: mute => { set muted(mute) {
gain.gain.value = (isMuted = mute) ? 0 : volume; gain.gain.value = (isMuted = mute) ? 0 : volume;
}, },

16
src/mami.js/colpick/picker.jsx
View file

@ -85,7 +85,7 @@ const MamiColourPicker = function(options) {
const tabs = new MamiTabsControl({ const tabs = new MamiTabsControl({
onAdd: ctx => { onAdd: ctx => {
const name = ctx.info.getName(), const name = ctx.info.name,
containerName = `colpick-tab-${name}-container`, containerName = `colpick-tab-${name}-container`,
buttonName = `colpick-tab-${name}-button`; buttonName = `colpick-tab-${name}-button`;
@ -100,18 +100,18 @@ const MamiColourPicker = function(options) {
onclick={ctx.onClick}/>); onclick={ctx.onClick}/>);
}, },
onRemove: ctx => { onRemove: ctx => {
const name = ctx.info.getName(); const name = ctx.info.name;
$rq(`.colpick-tab-${name}-button`); $rq(`.colpick-tab-${name}-button`);
$rq(`.colpick-tab-${name}-container`); $rq(`.colpick-tab-${name}-container`);
}, },
onSwitch: ctx => { onSwitch: ctx => {
if(ctx.from !== undefined) { if(ctx.from !== undefined) {
ctx.from.elem.classList.toggle('colpick-tab-container-inactive', true); ctx.from.elem.classList.toggle('colpick-tab-container-inactive', true);
$q(`.colpick-tab-${ctx.from.info.getName()}-button`).classList.toggle('colpick-tab-button-active', false); $q(`.colpick-tab-${ctx.from.info.name}-button`).classList.toggle('colpick-tab-button-active', false);
} }
ctx.elem.classList.toggle('colpick-tab-container-inactive', false); ctx.elem.classList.toggle('colpick-tab-container-inactive', false);
$q(`.colpick-tab-${ctx.info.getName()}-button`).classList.toggle('colpick-tab-button-active', true); $q(`.colpick-tab-${ctx.info.name}-button`).classList.toggle('colpick-tab-button-active', true);
}, },
}); });
@ -122,7 +122,7 @@ const MamiColourPicker = function(options) {
if(options.showSlidersTab) if(options.showSlidersTab)
tabs.add(new MamiColourPickerSlidersTab); tabs.add(new MamiColourPickerSlidersTab);
if(tabs.count() < 1) if(tabs.count < 1)
html.removeChild(tabsElem); html.removeChild(tabsElem);
const addValue = (id, name, valueInfo) => { const addValue = (id, name, valueInfo) => {
@ -162,9 +162,9 @@ const MamiColourPicker = function(options) {
setColour(options.colour); setColour(options.colour);
return { return {
getElement: () => html, get element() { return html; },
getColour: () => colour, get colour() { return colour; },
setColour: setColour, set colour(value) { setColour(value); },
setPosition: setPosition, setPosition: setPosition,
close: close, close: close,
dialog: pos => { dialog: pos => {

6
src/mami.js/colpick/tgrid.jsx
View file

@ -23,9 +23,9 @@ const MamiColourPickerGridTab = function() {
} }
return { return {
getName: () => 'grid', get name() { return 'grid'; },
getTitle: () => 'Grid', get title() { return 'Grid'; },
getElement: () => html, get element() { return html; },
onChange: handler => onChange = handler, onChange: handler => onChange = handler,
updateColour: colour => { updateColour: colour => {
let elem = html.querySelector('.colpick-grid-option-active'); let elem = html.querySelector('.colpick-grid-option-active');

6
src/mami.js/colpick/tpresets.jsx
View file

@ -11,9 +11,9 @@ const MamiColourPickerPresetsTab = function(presets) {
type="button" onclick={() => onChange(preset.c)}/>); type="button" onclick={() => onChange(preset.c)}/>);
return { return {
getName: () => 'presets', get name() { return 'presets'; },
getTitle: () => 'Presets', get title() { return 'Presets'; },
getElement: () => html, get element() { return html; },
onChange: handler => onChange = handler, onChange: handler => onChange = handler,
updateColour: colour => { updateColour: colour => {
let elem = html.querySelector('.colpick-presets-option-active'); let elem = html.querySelector('.colpick-presets-option-active');

8
src/mami.js/colpick/tsliders.jsx
View file

@ -18,7 +18,7 @@ const MamiColourPickerSlider = function(name, title, mask, shift) {
</div>; </div>;
return { return {
getElement: () => html, get element() { return html; },
onChange: handler => onChange = handler, onChange: handler => onChange = handler,
updateColour: colour => { updateColour: colour => {
const masked = colour & mask, const masked = colour & mask,
@ -43,9 +43,9 @@ const MamiColourPickerSlidersTab = function() {
const html = <div>{...sliders}</div>; const html = <div>{...sliders}</div>;
return { return {
getName: () => 'sliders', get name() { return 'sliders'; },
getTitle: () => 'Sliders', get title() { return 'Sliders'; },
getElement: () => html, get element() { return html; },
onChange: handler => { onChange: handler => {
for(const slider of sliders) for(const slider of sliders)
slider.onChange(handler); slider.onChange(handler);

2
src/mami.js/colpick/vhex.jsx
View file

@ -11,7 +11,7 @@ const MamiColourPickerValueHex = function() {
}}/>; }}/>;
return { return {
getElement: () => html, get element() { return html; },
onChange: handler => onChange = handler, onChange: handler => onChange = handler,
updateColour: colour => html.value = MamiColour.hex(colour), updateColour: colour => html.value = MamiColour.hex(colour),
}; };

2
src/mami.js/colpick/vraw.jsx
View file

@ -6,7 +6,7 @@ const MamiColourPickerValueRaw = function() {
onchange={() => onChange(Math.min(html.max, Math.max(html.min, html.value)))}/>; onchange={() => onChange(Math.min(html.max, Math.max(html.min, html.value)))}/>;
return { return {
getElement: () => html, get element() { return html; },
onChange: handler => onChange = handler, onChange: handler => onChange = handler,
updateColour: colour => html.value = colour, updateColour: colour => html.value = colour,
}; };

23
src/mami.js/controls/ping.jsx
View file

@ -13,13 +13,14 @@ const MamiPingIndicator = function(initialStrength) {
for(let i = 1; i <= 3; ++i) for(let i = 1; i <= 3; ++i)
bars.push(html.appendChild(<div class={`ping-bar ping-bar-${i}`}/>)); bars.push(html.appendChild(<div class={`ping-bar ping-bar-${i}`}/>));
let interval; let interval, strength;
const setStrength = strength => { const setStrength = value => {
if(typeof strength !== 'number') if(typeof value !== 'number')
throw 'strength must be a number'; throw 'value must be a number';
if(strength < 0) { strength = value;
if(value < 0) {
if(interval === undefined) { if(interval === undefined) {
const cyclesMax = bars.length * 2; const cyclesMax = bars.length * 2;
let cycles = -1; let cycles = -1;
@ -43,12 +44,12 @@ const MamiPingIndicator = function(initialStrength) {
} }
for(const i in bars) for(const i in bars)
bars[i].classList.toggle('ping-bar-on', i < strength); bars[i].classList.toggle('ping-bar-on', i < value);
} }
html.classList.toggle('ping-state-good', strength > 1); html.classList.toggle('ping-state-good', value > 1);
html.classList.toggle('ping-state-warn', strength == 1); html.classList.toggle('ping-state-warn', value == 1);
html.classList.toggle('ping-state-poor', strength < 1); html.classList.toggle('ping-state-poor', value < 1);
}; };
if(typeof initialStrength !== 'number') if(typeof initialStrength !== 'number')
@ -58,7 +59,7 @@ const MamiPingIndicator = function(initialStrength) {
return { return {
get element() { return html; }, get element() { return html; },
getElement: () => html, get strength() { return strength; },
setStrength: setStrength, set strength(value) { setStrength(value); },
}; };
}; };

20
src/mami.js/controls/tabs.js
View file

@ -8,9 +8,9 @@ const MamiTabsControl = function(options) {
define('onSwitch').required().type('function').done(); define('onSwitch').required().type('function').done();
}); });
const onAdd = options.onAdd, const onAdd = options.onAdd;
onRemove = options.onRemove, const onRemove = options.onRemove;
onSwitch = options.onSwitch; const onSwitch = options.onSwitch;
const tabs = new Map; const tabs = new Map;
let currentTab; let currentTab;
@ -19,6 +19,8 @@ const MamiTabsControl = function(options) {
let element; let element;
if(elementInfo instanceof Element) { if(elementInfo instanceof Element) {
element = elementInfo; element = elementInfo;
} else if('element' in elementInfo) {
element = elementInfo.element;
} else if('getElement' in elementInfo) { } else if('getElement' in elementInfo) {
element = elementInfo.getElement(); element = elementInfo.getElement();
} else throw 'elementInfo is not a valid type'; } else throw 'elementInfo is not a valid type';
@ -106,15 +108,15 @@ const MamiTabsControl = function(options) {
return { return {
switch: switchTab, switch: switchTab,
current: () => currentTab, get current() { return currentTab; },
currentId: () => getExistingTabId(currentTab), get currentId() { return getExistingTabId(currentTab); },
currentElement: () => { get currentElement() {
if(currentTab === undefined) if(currentTab === undefined)
return undefined; return undefined;
return extractElement(currentTab); return extractElement(currentTab);
}, },
count: () => tabs.size, get count() { return tabs.size; },
has: tabInfo => getExistingTabId(tabInfo) !== undefined, has: tabInfo => getExistingTabId(tabInfo) !== undefined,
add: async (tabInfo, title) => { add: async (tabInfo, title) => {
if(typeof tabInfo !== 'object') if(typeof tabInfo !== 'object')
@ -127,8 +129,8 @@ const MamiTabsControl = function(options) {
tabId = MamiUniqueStr(8); tabId = MamiUniqueStr(8);
tabs.set(tabId, tabInfo); tabs.set(tabId, tabInfo);
if(title !== 'string' && 'getTitle' in tabInfo) if(title !== 'string' && 'title' in tabInfo)
title = tabInfo.getTitle(); title = tabInfo.title;
const element = extractElement(tabInfo); const element = extractElement(tabInfo);

8
src/mami.js/controls/views.js
View file

@ -15,6 +15,8 @@ const MamiViewsControl = function(options) {
let element; let element;
if(elementInfo instanceof Element) { if(elementInfo instanceof Element) {
element = elementInfo; element = elementInfo;
} else if('element' in elementInfo) {
element = elementInfo.element;
} else if('getElement' in elementInfo) { } else if('getElement' in elementInfo) {
element = elementInfo.getElement(); element = elementInfo.getElement();
} else throw 'elementInfo is not a valid type'; } else throw 'elementInfo is not a valid type';
@ -155,9 +157,9 @@ const MamiViewsControl = function(options) {
push: push, push: push,
pop: pop, pop: pop,
raise: raise, raise: raise,
count: () => views.length, get count() { return views.length; },
current: current, get current() { return current(); },
currentElement: () => { get currentElement() {
const currentInfo = current(); const currentInfo = current();
if(currentInfo === undefined) if(currentInfo === undefined)
return undefined; return undefined;

46
src/mami.js/main.js
View file

@ -70,20 +70,20 @@ const MamiInit = async args => {
await ctx.views.push(loadingOverlay); await ctx.views.push(loadingOverlay);
if(!('futami' in window)) { if(!('futami' in window)) {
loadingOverlay.setMessage('Loading environment...'); loadingOverlay.message = 'Loading environment...';
try { try {
window.futami = await FutamiCommon.load(); window.futami = await FutamiCommon.load();
} catch(ex) { } catch(ex) {
console.error('Failed to load common settings.', ex); console.error('Failed to load common settings.', ex);
loadingOverlay.setIcon('cross'); loadingOverlay.icon = 'cross';
loadingOverlay.setHeader('Failed!'); loadingOverlay.header = 'Failed!';
loadingOverlay.setMessage('Failed to load common settings.'); loadingOverlay.message = 'Failed to load common settings.';
return; return;
} }
} }
if(!MamiMisuzuAuth.hasInfo()) { if(!MamiMisuzuAuth.hasInfo()) {
loadingOverlay.setMessage('Fetching credentials...'); loadingOverlay.message = 'Fetching credentials...';
try { try {
const auth = await MamiMisuzuAuth.update(); const auth = await MamiMisuzuAuth.update();
if(!auth.ok) if(!auth.ok)
@ -104,7 +104,7 @@ const MamiInit = async args => {
} }
loadingOverlay.setMessage('Loading settings...'); loadingOverlay.message = 'Loading settings...';
const settings = new MamiSettings(args.settingsPrefix, ctx.events.scopeTo('settings')); const settings = new MamiSettings(args.settingsPrefix, ctx.events.scopeTo('settings'));
ctx.settings = settings; ctx.settings = settings;
@ -156,7 +156,7 @@ const MamiInit = async args => {
settings.define('notificationTriggers').default('').immutable(noNotifSupport).create(); settings.define('notificationTriggers').default('').immutable(noNotifSupport).create();
loadingOverlay.setMessage('Loading sounds...'); loadingOverlay.message = 'Loading sounds...';
const soundCtx = new MamiSoundContext; const soundCtx = new MamiSoundContext;
ctx.sound = soundCtx; ctx.sound = soundCtx;
@ -201,7 +201,7 @@ const MamiInit = async args => {
let packName = ev.detail.value; let packName = ev.detail.value;
if(packName === '') { if(packName === '') {
const names = packs.names(); const names = packs.names;
if(names.length < 1) if(names.length < 1)
return; return;
@ -222,7 +222,7 @@ const MamiInit = async args => {
// loading these asynchronously makes them not show up in the backlog // loading these asynchronously makes them not show up in the backlog
// revisit when emote reparsing is implemented // revisit when emote reparsing is implemented
loadingOverlay.setMessage('Loading emoticons...'); loadingOverlay.message = 'Loading emoticons...';
try { try {
const emotes = await futami.getJson('emotes'); const emotes = await futami.getJson('emotes');
MamiEmotes.loadLegacy(emotes); MamiEmotes.loadLegacy(emotes);
@ -251,7 +251,7 @@ const MamiInit = async args => {
}); });
loadingOverlay.setMessage('Preparing UI...'); loadingOverlay.message = 'Preparing UI...';
ctx.textTriggers = new MamiTextTriggers; ctx.textTriggers = new MamiTextTriggers;
@ -330,7 +330,7 @@ const MamiInit = async args => {
settings.watch('playJokeSounds', ev => { settings.watch('playJokeSounds', ev => {
if(!ev.detail.value) return; if(!ev.detail.value) return;
if(!ctx.textTriggers.hasTriggers()) if(!ctx.textTriggers.hasTriggers)
futami.getJson('texttriggers').then(trigInfos => ctx.textTriggers.addTriggers(trigInfos)); futami.getJson('texttriggers').then(trigInfos => ctx.textTriggers.addTriggers(trigInfos));
}); });
@ -348,12 +348,12 @@ const MamiInit = async args => {
} }
} }
OsuKeys.setEnable(ev.detail.value !== 'no'); OsuKeys.enable = ev.detail.value !== 'no';
OsuKeys.setRandomRate(ev.detail.value === 'rng'); OsuKeys.randomRate = ev.detail.value === 'rng';
}); });
loadingOverlay.setMessage('Building menus...'); loadingOverlay.message = 'Building menus...';
MamiCompat('Umi.Parser.SockChatBBcode.EmbedStub', { value: () => {} }); // intentionally a no-op MamiCompat('Umi.Parser.SockChatBBcode.EmbedStub', { value: () => {} }); // intentionally a no-op
MamiCompat('Umi.UI.View.SetText', { value: text => console.log(`Umi.UI.View.SetText(text: ${text})`) }); MamiCompat('Umi.UI.View.SetText', { value: text => console.log(`Umi.UI.View.SetText(text: ${text})`) });
@ -461,8 +461,8 @@ const MamiInit = async args => {
category.setting('soundPack').title('Sound pack').type('select').options(() => { category.setting('soundPack').title('Sound pack').type('select').options(() => {
const options = { '': 'Default' }; const options = { '': 'Default' };
for(const name of soundCtx.packs.names()) for(const name of soundCtx.packs.names)
options[name] = soundCtx.packs.info(name).getTitle(); options[name] = soundCtx.packs.info(name).title;
return options; return options;
}).done(); }).done();
@ -795,15 +795,15 @@ const MamiInit = async args => {
}); });
loadingOverlay.setMessage('Connecting...'); loadingOverlay.message = 'Connecting...';
const setLoadingOverlay = async (icon, header, message, optional) => { const setLoadingOverlay = async (icon, header, message, optional) => {
const currentView = ctx.views.current(); const currentView = ctx.views.current;
if('setIcon' in currentView) { if('icon' in currentView) {
currentView.setIcon(icon); currentView.icon = icon;
currentView.setHeader(header); currentView.header = header;
currentView.setMessage(message); currentView.message = message;
return currentView; return currentView;
} }
@ -837,7 +837,7 @@ const MamiInit = async args => {
return; return;
sbActPing.pingMs = -1; sbActPing.pingMs = -1;
pingIndicator.setStrength(-1); pingIndicator.strength = -1;
const reconManAttempt = ev => { const reconManAttempt = ev => {
if(sockChatRestarting || ev.detail.delay > 2000) if(sockChatRestarting || ev.detail.delay > 2000)

2
src/mami.js/notices/baka.jsx
View file

@ -31,7 +31,7 @@ const MamiForceDisconnectNotice = function(banInfo) {
let sfxBuf, bgmSrc; let sfxBuf, bgmSrc;
const pub = { const pub = {
getElement: () => html, get element() { return html; },
onViewPush: async () => { onViewPush: async () => {
try { try {
sfxBuf = await mami.sound.library.loadBuffer('touhou:pichuun'); sfxBuf = await mami.sound.library.loadBuffer('touhou:pichuun');

2
src/mami.js/notices/youare.jsx
View file

@ -21,7 +21,7 @@ const MamiYouAreAnIdiot = function(sndLibrary, views) {
let soundSrc; let soundSrc;
const pub = { const pub = {
getElement: () => html, get element() { return html; },
onViewPush: async () => { onViewPush: async () => {
try { try {
soundSrc = await sndLibrary.loadSource('misc:youare'); soundSrc = await sndLibrary.loadSource('misc:youare');

30
src/mami.js/rng.js
View file

@ -31,7 +31,7 @@ const MamiRNG = function(seed) {
vars[mjVal] = seedArray[ii]; vars[mjVal] = seedArray[ii];
} }
for(let k = 1; k < 5; k++) { for(let k = 1; k < 5; k++)
for(let i = 0; i < 56; i++) { for(let i = 0; i < 56; i++) {
let n = i + 30; let n = i + 30;
@ -43,15 +43,14 @@ const MamiRNG = function(seed) {
if(seedArray[i] < 0) if(seedArray[i] < 0)
seedArray[i] += MBIG; seedArray[i] += MBIG;
} }
}
let inext = 0, let inext = 0;
inextp = 21; let inextp = 21;
const internalSample = function() { const internalSample = () => {
const retVal = new Int32Array(1); const retVal = new Int32Array(1);
let locINext = inext, let locINext = inext;
locINextp = inextp; let locINextp = inextp;
if(++locINext >= 56) if(++locINext >= 56)
locINext = 1; locINext = 1;
@ -73,19 +72,17 @@ const MamiRNG = function(seed) {
return retVal[0]; return retVal[0];
}; };
const sample = function() { const sample = () => internalSample() * (1.0 / MBIG);
return internalSample() * (1.0 / MBIG);
};
return { return {
sample: sample, sample: sample,
next: function(minValue, maxValue) { next: (minValue, maxValue) => {
let hasMinVal = (typeof minValue).toLowerCase() === 'number', let hasMinVal = (typeof minValue).toLowerCase() === 'number';
hasMaxVal = (typeof maxValue).toLowerCase() === 'number'; let hasMaxVal = (typeof maxValue).toLowerCase() === 'number';
const vars = new Int32Array(3), const vars = new Int32Array(3);
minVal = 0, maxVal = 1, retVal = 2; const minVal = 0, maxVal = 1, retVal = 2;
if(hasMinVal) { if(hasMinVal)
if(!hasMaxVal) { if(!hasMaxVal) {
hasMinVal = false; hasMinVal = false;
hasMaxVal = true; hasMaxVal = true;
@ -94,7 +91,6 @@ const MamiRNG = function(seed) {
vars[minVal] = minValue; vars[minVal] = minValue;
vars[maxVal] = maxValue; vars[maxVal] = maxValue;
} }
}
if(hasMaxVal) { if(hasMaxVal) {
if(hasMinVal) { if(hasMinVal) {

2
src/mami.js/settings/backup.js
View file

@ -7,7 +7,7 @@ const MamiSettingsBackup = function(settings) {
const maxVersion = 1; const maxVersion = 1;
const exportData = () => { const exportData = () => {
const names = settings.names(); const names = settings.names;
const data = { a: header, v: version, d: [] }; const data = { a: header, v: version, d: [] };
for(const name of names) { for(const name of names) {

4
src/mami.js/settings/scoped.js
View file

@ -13,9 +13,9 @@ const MamiSettingsScoped = function(settings, prefix) {
define: name => settings.define(prefix + name), define: name => settings.define(prefix + name),
defined: name => settings.defined(prefix + name), defined: name => settings.defined(prefix + name),
info: name => settings.info(prefix + name), info: name => settings.info(prefix + name),
names: () => { get names() {
const filtered = []; const filtered = [];
const names = settings.names(); const names = settings.names;
for(const name in names) for(const name in names)
if(name.startsWith(prefix)) if(name.startsWith(prefix))

4
src/mami.js/settings/settings.js
View file

@ -25,7 +25,7 @@ const MamiSettings = function(storageOrPrefix, eventTarget) {
}); });
const dispatchUpdate = (name, value, silent, local) => eventTarget.dispatch(createUpdateEvent(name, value, false, silent, local)); const dispatchUpdate = (name, value, silent, local) => eventTarget.dispatch(createUpdateEvent(name, value, false, silent, local));
const broadcast = new BroadcastChannel(`${MAMI_MAIN_JS}:settings:${storage.name()}`); const broadcast = new BroadcastChannel(`${MAMI_MAIN_JS}:settings:${storage.name}`);
const broadcastUpdate = (name, value, silent) => { const broadcastUpdate = (name, value, silent) => {
setTimeout(() => broadcast.postMessage({ act: 'update', name: name, value: value, silent: !!silent }), 0); setTimeout(() => broadcast.postMessage({ act: 'update', name: name, value: value, silent: !!silent }), 0);
}; };
@ -211,7 +211,7 @@ const MamiSettings = function(storageOrPrefix, eventTarget) {
define: name => new settingBlueprint(name), define: name => new settingBlueprint(name),
defined: name => settings.has(name), defined: name => settings.has(name),
info: name => getSetting(name), info: name => getSetting(name),
names: () => Array.from(settings.keys()), get names() { return Array.from(settings.keys()); },
has: name => { has: name => {
const setting = settings.get(name); const setting = settings.get(name);
return setting !== undefined return setting !== undefined

2
src/mami.js/settings/virtual.js
View file

@ -2,7 +2,7 @@ const MamiSettingsVirtualStorage = function(storage) {
const virtuals = new Map; const virtuals = new Map;
return { return {
name: () => `virtual:${storage.name()}`, get name() { return `virtual:${storage.name}`; },
virtualise: name => virtuals.set(name, storage.get(name)), virtualise: name => virtuals.set(name, storage.get(name)),
get: name => { get: name => {
if(virtuals.has(name)) if(virtuals.has(name))

2
src/mami.js/settings/webstorage.js
View file

@ -5,7 +5,7 @@ const MamiSettingsWebStorage = function(storage, prefix) {
prefix = ''; prefix = '';
return { return {
name: () => `webstorage:${prefix}`, get name() { return `webstorage:${prefix}`; },
delete: name => storage.removeItem(prefix + name), delete: name => storage.removeItem(prefix + name),
set: (name, value) => storage.setItem(prefix + name, value === undefined ? null : JSON.stringify(value)), set: (name, value) => storage.setItem(prefix + name, value === undefined ? null : JSON.stringify(value)),
get: name => { get: name => {

4
src/mami.js/sockchat/handlers.js
View file

@ -79,7 +79,7 @@ const MamiSockChatHandlers = function(
if(ev.detail.diff >= 200) --strength; if(ev.detail.diff >= 200) --strength;
sbActPing.pingMs = ev.detail.diff; sbActPing.pingMs = ev.detail.diff;
pingIndicator.setStrength(strength); pingIndicator.strength = strength;
}; };
@ -107,7 +107,7 @@ const MamiSockChatHandlers = function(
Umi.UI.Emoticons.Init(); Umi.UI.Emoticons.Init();
Umi.Parsing.Init(); Umi.Parsing.Init();
if(ctx.views.count() > 1) if(ctx.views.count > 1)
ctx.views.pop(); ctx.views.pop();
}; };
handlers['session:fail'] = ev => { handlers['session:fail'] = ev => {

10
src/mami.js/sound/context.js
View file

@ -23,11 +23,11 @@ const MamiSoundContext = function() {
pack = value; pack = value;
}, },
get ready() { return audioCtx.isReady; }, get ready() { return audioCtx.ready; },
get volume() { return audioCtx.getVolume(); }, get volume() { return audioCtx.volume; },
set volume(value) { audioCtx.setVolume(value); }, set volume(value) { audioCtx.volume = value; },
get muted() { return audioCtx.isMuted; }, get muted() { return audioCtx.muted; },
set muted(value) { audioCtx.setMuted(value); }, set muted(value) { audioCtx.muted = value; },
reset: audioCtx.reset, reset: audioCtx.reset,
}; };

4
src/mami.js/sound/osukeys.js
View file

@ -28,12 +28,12 @@ const OsuKeys = (() => {
}; };
return { return {
setEnable: function(value) { set enable(value) {
if(value) if(value)
window.addEventListener('keydown', keyHandler); window.addEventListener('keydown', keyHandler);
else else
window.removeEventListener('keydown', keyHandler); window.removeEventListener('keydown', keyHandler);
}, },
setRandomRate: function(value) { sndRng = !!value; }, set randomRate(value) { sndRng = !!value; },
}; };
})(); })();

2
src/mami.js/sound/seinfeld.js
View file

@ -5,6 +5,6 @@ const Seinfeld = (() => {
const rng = new MamiRNG; const rng = new MamiRNG;
return { return {
getRandom: () => `seinfeld:riff${rng.next(1, sounds + 1)}`, get random() { return `seinfeld:riff${rng.next(1, sounds + 1)}`; },
}; };
})(); })();

18
src/mami.js/sound/sndlibrary.js
View file

@ -5,10 +5,10 @@ const MamiSoundInfo = function(name, isReadOnly, title, sources) {
sources = sources || {}; sources = sources || {};
return { return {
getName: () => name, get name() { return name; },
isReadOnly: () => isReadOnly, get readOnly() { return isReadOnly; },
getTitle: () => title, get title() { return title; },
getSources: () => sources, get sources() { return sources; },
}; };
}; };
@ -46,7 +46,7 @@ const MamiSoundLibrary = function(soundMgr) {
throw 'soundInfo does not contain any valid sources'; throw 'soundInfo does not contain any valid sources';
soundInfo = new MamiSoundInfo(soundInfo.name, readOnly, soundInfo.title, sources); soundInfo = new MamiSoundInfo(soundInfo.name, readOnly, soundInfo.title, sources);
sounds.set(soundInfo.getName(), soundInfo); sounds.set(soundInfo.name, soundInfo);
return soundInfo; return soundInfo;
}; };
@ -57,7 +57,7 @@ const MamiSoundLibrary = function(soundMgr) {
return sounds.get(name); return sounds.get(name);
}; };
const getSoundSources = name => getSound(name).getSources(); const getSoundSources = name => getSound(name).sources;
const loadSoundSource = async name => await soundMgr.loadSource(getSoundSources(name)); const loadSoundSource = async name => await soundMgr.loadSource(getSoundSources(name));
return { return {
@ -69,7 +69,7 @@ const MamiSoundLibrary = function(soundMgr) {
sounds.clear(); sounds.clear();
}, },
info: name => getSound(name), info: name => getSound(name),
names: () => Array.from(sounds.keys()), get names() { return Array.from(sounds.keys()); },
has: name => sounds.has(name), has: name => sounds.has(name),
get: getSound, get: getSound,
getSources: getSoundSources, getSources: getSoundSources,
@ -82,10 +82,10 @@ const MamiSoundLibrary = function(soundMgr) {
const source = await loadSoundSource(name); const source = await loadSoundSource(name);
if(typeof volume === 'number') if(typeof volume === 'number')
source.setVolume(volume); source.volume = volume;
if(typeof rate === 'number') if(typeof rate === 'number')
source.setRate(rate); source.rate = rate;
await source.play(); await source.play();
}, },

4
src/mami.js/sound/sndmgr.js
View file

@ -25,8 +25,8 @@ const MamiSoundManager = function(context) {
})(); })();
const extractUrl = urls => { const extractUrl = urls => {
if(typeof urls === 'object' && typeof urls.getSources === 'function') if(typeof urls === 'object' && 'sources' in urls)
urls = urls.getSources(); urls = urls.sources;
if(typeof urls === 'string') if(typeof urls === 'string')
return urls; return urls;

16
src/mami.js/sound/sndpacks.js
View file

@ -9,15 +9,15 @@ const MamiSoundPack = function(name, isReadOnly, title, events) {
const hasEventSound = eventName => events.has(eventName); const hasEventSound = eventName => events.has(eventName);
return { return {
getName: () => name, get name() { return name; },
isReadOnly: () => isReadOnly, get readOnly() { return isReadOnly; },
getTitle: () => title, get title() { return title; },
setTitle: newTitle => { set title(value) {
if(isReadOnly) if(isReadOnly)
throw 'Cannot edit read only sound pack.'; throw 'Cannot edit read only sound pack.';
title = (newTitle || '').toString(); title = (value || '').toString();
}, },
getEventNames: () => Array.from(events.keys()), get eventNames() { return Array.from(events.keys()); },
hasEventSound: hasEventSound, hasEventSound: hasEventSound,
getEventSound: eventNames => { getEventSound: eventNames => {
let event; let event;
@ -83,7 +83,7 @@ const MamiSoundPacks = function() {
throw 'packInfo does not contain any valid events'; throw 'packInfo does not contain any valid events';
packInfo = new MamiSoundPack(packInfo.name, readOnly, packInfo.title, events); packInfo = new MamiSoundPack(packInfo.name, readOnly, packInfo.title, events);
packs.set(packInfo.getName(), packInfo); packs.set(packInfo.name, packInfo);
return packInfo; return packInfo;
}; };
@ -103,7 +103,7 @@ const MamiSoundPacks = function() {
packs.clear(); packs.clear();
}, },
info: name => getPack(name), info: name => getPack(name),
names: () => Array.from(packs.keys()), get names() { return Array.from(packs.keys()); },
has: name => packs.has(name), has: name => packs.has(name),
get: getPack, get: getPack,
}; };

21
src/mami.js/sound/sndtest.jsx
View file

@ -69,13 +69,13 @@ const MamiSoundTest = function(settings, audio, manager, library, clickPos) {
rateSlider.value = ev.detail.value * 1000; rateSlider.value = ev.detail.value * 1000;
for(const source of sources) for(const source of sources)
source.setRate(ev.detail.value); source.rate = ev.detail.value;
}); });
settings.watch('soundDetune', ev => { settings.watch('soundDetune', ev => {
detuneSlider.value = ev.detail.value; detuneSlider.value = ev.detail.value;
for(const source of sources) for(const source of sources)
source.setDetune(ev.detail.value); source.detune = ev.detail.value;
}); });
settings.watch('soundLoopStart', ev => { settings.watch('soundLoopStart', ev => {
loopStartBox.value = ev.detail.value; loopStartBox.value = ev.detail.value;
@ -91,8 +91,8 @@ const MamiSoundTest = function(settings, audio, manager, library, clickPos) {
let controls, state, name; let controls, state, name;
const player = <div class="sndtest-player"> const player = <div class="sndtest-player">
<div class="sndtest-player-details"> <div class="sndtest-player-details">
<div class="sndtest-player-title">{info.getTitle()}</div> <div class="sndtest-player-title">{info.title}</div>
{name = <div class="sndtest-player-name">{info.getName()}</div>} {name = <div class="sndtest-player-name">{info.name}</div>}
</div> </div>
{controls = <div class="sndtest-player-controls"/>} {controls = <div class="sndtest-player-controls"/>}
{state = <div class="sndtest-player-state"/>} {state = <div class="sndtest-player-state"/>}
@ -103,7 +103,7 @@ const MamiSoundTest = function(settings, audio, manager, library, clickPos) {
let buffer, source; let buffer, source;
try { try {
state.textContent = 'Loading...'; state.textContent = 'Loading...';
buffer = await manager.loadBuffer(info.getSources()); buffer = await manager.loadBuffer(info.sources);
name.textContent += ` (${buffer.duration})`; name.textContent += ` (${buffer.duration})`;
source = audio.createSource(buffer, settings.get('soundReverse')); source = audio.createSource(buffer, settings.get('soundReverse'));
@ -111,10 +111,10 @@ const MamiSoundTest = function(settings, audio, manager, library, clickPos) {
state.textContent = 'Configuring...'; state.textContent = 'Configuring...';
const rate = settings.get('soundRate'); const rate = settings.get('soundRate');
source.setRate(rate); source.rate = rate;
const detune = settings.get('soundDetune'); const detune = settings.get('soundDetune');
source.setDetune(detune); source.detune = detune;
const loopStart = settings.get('soundLoopStart'); const loopStart = settings.get('soundLoopStart');
const loopEnd = settings.get('soundLoopEnd'); const loopEnd = settings.get('soundLoopEnd');
@ -136,10 +136,9 @@ const MamiSoundTest = function(settings, audio, manager, library, clickPos) {
} }
}; };
const names = library.names(); for(const name of library.names) {
for(const name of names) {
const info = library.info(name); const info = library.info(name);
libraryButtons.appendChild(<button onclick={() => { startPlay(info); }} data-search={`${info.getTitle().toLowerCase()} ${info.getName().toLowerCase()}`}>{info.getTitle()} ({info.getName()})</button>); libraryButtons.appendChild(<button onclick={() => { startPlay(info); }} data-search={`${info.title.toLowerCase()} ${info.name.toLowerCase()}`}>{info.title} ({info.name})</button>);
} }
searchBox.addEventListener('change', () => { searchBox.addEventListener('change', () => {
@ -149,7 +148,7 @@ const MamiSoundTest = function(settings, audio, manager, library, clickPos) {
}); });
return { return {
getElement: () => container, get element() { return container; },
onViewPop: async () => { onViewPop: async () => {
for(const source of sources) for(const source of sources)
source.stop(); source.stop();

2
src/mami.js/sound/umisound.js
View file

@ -12,7 +12,7 @@ Umi.Sound = (() => {
return; return;
if(mami.settings.get('seinfeld')) if(mami.settings.get('seinfeld'))
return Seinfeld.getRandom(); return Seinfeld.random;
if(minecraft === 'yes') if(minecraft === 'yes')
return 'minecraft:door:open'; return 'minecraft:door:open';

12
src/mami.js/srle.js
View file

@ -1,9 +1,9 @@
const MamiSRLE = (() => { const MamiSRLE = (() => {
return { return {
encode: (input, cutoff) => { encode: (input, cutoff) => {
let output = '', let output = '';
last = '', let last = '';
repeat = 0; let repeat = 0;
input = (input || '').toString(); input = (input || '').toString();
cutoff = cutoff || 1 cutoff = cutoff || 1
@ -33,9 +33,9 @@ const MamiSRLE = (() => {
}, },
decode: input => { decode: input => {
let output = '', let output = '';
repeat = '', let repeat = '';
chr; let chr;
input = (input || '').toString().split('').reverse(); input = (input || '').toString().split('').reverse();

4
src/mami.js/themes.js
View file

@ -317,10 +317,8 @@ const UmiThemeApply = function(theme) {
} }
const coloursPfx = varPfx + 'colour-'; const coloursPfx = varPfx + 'colour-';
for(const propName in theme.colours)
for(const propName in theme.colours) {
document.body.style.setProperty(coloursPfx + propName, MamiColour.hex(theme.colours[propName])); document.body.style.setProperty(coloursPfx + propName, MamiColour.hex(theme.colours[propName]));
}
} }
if(theme.sizes) { if(theme.sizes) {

67
src/mami.js/txtrigs.js
View file

@ -1,6 +1,6 @@
const MamiTextTrigger = function(info) { const MamiTextTrigger = function(info) {
const type = info.type, const type = info.type;
match = info.match; const match = info.match;
for(const i in match) { for(const i in match) {
match[i] = match[i].split(';'); match[i] = match[i].split(';');
@ -9,10 +9,10 @@ const MamiTextTrigger = function(info) {
} }
const pub = { const pub = {
getType: function() { return type; }, get type() { return type; },
isSoundType: function() { return type === 'sound'; }, get isSoundType() { return type === 'sound'; },
isAliasType: function() { return type === 'alias'; }, get isAliasType() { return type === 'alias'; },
isMatch: function(matchText) { isMatch: matchText => {
for(const i in match) { for(const i in match) {
const out = (function(filters, text) { const out = (function(filters, text) {
let result = false; let result = false;
@ -61,22 +61,41 @@ const MamiTextTrigger = function(info) {
}; };
if(type === 'sound') { if(type === 'sound') {
const volume = info.volume || 1.0, const volume = info.volume ?? 1.0;
rate = info.rate || 1.0, const rate = info.rate ?? 1.0;
names = info.sounds || []; const names = info.sounds ?? [];
pub.getVolume = function() { return volume; }; Object.defineProperties(pub, {
pub.getRate = function() { volume: {
if(rate === 'rng') enumerable: true,
return 1.8 - (Math.random() * 1.5); get() { return volume; },
return rate; },
}; rate: {
pub.getSoundNames = function() { return names; }; enumerable: true,
pub.getRandomSoundName = function() { return names[Math.floor(Math.random() * names.length)]; }; get() {
if(rate === 'rng')
return 1.8 - (Math.random() * 1.5);
return rate;
},
},
soundNames: {
enumerable: true,
get() { return names; },
},
getRandomSoundName: {
enumerable: true,
value: () => names[Math.floor(Math.random() * names.length)],
},
});
} else if(type === 'alias') { } else if(type === 'alias') {
const aliasFor = info.for || []; const aliasFor = info.for ?? [];
pub.getFor = function() { return aliasFor; }; Object.defineProperties(pub, {
for: {
enumerable: true,
get() { return aliasFor; },
},
});
} else } else
throw 'Unsupported trigger type.'; throw 'Unsupported trigger type.';
@ -97,8 +116,8 @@ const MamiTextTriggers = function() {
for(const i in triggers) { for(const i in triggers) {
let trigger = triggers[i]; let trigger = triggers[i];
if(trigger.isMatch(text)) { if(trigger.isMatch(text)) {
if(trigger.isAliasType() && !returnAlias) { if(trigger.isAliasType && !returnAlias) {
const aliasFor = trigger.getFor(); const aliasFor = trigger.for;
trigger = getTrigger(aliasFor[Math.floor(Math.random() * aliasFor.length)]); trigger = getTrigger(aliasFor[Math.floor(Math.random() * aliasFor.length)]);
} }
@ -111,7 +130,7 @@ const MamiTextTriggers = function() {
return { return {
addTrigger: addTrigger, addTrigger: addTrigger,
addTriggers: function(triggerInfos) { addTriggers: triggerInfos => {
for(const i in triggerInfos) for(const i in triggerInfos)
try { try {
addTrigger(triggerInfos[i]); addTrigger(triggerInfos[i]);
@ -119,10 +138,10 @@ const MamiTextTriggers = function() {
console.error(ex); console.error(ex);
} }
}, },
clearTriggers: function() { clearTriggers: () => {
triggers = []; triggers = [];
}, },
hasTriggers: function() { get hasTriggers() {
return triggers.length > 0; return triggers.length > 0;
}, },
getTrigger: getTrigger, getTrigger: getTrigger,

13
src/mami.js/ui/loading-overlay.jsx
View file

@ -38,12 +38,13 @@ Umi.UI.LoadingOverlay = function(icon, header, message) {
setMessage(message); setMessage(message);
return { return {
setIcon: setIcon, get icon() { return iconElem.className; },
setHeader: setHeader, set icon(value) { setIcon(value); },
setMessage: setMessage, get header() { return headerElem.textContent; },
getElement: function() { set header(value) { setHeader(value); },
return html; get message() { return messageElem.innerHTML; },
}, set message(value) { setMessage(value); },
get element() { return html; },
getViewTransition: mode => { getViewTransition: mode => {
if(mode === 'pop') if(mode === 'pop')
return ctx => MamiAnimate({ return ctx => MamiAnimate({

2
src/mami.js/ui/markup.js
View file

@ -29,7 +29,7 @@ Umi.UI.Markup = (function() {
presets: futami.get('colours'), presets: futami.get('colours'),
}); });
pickerTarget.appendChild(picker.getElement()); pickerTarget.appendChild(picker.element);
picker.dialog(picker.suggestPosition(ev)) picker.dialog(picker.suggestPosition(ev))
.then(colour => insertRaw(`[color=${MamiColour.hex(colour)}]`, '[/color]')) .then(colour => insertRaw(`[color=${MamiColour.hex(colour)}]`, '[/color]'))

6
src/mami.js/ui/messages.jsx
View file

@ -136,11 +136,11 @@ Umi.UI.Messages = (function() {
if(mami.settings.get('playJokeSounds')) if(mami.settings.get('playJokeSounds'))
try { try {
const trigger = mami.textTriggers.getTrigger(msgText); const trigger = mami.textTriggers.getTrigger(msgText);
if(trigger.isSoundType()) { if(trigger.isSoundType) {
soundIsLegacy = false; soundIsLegacy = false;
soundName = trigger.getRandomSoundName(); soundName = trigger.getRandomSoundName();
soundVolume = trigger.getVolume(); soundVolume = trigger.volume;
soundRate = trigger.getRate(); soundRate = trigger.rate;
} }
} catch(ex) {} } catch(ex) {}
} else { } else {

2
src/mami.js/utility.js
View file

@ -118,7 +118,7 @@ const $e = function(info, attrs, child, created) {
elem.appendChild(childElem); elem.appendChild(childElem);
else else
elem.appendChild($e(child)); elem.appendChild($e(child));
} else if(child.getElement) { } else if('getElement' in child) {
const childElem = child.getElement(); const childElem = child.getElement();
if(childElem instanceof Element) if(childElem instanceof Element)
elem.appendChild(childElem); elem.appendChild(childElem);