1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-03 08:28:31 +00:00
* Fixed: Leaky name matching when the user has listed more than one name to highlight or block.
* Fixed: Blacklist several Twitch errors that were being captured by automatic error reporting.
* Fixed: The optional FFZ Emote Menu icon not displaying properly when the menu is open.
* Changed: Styling of FFZ entries added to the chat settings menu to match the updated aesthetics.
* Changed: Update dependencies.
This commit is contained in:
SirStendec 2019-07-29 15:48:00 -04:00
parent a4d9483fa4
commit 37ef0c250e
7 changed files with 646 additions and 288 deletions

865
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,7 +1,7 @@
{
"name": "frankerfacez",
"author": "Dan Salvato LLC",
"version": "4.6.1",
"version": "4.6.2",
"description": "FrankerFaceZ is a Twitch enhancement suite.",
"license": "Apache-2.0",
"scripts": {
@ -20,7 +20,7 @@
"build:dev": "npm run clean && webpack --config webpack.web.dev.js"
},
"devDependencies": {
"@babel/core": "^7.4.5",
"@babel/core": "^7.5.5",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
"@babel/plugin-proposal-optional-chaining": "^7.2.0",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
@ -28,25 +28,25 @@
"babel-eslint": "^10.0.2",
"babel-loader": "^8.0.6",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.0.3",
"copy-webpack-plugin": "^5.0.4",
"cross-env": "^5.2.0",
"css-loader": "^3.0.0",
"eslint": "^5.16.0",
"eslint-plugin-react": "^7.13.0",
"eslint-plugin-vue": "^5.2.2",
"css-loader": "^3.1.0",
"eslint": "^6.1.0",
"eslint-plugin-react": "^7.14.3",
"eslint-plugin-vue": "^5.2.3",
"extract-loader": "^2.0.1",
"file-loader": "^4.0.0",
"file-loader": "^4.1.0",
"json-loader": "^0.5.7",
"node-sass": "^4.12.0",
"raw-loader": "^3.0.0",
"raw-loader": "^3.1.0",
"rimraf": "^2.6.3",
"sass-loader": "^7.1.0",
"semver": "^6.1.1",
"semver": "^6.3.0",
"terser-webpack-plugin": "^1.3.0",
"vue-loader": "^15.7.0",
"vue-loader": "^15.7.1",
"vue-template-compiler": "^2.6.10",
"webpack": "^4.34.0",
"webpack-cli": "^3.3.4",
"webpack": "^4.38.0",
"webpack-cli": "^3.3.6",
"webpack-dev-server": "^3.7.2",
"webpack-manifest-plugin": "^2.0.4",
"webpack-merge": "^4.2.1"
@ -58,25 +58,25 @@
"dependencies": {
"@ffz/icu-msgparser": "^1.0.1",
"crypto-js": "^3.1.9-1",
"dayjs": "^1.7.7",
"dayjs": "^1.8.15",
"displacejs": "^1.2.4",
"emoji-regex": "^8.0.0",
"file-saver": "^2.0.1",
"graphql": "^14.3.1",
"graphql": "^14.4.2",
"graphql-tag": "^2.9.1",
"js-cookie": "^2.2.0",
"markdown-it": "^8.4.1",
"markdown-it": "^9.0.1",
"markdown-it-link-attributes": "^2.1.0",
"path-to-regexp": "^3.0.0",
"popper.js": "^1.14.3",
"raven-js": "^3.24.2",
"react": "^16.4.1",
"safe-regex": "^2.0.2",
"sortablejs": "^1.10.0-rc1",
"sortablejs": "^1.10.0-rc3",
"vue": "^2.6.10",
"vue-clickaway": "^2.2.2",
"vue-color": "^2.4.6",
"vue-observe-visibility": "^0.4.4",
"vuedraggable": "^2.16.0"
"vuedraggable": "^2.23.0"
}
}

View file

@ -338,7 +338,7 @@ export default class Chat extends Module {
}
for(const [key, list] of colors) {
colors.set(key, new RegExp(`^${list.join('|')}$`, 'gi'));
colors.set(key, new RegExp(`^(?:${list.join('|')})$`, 'gi'));
}
return colors;
@ -389,7 +389,7 @@ export default class Chat extends Module {
if ( ! data.length )
return null;
return new RegExp(`^${data.join('|')}$`, 'gi');
return new RegExp(`^(?:${data.join('|')})$`, 'gi');
});
}
});

View file

@ -140,7 +140,10 @@ export default class RavenLogger extends Module {
'freed script',
'ffzenhancing',
'dead object',
'Name Collision for Module'
'Name Collision for Module',
'SourceBuffer',
'ChunkLoadError',
'QuotaExceededError'
],
sanitizeKeys: [
/Token$/

View file

@ -82,7 +82,23 @@ export default class SettingsMenu extends Module {
f === 9 ? t.i18n.t('key.shift_mouse', 'Shift or Mouse') :
t.i18n.t('key.hover', 'Hover');
val.props.children.push(<div class="tw-mg-t-1">
val.props.children.push(<div class="tw-full-width tw-relative">
<button
class="tw-block tw-border-radius-medium tw-full-width tw-interactable tw-interactable--inverted tw-interactive"
onClick={this.ffzPauseClick}
>
<div class="tw-align-items-center tw-flex tw-pd-05 tw-relative">
<div class="tw-flex-grow-1">
{t.i18n.t('chat.settings.pause', 'Pause Chat')}
</div>
<div class="tw-mg-l-1 tw-pd-x-05">{reason}</div>
<figure class="tw-svg ffz-i-right-dir" />
</div>
</button>
</div>);
/*val.props.children.push(<div class="tw-mg-t-1">
<button
class="tw-block tw-full-width tw-interactable tw-interactable--base tw-interactive"
onClick={this.ffzPauseClick}
@ -95,7 +111,7 @@ export default class SettingsMenu extends Module {
</div>
</div>
</button>
</div>)
</div>)*/
return val;
}

View file

@ -1,4 +1,4 @@
.tw-button-icon[data-a-target="emote-picker-button"] {
button[data-a-target="emote-picker-button"] {
.tw-button-icon__icon {
padding: .6rem .4rem .2rem .4rem;

View file

@ -7,7 +7,7 @@ export const CLIENT_ID = 'a3bc9znoz6vi8ozsoca0inlcr4fcvkl';
export const API_SERVER = '//api.frankerfacez.com';
export const NEW_API = '//api-test.frankerfacez.com';
export const SENTRY_ID = 'https://18f42c65339d4164b3fdebfc8c8bc99b@sentry.io/1186960';
export const SENTRY_ID = 'https://1c3b56f127254d3ba1bd1d6ad8805eee@sentry.io/1186960';
export const LV_SERVER = 'https://cbenni.com/api';