oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-06 11:08:30 +00:00
Code Wiki Activity

4.0.0-rc13.6

Browse source 
* Fixed: Don't hide streams of a blocked game on that game's page.
* API Changed: Expose the settings mixin for Vue components.
This commit is contained in:
SirStendec 2018-10-22 18:56:24 -04:00
parent 87f3f1835b
commit b4b6f1a1cd
6 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.js
View file

@ -100,7 +100,7 @@ class FrankerFaceZ extends Module {
FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = {
major: 4, minor: 0, revision: 0, extra: '-rc13.5',
major: 4, minor: 0, revision: 0, extra: '-rc13.6',
commit: __git_commit__,
build: __webpack_hash__,
toString: () =>

4
src/modules/main_menu/index.js
View file

@ -10,6 +10,8 @@ import {has, deep_copy} from 'utilities/object';
import Dialog from 'utilities/dialog';
import Mixin from './setting-mixin';
import {parse_path} from 'src/settings';
function format_term(term) {
@ -30,6 +32,8 @@ export default class MainMenu extends Module {
this.load_requires = ['vue'];
this.Mixin = Mixin;
//this.should_enable = true;
this._settings_tree = null;

2
src/sites/twitch-twilight/modules/chat/settings_menu.jsx
View file

@ -19,7 +19,7 @@ export default class SettingsMenu extends Module {
this.SettingsMenu = this.fine.define(
'chat-settings',
n => n.renderUniversalOptions && n.dismissRaidsTooltip,
n => n.renderUniversalOptions && n.onBadgesChanged,
Twilight.CHAT_ROUTES
);
}

4
src/sites/twitch-twilight/modules/directory/game.gql
View file

@ -1,7 +1,3 @@
query {
__type
}
fragment directoryPageGameStreamWithTagsEdge on StreamEdge {
node {
createdAt

18
src/sites/twitch-twilight/modules/directory/game.jsx
View file

@ -28,7 +28,15 @@ export default class Game extends SiteModule {
);
this.apollo.registerModifier('DirectoryPage_Game', GAME_QUERY);
this.apollo.registerModifier('DirectoryPage_Game', res => this.modifyStreams(res), false);
this.apollo.registerModifier('DirectoryPage_Game', res => {
setTimeout(() =>
this.apollo.ensureQuery(
'DirectoryPage_Game',
'data.game.streams.edges.0.node.createdAt'
), 500);
this.modifyStreams(res);
}, false);
}
modifyStreams(res) { // eslint-disable-line class-methods-use-this
@ -36,7 +44,7 @@ export default class Game extends SiteModule {
if ( ! edges || ! edges.length )
return res;
res.data.game.streams.edges = this.parent.processNodes(edges);
res.data.game.streams.edges = this.parent.processNodes(edges, true);
return res;
}
@ -53,6 +61,12 @@ export default class Game extends SiteModule {
updateGameHeader(inst) {
this.updateButtons(inst);
this.apollo.ensureQuery(
'DirectoryPage_Game',
'data.game.streams.edges.0.node.createdAt'
);
}

2
src/sites/twitch-twilight/modules/directory/index.jsx
View file

@ -236,7 +236,7 @@ export default class Directory extends SiteModule {
return;
const props = inst.props,
game = props.gameTitle || props.playerMetadataGame;
game = props.gameTitle || props.playerMetadataGame || (props.trackingProps && props.trackingProps.categoryName);
container.classList.toggle('ffz-hide-thumbnail', this.settings.provider.get('directory.game.hidden-thumbnails', []).includes(game));