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

Add info and question icons. Bump version to beta1.7. Add chat badge visibility. Add support for setting inheritance merge strategies.

Browse source
This commit is contained in:
SirStendec 2018-03-22 22:39:27 -04:00
parent 19c81bb049
commit cc682230e2
16 changed files with 222 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/chat/badges.js
View file

@ -147,8 +147,9 @@ export default class Badges extends Module {
this.twitch_badges = {};
this.settings.add('chat.badges.hidden', {
default: [],
_ui: {
default: {},
type: 'object_merge',
ui: {
path: 'Chat > Badges >> tabs ~> Visibility',
component: 'badge-visibility',
data: () => {
@ -297,7 +298,7 @@ export default class Badges extends Module {
render(msg, e) { // eslint-disable-line class-methods-use-this
const hidden_badges = this.parent.context.get('chat.badges.hidden') || [],
const hidden_badges = this.parent.context.get('chat.badges.hidden') || {},
badge_style = this.parent.context.get('chat.badges.style'),
custom_mod = this.parent.context.get('chat.badges.custom-mod'),
is_mask = badge_style > 5,
@ -324,7 +325,7 @@ export default class Badges extends Module {
const version = twitch_badges[badge_id],
is_game = badge_id.endsWith('_1');
if ( hidden_badges.includes(badge_id) || (is_game && hidden_badges.includes('game')) )
if ( hidden_badges[badge_id] || (is_game && hidden_badges.game) )
continue;
if ( has(BADGE_POSITIONS, badge_id) )
@ -365,7 +366,7 @@ export default class Badges extends Module {
for(const badge of badges)
if ( badge && badge.id ) {
if ( hidden_badges.includes(badge.id) )
if ( hidden_badges[badge.id] )
continue;
const full_badge = this.badges[badge.id],