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

4.0.0-rc6.3

Browse source 
* Fixed: Emotes in locally echoed chat messages. (Update code for parsing emotes in locally echoed chat messages to find emote data in the new location.)
* Fixed: Automatic opting out from raids not working in pop-out chat.
This commit is contained in:
SirStendec 2018-07-18 17:06:14 -04:00
parent badb3f296e
commit 30ec9749da
4 changed files with 23 additions and 17 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; FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = { const VER = FrankerFaceZ.version_info = {
major: 4, minor: 0, revision: 0, extra: '-rc6.2', major: 4, minor: 0, revision: 0, extra: '-rc6.3',
commit: __git_commit__, commit: __git_commit__,
build: __webpack_hash__, build: __webpack_hash__,
toString: () => toString: () =>

4
src/sites/twitch-twilight/modules/channel.js
View file

@ -7,6 +7,8 @@
import Module from 'utilities/module'; import Module from 'utilities/module';
import { has } from 'utilities/object'; import { has } from 'utilities/object';
import Twilight from 'site';
export default class Channel extends Module { export default class Channel extends Module {
constructor(...args) { constructor(...args) {
@ -49,7 +51,7 @@ export default class Channel extends Module {
this.RaidController = this.fine.define( this.RaidController = this.fine.define(
'raid-controller', 'raid-controller',
n => n.handleLeaveRaid && n.handleJoinRaid, n => n.handleLeaveRaid && n.handleJoinRaid,
['user'] Twilight.CHAT_ROUTES
); );
} }

12
src/sites/twitch-twilight/modules/chat/index.js
View file

@ -731,17 +731,15 @@ export default class ChatHook extends Module {
cls.prototype.ffzGetEmotes = function() { cls.prototype.ffzGetEmotes = function() {
const emote_sets = this.client && this.client.session && this.client.session.emoteSets; const emote_map = this.client && this.client.session && this.client.session.emoteMap;
if ( this._ffz_cached_sets === emote_sets ) if ( this._ffz_cached_map === emote_map )
return this._ffz_cached_emotes; return this._ffz_cached_emotes;
this._ffz_cached_sets = emote_sets; this._ffz_cached_map = emote_map;
const emotes = this._ffz_cached_emotes = {}; const emotes = this._ffz_cached_emotes = {};
if ( emote_sets ) if ( emote_map )
for(const set of emote_sets) for(const emote of Object.values(emote_map))
if ( set && set.emotes )
for(const emote of set.emotes)
if ( emote ) { if ( emote ) {
const token = emote.token; const token = emote.token;
if ( Array.isArray(REGEX_EMOTES[token]) ) { if ( Array.isArray(REGEX_EMOTES[token]) ) {

6
webpack.web.babel.js
View file

@ -1,3 +1,4 @@
const webpack = require('webpack');
const merge = require('webpack-merge'); const merge = require('webpack-merge');
const common = require('./webpack.web.common.js'); const common = require('./webpack.web.common.js');
const path = require('path'); const path = require('path');
@ -6,6 +7,8 @@ const CleanPlugin = require('clean-webpack-plugin');
const UglifyJSPlugin = require('uglifyjs-webpack-plugin'); const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
const ManifestPlugin = require('webpack-manifest-plugin'); const ManifestPlugin = require('webpack-manifest-plugin');
const commit_hash = require('child_process').execSync('git rev-parse HEAD').toString().trim();
/* global module __dirname */ /* global module __dirname */
const config = module.exports = merge(common, { const config = module.exports = merge(common, {
@ -39,6 +42,9 @@ const config = module.exports = merge(common, {
} }
} }
}), }),
new webpack.DefinePlugin({
__git_commit__: JSON.stringify(commit_hash)
}),
new ManifestPlugin({ new ManifestPlugin({
basePath: 'babel/', basePath: 'babel/',
publicPath: 'babel/', publicPath: 'babel/',