Browse Source

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.
jp9000 6 years ago
parent
commit
c22d539a7b
1 changed files with 0 additions and 10 deletions
  1. 0 10
      UI/auth-twitch.cpp

+ 0 - 10
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;
 
 	/* ----------------------------------- */