poppingmoon · poppingmoon · Jul 25, 2024 · Jul 25, 2024
diff --git a/lib/provider/api/post_notifier_provider.dart b/lib/provider/api/post_notifier_provider.dart
@@ -181,13 +181,7 @@ class PostNotifier extends _$PostNotifier {
   }
 
   void reset() {
-    state = _defaultRequest.copyWith(
-      channelId: state.channelId,
-      localOnly: state.channelId != null ? true : _defaultRequest.localOnly,
-      visibility: state.channelId != null
-          ? NoteVisibility.public
-          : _defaultRequest.visibility,
-    );
+    state = _defaultRequest;
     ref.read(sharedPreferencesProvider).remove(_key);
   }
 

diff --git a/lib/provider/api/post_notifier_provider.g.dart b/lib/provider/api/post_notifier_provider.g.dart
diff --git a/lib/provider/timeline_tab_index_notifier_provider.dart b/lib/provider/timeline_tab_index_notifier_provider.dart
@@ -0,0 +1,30 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+import 'timeline_last_viewed_at_notifier_provider.dart';
+import 'timeline_tabs_notifier_provider.dart';
+
+part 'timeline_tab_index_notifier_provider.g.dart';
+
+@riverpod
+class TimelineTabIndexNotifier extends _$TimelineTabIndexNotifier {
+  @override
+  int build() {
+    final tabs = ref.watch(timelineTabsNotifierProvider);
+    int latestIndex = 0;
+    DateTime latestDate = DateTime(0);
+    for (final (index, tabSettings) in tabs.indexed) {
+      final lastViewedAt =
+          ref.read(timelineLastViewedAtNotifierProvider(tabSettings));
+      if (lastViewedAt != null && lastViewedAt.isAfter(latestDate)) {
+        latestIndex = index;
+        latestDate = lastViewedAt;
+      }
+    }
+    return latestIndex;
+  }
+
+  // ignore: use_setters_to_change_properties
+  void updateIndex(int index) {
+    state = index;
+  }
+}
diff --git a/lib/provider/timeline_tab_index_notifier_provider.g.dart b/lib/provider/timeline_tab_index_notifier_provider.g.dart
diff --git a/lib/provider/timeline_tab_settings_provider.dart b/lib/provider/timeline_tab_settings_provider.dart
@@ -0,0 +1,15 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+import '../model/tab_settings.dart';
+import 'timeline_tab_index_notifier_provider.dart';
+import 'timeline_tabs_notifier_provider.dart';
+
+part 'timeline_tab_settings_provider.g.dart';
+
+@riverpod
+TabSettings? timelineTabSettings(TimelineTabSettingsRef ref) {
+  final index = ref.watch(timelineTabIndexNotifierProvider);
+  return ref.watch(
+    timelineTabsNotifierProvider.select((tabs) => tabs.elementAtOrNull(index)),
+  );
+}
diff --git a/lib/provider/timeline_tab_settings_provider.g.dart b/lib/provider/timeline_tab_settings_provider.g.dart
diff --git a/lib/view/page/post_page.dart b/lib/view/page/post_page.dart
@@ -18,6 +18,7 @@ import '../../provider/api/i_notifier_provider.dart';
 import '../../provider/api/post_notifier_provider.dart';
 import '../../provider/general_settings_notifier_provider.dart';
 import '../../provider/misskey_colors_provider.dart';
+import '../../provider/timeline_tab_settings_provider.dart';
 import '../../util/future_with_dialog.dart';
 import '../dialog/post_confirmation_dialog.dart';
 import '../widget/mfm_keyboard.dart';
@@ -88,6 +89,12 @@ class PostPage extends HookConsumerWidget {
               .setHashtags({...hashtags, ...history}.toList()),
         );
       }
+      if (ref.read(timelineTabSettingsProvider)?.channelId
+          case final channelId?) {
+        ref
+            .read(postNotifierProvider(account, noteId: noteId).notifier)
+            .setChannel(channelId);
+      }
       ref.invalidate(attachesNotifierProvider(account, noteId: noteId));
       ref.context.pop();
     }

diff --git a/lib/view/page/timelines_page.dart b/lib/view/page/timelines_page.dart
@@ -15,8 +15,9 @@ import '../../provider/emojis_notifier_provider.dart';
 import '../../provider/general_settings_notifier_provider.dart';
 import '../../provider/misskey_colors_provider.dart';
 import '../../provider/streaming/main_stream_notifier_provider.dart';
-import '../../provider/timeline_last_viewed_at_notifier_provider.dart';
 import '../../provider/timeline_scroll_controller_provider.dart';
+import '../../provider/timeline_tab_index_notifier_provider.dart';
+import '../../provider/timeline_tab_settings_provider.dart';
 import '../../provider/timeline_tabs_notifier_provider.dart';
 import '../widget/post_form.dart';
 import '../widget/timeline_drawer.dart';
@@ -30,22 +31,8 @@ class TimelinesPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final tabs = ref.watch(timelineTabsNotifierProvider);
     final numTabs = tabs.length;
-    final initialIndex = useMemoized(
-      () {
-        int latestIndex = 0;
-        DateTime latestDate = DateTime(0);
-        for (final (index, tabSettings) in tabs.indexed) {
-          final lastViewedAt =
-              ref.read(timelineLastViewedAtNotifierProvider(tabSettings));
-          if (lastViewedAt != null && lastViewedAt.isAfter(latestDate)) {
-            latestIndex = index;
-            latestDate = lastViewedAt;
-          }
-        }
-        return latestIndex;
-      },
-      [],
-    );
+    final tabIndex = ref.watch(timelineTabIndexNotifierProvider);
+    final tabSettings = ref.watch(timelineTabSettingsProvider);
     final showTimelineTabBarAtBottom = ref.watch(
       generalSettingsNotifierProvider
           .select((settings) => settings.showTimelineTabBarAtBottom),
@@ -60,11 +47,9 @@ class TimelinesPage extends HookConsumerWidget {
     );
     final controller = useTabController(
       initialLength: numTabs,
-      initialIndex: initialIndex,
+      initialIndex: useMemoized(() => tabIndex),
       keys: [numTabs],
     );
-    final tabIndex = useState(controller.index);
-    final tabSettings = tabs.elementAtOrNull(tabIndex.value);
     final i = tabSettings != null
         ? ref.watch(iNotifierProvider(tabSettings.account)).valueOrNull
         : null;
@@ -73,7 +58,7 @@ class TimelinesPage extends HookConsumerWidget {
       () {
         void callback() {
           if (tabs.isEmpty) return;
-          final previousIndex = tabIndex.value;
+          final previousIndex = tabIndex;
           final nextIndex = controller.index;
           if (previousIndex == nextIndex) return;
           final previousAccount = tabs[previousIndex].account;
@@ -112,7 +97,9 @@ class TimelinesPage extends HookConsumerWidget {
                   .clearChannel();
             }
           }
-          tabIndex.value = nextIndex;
+          ref
+              .read(timelineTabIndexNotifierProvider.notifier)
+              .updateIndex(nextIndex);
         }
 
         if (tabSettings != null) {

diff --git a/lib/view/widget/post_form.dart b/lib/view/widget/post_form.dart
@@ -29,6 +29,7 @@ import '../../provider/api/user_notifier_provider.dart';
 import '../../provider/general_settings_notifier_provider.dart';
 import '../../provider/misskey_colors_provider.dart';
 import '../../provider/note_provider.dart';
+import '../../provider/timeline_tab_settings_provider.dart';
 import '../../util/extract_mentions.dart';
 import '../../util/future_with_dialog.dart';
 import '../dialog/post_confirmation_dialog.dart';
@@ -85,7 +86,7 @@ class PostForm extends HookConsumerWidget {
     WidgetRef ref,
     Account account,
   ) async {
-    final text = ref.read(postNotifierProvider(account, noteId: noteId)).text;
+    final request = ref.read(postNotifierProvider(account, noteId: noteId));
     final attaches =
         ref.read(attachesNotifierProvider(account, noteId: noteId));
     final hasFiles = attaches.isNotEmpty;
@@ -104,7 +105,6 @@ class PostForm extends HookConsumerWidget {
     if (!ref.context.mounted) return;
     if (needsUpload ||
         (ref.read(generalSettingsNotifierProvider).confirmBeforePost)) {
-      final request = ref.read(postNotifierProvider(account, noteId: noteId));
       final confirmed = await confirmPost(
         ref,
         account,
@@ -122,7 +122,7 @@ class PostForm extends HookConsumerWidget {
     );
     if (!ref.context.mounted) return;
     if (result != null) {
-      if (text != null) {
+      if (request.text case final text?) {
         final nodes = const MfmParser().parse(text);
         final hashtags = nodes
             .extract((node) => node is MfmHashTag)
@@ -136,6 +136,12 @@ class PostForm extends HookConsumerWidget {
               .setHashtags({...hashtags, ...history}.toList()),
         );
       }
+      if (ref.read(timelineTabSettingsProvider)?.channelId
+          case final channelId?) {
+        ref
+            .read(postNotifierProvider(account, noteId: noteId).notifier)
+            .setChannel(channelId);
+      }
       ref.invalidate(attachesNotifierProvider(account, noteId: noteId));
       ref.context.pop();
     }