From c22d539a7b39f103fffc80649e3df628c1286f57 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 7 Oct 2019 12:46:40 -0700 Subject: [PATCH] UI: Remove FFZ from twitch integration Unfortunately, due to some conflicts between FFZ and BTTV (particularly the fact that having FFZ enabled removes the BTTV settings menu items), one of them needs to be removed. For the time being, we'll remove FFZ, because BTTV shows FFZ emojis anyway. --- UI/auth-twitch.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/UI/auth-twitch.cpp b/UI/auth-twitch.cpp index 3cd8b79a6..bafc792a2 100644 --- a/UI/auth-twitch.cpp +++ b/UI/auth-twitch.cpp @@ -35,9 +35,6 @@ TwitchAuth::TwitchAuth(const Def &d) : OAuthStreamKey(d) if (!cef) return; - cef->add_popup_whitelist_url( - "https://twitch.tv/popout/frankerfacez/chat?ffz-settings", - this); uiLoadTimer.setSingleShot(true); uiLoadTimer.setInterval(500); connect(&uiLoadTimer, &QTimer::timeout, this, @@ -158,11 +155,6 @@ bool TwitchAuth::LoadInternal() return OAuthStreamKey::LoadInternal(); } -static const char *ffz_script = "\ -var ffz = document.createElement('script');\ -ffz.setAttribute('src','https://cdn.frankerfacez.com/script/script.min.js');\ -document.head.appendChild(ffz);"; - static const char *bttv_script = "\ localStorage.setItem('bttv_clickTwitchEmotes', true);\ localStorage.setItem('bttv_darkenedMode', true);\ @@ -217,7 +209,6 @@ void TwitchAuth::LoadUI() cef->add_force_popup_url(moderation_tools_url, chat.data()); script = bttv_script; - script += ffz_script; browser->setStartupScript(script); main->addDockWidget(Qt::RightDockWidgetArea, chat.data()); @@ -261,7 +252,6 @@ void TwitchAuth::LoadSecondaryUIPanes() script += "/dashboard/live"; script += referrer_script2; script += bttv_script; - script += ffz_script; /* ----------------------------------- */