refactor: idk what to put here

QuackerApp · Apr 21, 2024 · ca868d3 · ca868d3
1 parent 5605543
commit ca868d3
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 33 deletions.
diff --git a/lib/client/client.dart b/lib/client/client.dart
@@ -37,10 +37,11 @@ class _QuackerTwitterClient extends TwitterClient {
 
   static Future<http.Response?> fetch(Uri uri, {Map<String, String>? headers}) async {
     var prefs = await PrefServiceShared.init(prefix: 'pref_');
+    final XRegularAccount xRegularAccount = XRegularAccount(prefs);
     var authHeader = await getAuthHeader(prefs);
 
     if (authHeader != null) {
-      return await fetchAuthenticated(uri, headers: headers, log: log, prefs: prefs, authHeader: authHeader);
+      return await xRegularAccount.fetch(uri, headers: headers, log: log, prefs: prefs, authHeader: authHeader);
     } else {
       return await fetchUnauthenticated(uri, headers: headers, log: log);
     }

diff --git a/lib/client/client_regular_account.dart b/lib/client/client_regular_account.dart
@@ -11,7 +11,7 @@ import 'package:quacker/generated/l10n.dart';
 
 Future<String> addAccount(BasePrefService prefs, String username, String password, String email) async {
   var database = await Repository.writable();
-  final model = WebFlowAuthModel(prefs);
+  final model = XRegularAccount(prefs);
 
   try {
     final authHeader = await model.GetAuthHeader(username: username, password: password, email: email);
@@ -42,7 +42,7 @@ Future<List<Map<String, Object?>>> getAccounts() async {
 
 Future<Map<dynamic, dynamic>?> getAuthHeader(BasePrefService prefs) async {
   final accounts = await getAccounts();
-  final model = WebFlowAuthModel(prefs);
+  final model = XRegularAccount(prefs);
 
   if (accounts.isNotEmpty) {
     Map<String, Object?> account = accounts[Random().nextInt(accounts.length)];
@@ -56,35 +56,13 @@ Future<Map<dynamic, dynamic>?> getAuthHeader(BasePrefService prefs) async {
   }
 }
 
-Future<http.Response?> fetchAuthenticated(Uri uri,
-    {Map<String, String>? headers,
-    required Logger log,
-    required BasePrefService prefs,
-    required Map<dynamic, dynamic> authHeader}) async {
-  log.info('Fetching $uri');
-
-  WebFlowAuthModel webFlowAuthModel = WebFlowAuthModel(prefs);
-  var response = await http.get(uri, headers: {
-    ...?headers,
-    ...authHeader,
-    ...userAgentHeader,
-    'authorization': bearerToken,
-    'x-guest-token': (await webFlowAuthModel.GetGT(userAgentHeader)).toString(),
-    'x-twitter-active-user': 'yes',
-    'user-agent': userAgentHeader.toString()
-  });
-
-  return response;
-}
-
-class WebFlowAuthModel extends ChangeNotifier {
-  static final log = Logger('WebFlowAuthModel');
+class XRegularAccount extends ChangeNotifier {
+  static final log = Logger('XRegularAccount');
 
-  WebFlowAuthModel(this.prefs) : super();
+  XRegularAccount(this.prefs) : super();
   final BasePrefService prefs;
 
   static http.Client client = http.Client();
-  //static webFlowAuthModel =WebFlowAuthModel();
   static List<String> cookies = [];
 
   static Map<String, String>? _authHeader;
@@ -102,6 +80,27 @@ class WebFlowAuthModel extends ChangeNotifier {
       csrf_token;
   static var kdt_Coookie;
 
+  Future<http.Response?> fetch(Uri uri,
+      {Map<String, String>? headers,
+      required Logger log,
+      required BasePrefService prefs,
+      required Map<dynamic, dynamic> authHeader}) async {
+    log.info('Fetching $uri');
+
+    XRegularAccount xRegularAccount = XRegularAccount(prefs);
+    var response = await http.get(uri, headers: {
+      ...?headers,
+      ...authHeader,
+      ...userAgentHeader,
+      'authorization': bearerToken,
+      'x-guest-token': (await xRegularAccount.GetGT(userAgentHeader)).toString(),
+      'x-twitter-active-user': 'yes',
+      'user-agent': userAgentHeader.toString()
+    });
+
+    return response;
+  }
+
   static Future<PrefServiceShared> GetSharedPrefs() async {
     return await PrefServiceShared.init(prefix: 'pref_');
     // prefs = await SharedPreferences.getInstance();

diff --git a/lib/main.dart b/lib/main.dart
@@ -226,7 +226,7 @@ Future<void> main() async {
           Provider(create: (context) => TrendLocationsModel()),
           Provider(create: (context) => TrendsModel(trendLocationModel)),
           ChangeNotifierProvider(create: (_) => VideoContextState(prefService.get(optionMediaDefaultMute))),
-          ChangeNotifierProvider(create: (_) => WebFlowAuthModel(prefService)),
+          ChangeNotifierProvider(create: (_) => XRegularAccount(prefService)),
         ],
         child: FritterApp(),
         builder: (BuildContext _, Widget? w) => w ?? Container(),

diff --git a/lib/settings/_account.dart b/lib/settings/_account.dart
@@ -15,7 +15,7 @@ class SettingsAccountFragment extends StatefulWidget {
 class _SettingsAccountFragment extends State<SettingsAccountFragment> {
   @override
   Widget build(BuildContext context) {
-    var model = context.read<WebFlowAuthModel>();
+    var model = context.read<XRegularAccount>();
     return Scaffold(
       appBar: AppBar(
         title: Text(L10n.current.account),
@@ -62,7 +62,7 @@ class _SettingsAccountFragment extends State<SettingsAccountFragment> {
 }
 
 class addDialog extends StatefulWidget {
-  final WebFlowAuthModel model;
+  final XRegularAccount model;
   final String username;
   final String password;
   final String email;

diff --git a/lib/settings/settings.dart b/lib/settings/settings.dart
@@ -1,6 +1,4 @@
 import 'dart:async';
-
-import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
 import 'package:quacker/generated/l10n.dart';
 import 'package:quacker/settings/_about.dart';