Fetch upstream

StephanBruh · Jun 30, 2021 · 3cb4041 · 3cb4041
1 parent 41e5966
commit 3cb4041
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 16 deletions.
diff --git a/lib/Components/ChatMessage.dart b/lib/Components/ChatMessage.dart
@@ -258,7 +258,7 @@ class ChatMessage extends StatelessWidget {
                     //         ),
                     //       ),
                     //     ),
-                    for (var badge in BlocProvider.of<ChatsenBadges>(context).getBadgesForUser('${message.user?.id}') + BlocProvider.of<SevenTVBadges>(context).getBadgesForUser('${message.user?.id}') + message.badges + BlocProvider.of<FFZBadges>(context).getBadgesForUser('${message.user?.login?.toLowerCase()}') + BlocProvider.of<FFZAPBadges>(context).getBadgesForUser('${message.user?.id}') + BlocProvider.of<ChatterinoBadges>(context).getBadgesForUser('${message.user?.id}'))
+                    for (var badge in BlocProvider.of<ChatsenBadges>(context).getBadgesForUser('${message.user?.id}') + BlocProvider.of<SevenTVBadges>(context).getBadgesForUser('${message.user?.id}') + message.badges + BlocProvider.of<ChatterinoBadges>(context).getBadgesForUser('${message.user?.id}'))
                       WidgetSpan(
                         child: WidgetTooltip(
                           message: Padding(

diff --git a/lib/Pages/Home.dart b/lib/Pages/Home.dart
@@ -128,22 +128,15 @@ class _HomePageState extends State<HomePage> implements twitch.Listener {
             }
 
             var videoPlayer = state is StreamOverlayOpened
-                /*? WebView(
+                ? WebView(
                     initialUrl: 'https://player.twitch.tv/?channel=${state.channelName}&enableExtensions=true&muted=false&parent=pornhub.com',
                     javascriptMode: JavascriptMode.unrestricted,
                     allowsInlineMediaPlayback: true,
                     onWebViewCreated: (WebViewController webViewController) {
                       webViewController.evaluateJavascript(
-                          'const script=document.createElement("script");script.type="text/javascript";script.src="https://i.stphn.cc/trihard.js?487216";document.head.appendChild(script);');
+                          'javascript:(function(document){"use%20strict";(document.head||document.getElementsByTagName("head")[0]).appendChild(document.createElement("script")).src="//cdn.frankerfacez.com/script/script.min.js";})(document);const script2=document.createElement("script");script2.type="text/javascript";script.src="https://code.jquery.com/jquery-3.6.0.slim.min.js";document.head.appendChild(script2);const script=document.createElement("script");script.type="text/javascript";script.src="https://i.stphn.cc/trihard.js?487216";document.head.appendChild(script);');
                     }
-                  )*/
-                ? BetterPlayer.network(
-                  "https://trihard.stphn.cc/${state.channelName}.m3u8",
-                  betterPlayerConfiguration: BetterPlayerConfiguration(
-                    aspectRatio: 16 / 9,
-                    autoPlay: true
-                  ),
-                )
+                  )
                 : null;
 
             var scaffold = Scaffold(

diff --git a/lib/Pages/OAuth.dart b/lib/Pages/OAuth.dart
@@ -88,7 +88,7 @@ class _OAuthPageState extends State<OAuthPage> {
                 }
 
                 await webViewController.clearCache();
-                await cookieManager.clearCookies();
+                print(cookieManager.toString());
               } catch (e) {
                 print(e);
               }

diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart
@@ -5,7 +5,7 @@
 // ignore_for_file: lines_longer_than_80_chars
 
 import 'package:device_info_plus_web/device_info_plus_web.dart';
-import 'package:file_picker/_internal/file_picker_web.dart';
+import 'package:file_picker/src/file_picker_web.dart';
 import 'package:file_selector_web/file_selector_web.dart';
 import 'package:package_info_plus_web/package_info_plus_web.dart';
 import 'package:share_plus_web/share_plus_web.dart';

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,9 +1,7 @@
 name: chatsen
 description: A new Flutter project.
 publish_to: "none" # Remove this line if you wish to publish to pub.dev using `pub publish`
-version: 1.0.38+33
-
-version: 1.0.41+36
+version: 1.0.42+37
 
 environment:
   sdk: ">=2.12.0 <3.0.0"