oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-03 16:38:31 +00:00
Code Wiki Activity

4.20.29

Browse source 
* Changed: Position the default `Reply to Message` in-line action after mod actions.
* Fixed: The `Reply to Message` action not working as a User Context action.
* Fixed: Twitch emotes appearing incorrectly within reply messages.
* API Changed: `array_merge` settings now inherit their `default` values if the lowest profile has an inheritance point.
This commit is contained in:
SirStendec 2020-08-12 18:34:40 -04:00
parent 463c9f9a45
commit c48423a7b2
6 changed files with 67 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/settings/types.js
View file

@ -4,6 +4,8 @@
// Settings Types
// ============================================================================
const DEFAULT = Symbol('default');
export const basic = {
get(key, profiles) {
for(const profile of profiles)
@ -52,41 +54,55 @@ export const array_merge = {
return values;
},
get(key, profiles, definition, log) {
get(key, profiles, definition, log, ctx) {
const values = [],
sources = [];
let trailing = [];
let had_value = false;
for(const profile of profiles)
if ( profile.has(key) ) {
const value = profile.get(key),
trail = [];
const profs = [...profiles, DEFAULT];
if ( ! Array.isArray(value) ) {
for(const profile of profs) {
let value;
if ( profile === DEFAULT ) {
value = definition.default;
if ( typeof value === 'function' )
value = value(ctx);
} else if ( profile.has(key) )
value = profile.get(key);
else
continue;
if ( ! Array.isArray(value) ) {
if ( profile !== DEFAULT )
log.warn(`Profile #${profile.id} has an invalid value for "${key}" of type ${typeof value}. Skipping.`);
continue;
}
sources.push(profile.id);
let is_trailing = false;
for(const val of value) {
had_value = true;
if ( val.t === 'inherit' )
is_trailing = true;
else if ( is_trailing )
trail.push(val.v);
else
values.push(val.v);
}
trailing = trail.concat(trailing);
// If we didn't run into an inherit, don't inherit.
if ( ! is_trailing && ! definition.always_inherit )
break;
continue;
}
const trail = [];
if ( profile !== DEFAULT )
sources.push(profile.id);
let is_trailing = false;
for(const val of value) {
had_value = true;
if ( val.t === 'inherit' )
is_trailing = true;
else if ( is_trailing )
trail.push(val.v);
else
values.push(val.v);
}
trailing = trail.concat(trailing);
// If we didn't run into an inherit, don't inherit.
if ( ! is_trailing && ! definition.always_inherit )
break;
}
if ( had_value )
return [
values.concat(trailing),