From 14e8f7b775b6e40b9939c4bed25ef195b124e1e2 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Fri, 23 Aug 2024 23:16:41 +0800
Subject: [PATCH] :bug: Bug fixes and optimization

---
 lib/providers/websocket.dart                      | 2 +-
 lib/screens/channel/channel_chat.dart             | 5 +++--
 lib/widgets/navigation/app_navigation_drawer.dart | 5 +----
 pubspec.yaml                                      | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/providers/websocket.dart b/lib/providers/websocket.dart
index 7a0bf74..ff4a4ca 100644
--- a/lib/providers/websocket.dart
+++ b/lib/providers/websocket.dart
@@ -149,7 +149,7 @@ class WebSocketProvider extends GetxController {
       'device_token': token,
       'device_id': deviceUuid,
     });
-    if (resp.statusCode != 200) {
+    if (resp.statusCode != 200 && resp.statusCode != 400) {
       throw RequestException(resp);
     }
   }
diff --git a/lib/screens/channel/channel_chat.dart b/lib/screens/channel/channel_chat.dart
index 5569267..f3532be 100644
--- a/lib/screens/channel/channel_chat.dart
+++ b/lib/screens/channel/channel_chat.dart
@@ -104,8 +104,8 @@ class _ChannelChatScreenState extends State<ChannelChatScreen>
     setState(() => _isBusy = false);
   }
 
-  List<ChannelMember> _typingUsers = List.empty(growable: true);
-  Map<int, Timer> _typingInactiveTimer = {};
+  final List<ChannelMember> _typingUsers = List.empty(growable: true);
+  final Map<int, Timer> _typingInactiveTimer = {};
 
   void _listenMessages() {
     final WebSocketProvider ws = Get.find();
@@ -133,6 +133,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen>
         case 'status.typing':
           if (event.payload?['channel_id'] != _channel!.id) break;
           final member = ChannelMember.fromJson(event.payload!['member']);
+          if (member.id == _channelProfile!.id) break;
           if (!_typingUsers.any((x) => x.id == member.id)) {
             setState(() {
               _typingUsers.add(member);
diff --git a/lib/widgets/navigation/app_navigation_drawer.dart b/lib/widgets/navigation/app_navigation_drawer.dart
index 1e556f4..55f1ad5 100644
--- a/lib/widgets/navigation/app_navigation_drawer.dart
+++ b/lib/widgets/navigation/app_navigation_drawer.dart
@@ -197,10 +197,7 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer>
     } else if (SolianTheme.isLargeScreen(context)) {
       _collapseDrawer();
     } else {
-      _drawerAnimationController.animateTo(
-        1,
-        duration: const Duration(milliseconds: 100),
-      );
+      _drawerAnimationController.value = 1;
     }
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index fe86b51..0f7e5c3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: solian
 description: "The Solar Network App"
 publish_to: "none"
 
-version: 1.2.1+22
+version: 1.2.1+23
 
 environment:
   sdk: ">=3.3.4 <4.0.0"