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

4.0.0-rc13.16.1

Browse source 
* Changed: Increase the timeout length significantly for rich embeds because the link service can be a bit slow, depending on what it's looking up.
This commit is contained in:
SirStendec 2018-12-13 15:57:28 -05:00
parent d0789481fa
commit 199b9c9315
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.js
View file

@ -149,7 +149,7 @@ ${typeof x[1] === 'string' ? x[1] : JSON.stringify(x[1], null, 4)}`
FrankerFaceZ.Logger = Logger; FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = { const VER = FrankerFaceZ.version_info = {
major: 4, minor: 0, revision: 0, extra: '-rc13.16', major: 4, minor: 0, revision: 0, extra: '-rc13.16.1',
commit: __git_commit__, commit: __git_commit__,
build: __webpack_hash__, build: __webpack_hash__,
toString: () => toString: () =>

1
src/modules/chat/rich_providers.js
View file

@ -31,6 +31,7 @@ export const Links = {
return { return {
card_tooltip: true, card_tooltip: true,
url: token.url, url: token.url,
timeout: 0,
getData: async () => { getData: async () => {
const data = await this.get_link_info(token.url); const data = await this.get_link_info(token.url);

4
src/sites/twitch-twilight/modules/chat/rich_content.jsx
View file

@ -5,7 +5,7 @@
// ============================================================================ // ============================================================================
import Module from 'utilities/module'; import Module from 'utilities/module';
import {timeout} from 'utilities/object'; import {timeout, has} from 'utilities/object';
const ERROR_IMAGE = 'https://static-cdn.jtvnw.net/emoticons/v1/58765/2.0'; const ERROR_IMAGE = 'https://static-cdn.jtvnw.net/emoticons/v1/58765/2.0';
@ -41,7 +41,7 @@ export default class RichContent extends Module {
try { try {
let data = this.props.getData(); let data = this.props.getData();
if ( data instanceof Promise ) { if ( data instanceof Promise ) {
const to_wait = this.props.timeout || 1000; const to_wait = has(this.props, 'timeout') ? this.props.timeout : 1000;
if ( to_wait ) if ( to_wait )
data = await timeout(data, to_wait); data = await timeout(data, to_wait);
else else