Merge remote-tracking branch 'origin/main' into dev

# Conflicts:
#	lib/services/account.dart
#	lib/services/avatars.dart
#	lib/services/storage.dart

Author: abnegate

.github/workflows/format.yml

@@ -10,15 +10,21 @@ on:
 jobs:
   format:
     runs-on: ubuntu-latest
-    container:
-        image:  dart:stable
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           persist-credentials: true
           ref: ${{ github.event.pull_request.head.ref }}
+      
+      - name: Install Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+
+      - name: Install dependencies
+        run: flutter pub get
 
       - name: Format Dart code
         run: dart format .
@@ -29,5 +35,5 @@ jobs:
       - name: Add & Commit
         uses: EndBug/add-and-commit@v9.1.4
         with:
-            add: lib
+            add: '["lib", "test"]'
 

lib/query.dart

@@ -130,16 +130,16 @@ class Query {
       Query._('updatedBetween', null, [start, end]).toString();
 
   static String or(List<String> queries) => Query._(
-    'or',
-    null,
-    queries.map((query) => jsonDecode(query)).toList(),
-  ).toString();
+        'or',
+        null,
+        queries.map((query) => jsonDecode(query)).toList(),
+      ).toString();
 
   static String and(List<String> queries) => Query._(
-    'and',
-    null,
-    queries.map((query) => jsonDecode(query)).toList(),
-  ).toString();
+        'and',
+        null,
+        queries.map((query) => jsonDecode(query)).toList(),
+      ).toString();
 
   /// Specify which attributes should be returned by the API call.
   static String select(List<String> attributes) =>