Merge remote-tracking branch 'upstream/develop' into feature/reorder-…

…accounts

lib/account/models/account.dart

@@ -39,7 +39,7 @@ class Account {
 
   static Future<Account?> insertAccount(Account account) async {
     // If we are given a brand new account to insert with an existing id, something is wrong.
-    assert(account.id.isEmpty && account.index == -1);
+    assert(account.id.isEmpty && account.index == -1 && !account.anonymous);
 
     try {
       // Find the highest index in the current accounts
@@ -54,7 +54,7 @@ class Account {
               jwt: Value(account.jwt),
               instance: Value(account.instance),
               userId: Value(account.userId),
-              listIndex: Value(newIndex),
+              listIndex: newIndex,
             ),
           );
 
@@ -97,12 +97,31 @@ class Account {
   // A method that retrieves all accounts from the database. Does not include anonymous instances
   static Future<List<Account>> accounts() async {
     try {
-      return (await database.accounts.all().get())
+      return (await (database.select(database.accounts)..where((t) => t.anonymous.equals(false))).get())
+          .map((account) => Account(
+                id: account.id.toString(),
+                username: account.username,
+                jwt: account.jwt,
+                instance: account.instance ?? '',
+                userId: account.userId,
+                index: account.listIndex,
+              ))
+          .toList();
+    } catch (e) {
+      debugPrint(e.toString());
+      return [];
+    }
+  }
+
+  // A method that retrieves all anonymous instances from the database. Does not include logged in accounts.
+  static Future<List<Account>> anonymousInstances() async {
+    try {
+      return (await (database.select(database.accounts)..where((t) => t.anonymous.equals(true))).get())
           .map((account) => Account(
                 id: account.id.toString(),
                 username: account.username,
                 jwt: account.jwt,
-                instance: account.instance,
+                instance: account.instance ?? '',
                 userId: account.userId,
                 index: account.listIndex,
               ))
@@ -123,7 +142,7 @@ class Account {
           id: account.id.toString(),
           username: account.username,
           jwt: account.jwt,
-          instance: account.instance,
+          instance: account.instance ?? '',
           userId: account.userId,
           index: account.listIndex,
         );

lib/account/pages/login_page.dart

@@ -7,9 +7,11 @@ import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
 import 'package:go_router/go_router.dart';
-import 'package:thunder/account/models/anonymous_instance.dart';
+import 'package:lemmy_api_client/v3.dart';
+import 'package:thunder/account/models/account.dart';
 
 import 'package:thunder/core/auth/bloc/auth_bloc.dart';
+import 'package:thunder/core/singletons/lemmy_client.dart';
 import 'package:thunder/instances.dart';
 import 'package:thunder/shared/dialogs.dart';
 import 'package:thunder/shared/snackbar.dart';
@@ -327,7 +329,7 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
                       onSubmitted: !widget.anonymous
                           ? (_) => _usernameFieldFocusNode.requestFocus()
                           : controller.text.isNotEmpty
-                              ? (_) => _addAnonymousInstance()
+                              ? (_) => _addAnonymousInstance(context)
                               : null,
                     ),
                     suggestionsCallback: (String pattern) {
@@ -472,17 +474,41 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
     final AppLocalizations l10n = AppLocalizations.of(context)!;
 
     if (await isLemmyInstance(_instanceTextEditingController.text)) {
-      final List<AnonymousInstance> anonymousInstances = await AnonymousInstance.fetchAllInstances();
+      final List<Account> anonymousInstances = await Account.anonymousInstances();
       if (anonymousInstances.any((anonymousInstance) => anonymousInstance.instance == _instanceTextEditingController.text)) {
         setState(() {
           instanceValidated = false;
           instanceError = AppLocalizations.of(context)!.instanceHasAlreadyBenAdded(currentInstance ?? '');
         });
       } else {
-        context.read<AuthBloc>().add(const LogOutOfAllAccounts());
-        await AnonymousInstance.insertInstance(AnonymousInstance(id: '', instance: _instanceTextEditingController.text, index: -1));
-        context.read<ThunderBloc>().add(OnSetCurrentAnonymousInstance(_instanceTextEditingController.text));
-        widget.popRegister();
+        // Check for content warning on anyonmous instance
+        GetSiteResponse getSiteResponse = await (LemmyClient()..changeBaseUrl(_instanceTextEditingController.text)).lemmyApiV3.run(const GetSite());
+
+        bool acceptedContentWarning = true;
+
+        if (getSiteResponse.siteView.site.contentWarning?.isNotEmpty == true) {
+          acceptedContentWarning = false;
+
+          await showThunderDialog<void>(
+            context: context,
+            title: l10n.contentWarning,
+            contentText: getSiteResponse.siteView.site.contentWarning,
+            onSecondaryButtonPressed: (dialogContext) => Navigator.of(dialogContext).pop(),
+            secondaryButtonText: l10n.decline,
+            onPrimaryButtonPressed: (dialogContext, _) async {
+              Navigator.of(dialogContext).pop();
+              acceptedContentWarning = true;
+            },
+            primaryButtonText: l10n.accept,
+          );
+        }
+
+        if (acceptedContentWarning) {
+          context.read<AuthBloc>().add(const LogOutOfAllAccounts());
+          await Account.insertAnonymousInstance(Account(id: '', instance: _instanceTextEditingController.text, index: -1, anonymous: true));
+          context.read<ThunderBloc>().add(OnSetCurrentAnonymousInstance(_instanceTextEditingController.text));
+          widget.popRegister();
+        }
       }
     }
   }

lib/account/widgets/account_placeholder.dart

@@ -10,7 +10,7 @@ class AccountPlaceholder extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final ThemeData theme = Theme.of(context);
-    String? anonymousInstance = context.watch<ThunderBloc>().state.currentAnonymousInstance ?? '';
+    String anonymousInstance = context.watch<ThunderBloc>().state.currentAnonymousInstance ?? '';
 
     return Center(
       child: Padding(