Merge pull request #564 from AOSSIE-Org/dev

Deploy v2.5 of Resonate App

Author: M4dhav

ios/Runner/Info.plist

@@ -8,6 +8,7 @@
 	<array>
 		<string>hi</string>
 		<string>en</string>
+		<string>gu</string>
 	</array>
 	<key>CFBundleDisplayName</key>
 	<string>Resonate</string>

l10n.yaml

@@ -1,4 +1,7 @@
 arb-dir: lib/l10n
 template-arb-file: app_en.arb
 output-localization-file: app_localizations.dart
+supported-locales:
+  - en
+  - hi
 untranslated-messages-file: untranslated.txt

lib/controllers/about_app_screen_controller.dart

@@ -38,6 +38,7 @@ class AboutAppScreenController extends GetxController {
   void onInit() {
     super.onInit();
     _loadPackageInfo();
+    checkForUpdate(launchUpdateIfAvailable: false, isManualCheck: false);
   }
 
   Future<void> _loadPackageInfo() async {

lib/controllers/auth_state_controller.dart

@@ -10,10 +10,8 @@ import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
-import 'package:resonate/controllers/about_app_screen_controller.dart';
 import 'package:resonate/controllers/friend_calling_controller.dart';
 import 'package:resonate/controllers/friends_controller.dart';
-import 'package:resonate/controllers/about_app_screen_controller.dart';
 import 'package:resonate/controllers/upcomming_rooms_controller.dart';
 import 'package:resonate/controllers/tabview_controller.dart';
 import 'package:resonate/models/follower_user_model.dart';
@@ -53,6 +51,7 @@ class AuthStateController extends GetxController {
   late int ratingCount;
   late User appwriteUser;
   late List<FollowerUserModel> followerDocuments;
+  late int reportsCount;
 
   FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
       FlutterLocalNotificationsPlugin();
@@ -109,7 +108,7 @@ class AuthStateController extends GetxController {
     await setUserProfileData();
 
     // ask for settings permissions
-    NotificationSettings settings = await messaging.requestPermission(
+    await messaging.requestPermission(
       alert: true,
       announcement: false,
       badge: true,
@@ -219,6 +218,8 @@ class AuthStateController extends GetxController {
               return FollowerUserModel.fromJson(e);
             }).toList() ??
             [];
+        reportsCount =
+            (userDataDoc.data['userReports'] as List<dynamic>?)?.length ?? 0;
       }
 
       update();
@@ -235,8 +236,9 @@ class AuthStateController extends GetxController {
   Future<void> isUserLoggedIn() async {
     try {
       await setUserProfileData();
-      if (Get.isRegistered<AboutAppScreenController>()) {
-        Get.find<AboutAppScreenController>().checkForUpdate();
+      if (reportsCount > 5) {
+        Get.offNamed(AppRoutes.userBlockedScreen);
+        return;
       }
       if (isUserProfileComplete == false) {
         Get.offNamed(AppRoutes.onBoarding);

lib/controllers/create_room_controller.dart

@@ -79,6 +79,7 @@ class CreateRoomController extends GetxController {
         state: RoomState.live,
         myDocId: myDocId,
         isUserAdmin: true,
+        reportedUsers: [],
       );
       Get.find<TabViewController>().openRoomSheet(room);
 

lib/controllers/explore_story_controller.dart

@@ -10,6 +10,8 @@ import 'package:get/get.dart';
 import 'package:meilisearch/meilisearch.dart';
 import 'package:resonate/controllers/auth_state_controller.dart';
 import 'package:resonate/models/chapter.dart';
+import 'package:resonate/models/live_chapter_attendees_model.dart';
+import 'package:resonate/models/live_chapter_model.dart';
 import 'package:resonate/models/resonate_user.dart';
 import 'package:resonate/models/story.dart';
 import 'package:resonate/services/appwrite_service.dart';
@@ -97,6 +99,9 @@ class ExploreStoryController extends GetxController {
     story.chapters = storyChapters;
     story.isLikedByCurrentUser.value = hasUserLiked;
     story.likesCount.value = likes;
+
+    final liveChapter = await fetchLiveChapterForStory(story.storyId);
+    story.liveChapter = liveChapter;
     isLoadingStoryPage.value = false;
   }
 
@@ -671,6 +676,34 @@ class ExploreStoryController extends GetxController {
     return currentStoryChapters;
   }
 
+  Future<LiveChapterModel?> fetchLiveChapterForStory(String storyId) async {
+    List<Document> liveStoryDocuments = await databases
+        .listDocuments(
+          databaseId: storyDatabaseId,
+          collectionId: liveChaptersCollectionId,
+          queries: [Query.equal('storyId', storyId)],
+        )
+        .then((value) => value.documents);
+    if (liveStoryDocuments.isEmpty) {
+      return null;
+    }
+
+    final attendeesDocument = await databases.getDocument(
+      databaseId: userDatabaseID,
+      collectionId: liveChapterAttendeesCollectionId,
+      documentId: liveStoryDocuments.first.data['\$id'],
+    );
+
+    final attendeesModel = LiveChapterAttendeesModel.fromJson(
+      attendeesDocument.data,
+    );
+    final liveChapterModel = LiveChapterModel.fromJson(
+      liveStoryDocuments.first.data,
+    ).copyWith(attendees: attendeesModel);
+
+    return liveChapterModel;
+  }
+
   Future<bool> checkIfStoryLikedByUser(String storyId) async {
     List<Document> userLikeDocuments = await databases
         .listDocuments(