poppingmoon · poppingmoon · Jun 8, 2025 · May 29, 2025 · Jun 8, 2025 · Jun 8, 2025
diff --git a/lib/extension/string_extension.dart b/lib/extension/string_extension.dart
@@ -6,4 +6,11 @@ extension StringExtension on String {
   String replaceLineBreaks() {
     return replaceAll('\n', ' ');
   }
+
+  String toHankaku() {
+    return replaceAllMapped(
+      RegExp('[Ａ-Ｚａ-ｚ０-９]'),
+      (match) => String.fromCharCode(match[0]!.codeUnitAt(0) - 65248),
+    );
+  }
 }
diff --git a/lib/provider/api/search_notes_notifier_provider.dart b/lib/provider/api/search_notes_notifier_provider.dart
@@ -22,8 +22,19 @@ class SearchNotesNotifier extends _$SearchNotesNotifier {
     String? sinceId,
     String? untilId,
   }) async {
-    final response = await _fetchNotes(untilId: untilId);
-    return PaginationState.fromIterable(response);
+    final link = ref.keepAlive();
+    Timer? timer;
+    ref.onCancel(() => timer = Timer(const Duration(minutes: 5), link.close));
+    ref.onResume(() => timer?.cancel());
+    ref.onDispose(() => timer?.cancel());
+    try {
+      final response = await _fetchNotes(untilId: untilId);
+      return PaginationState.fromIterable(response);
+    } catch (_) {
+      timer?.cancel();
+      link.close();
+      rethrow;
+    }
   }
 
   Future<Iterable<Note>> _fetchNotes({String? untilId}) async {

diff --git a/lib/provider/api/search_notes_notifier_provider.g.dart b/lib/provider/api/search_notes_notifier_provider.g.dart
diff --git a/lib/provider/api/search_users_notifier_provider.dart b/lib/provider/api/search_users_notifier_provider.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:misskey_dart/misskey_dart.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
@@ -15,8 +17,19 @@ class SearchUsersNotifier extends _$SearchUsersNotifier {
     String query, {
     Origin? userOrigin,
   }) async {
-    final response = await _fetchUsers();
-    return PaginationState.fromIterable(response);
+    final link = ref.keepAlive();
+    Timer? timer;
+    ref.onCancel(() => timer = Timer(const Duration(minutes: 5), link.close));
+    ref.onResume(() => timer?.cancel());
+    ref.onDispose(() => timer?.cancel());
+    try {
+      final response = await _fetchUsers();
+      return PaginationState.fromIterable(response);
+    } catch (_) {
+      timer?.cancel();
+      link.close();
+      rethrow;
+    }
   }
 
   Future<Iterable<UserDetailed>> _fetchUsers({int? offset}) async {

diff --git a/lib/provider/api/search_users_notifier_provider.g.dart b/lib/provider/api/search_users_notifier_provider.g.dart
diff --git a/lib/provider/custom_emoji_index_provider.dart b/lib/provider/custom_emoji_index_provider.dart
@@ -3,7 +3,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:misskey_dart/misskey_dart.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-import '../util/safe_to_hiragana.dart';
+import '../extension/string_extension.dart';
+import '../util/safe_to_katakana.dart';
 import 'emojis_notifier_provider.dart';
 
 part 'custom_emoji_index_provider.g.dart';
@@ -13,13 +14,15 @@ final _separators = RegExp('[_+-]+');
 Map<String, Set<Emoji>> _buildCustomEmojiIndex(Iterable<Emoji> emojis) {
   final index = <String, Set<Emoji>>{};
   for (final emoji in emojis) {
-    index.putIfAbsent(emoji.name, () => {}).add(emoji);
-    final kanaName = safeToHiragana(emoji.name.replaceAll(_separators, ''));
+    final name = emoji.name.toLowerCase();
+    index.putIfAbsent(name, () => {}).add(emoji);
+    final kanaName = safeToKatakana(name).replaceAll(_separators, '');
     index.putIfAbsent(kanaName, () => {}).add(emoji);
     for (final alias in emoji.aliases) {
       if (alias.isNotEmpty) {
-        index.putIfAbsent(alias, () => {}).add(emoji);
-        final kanaAlias = safeToHiragana(alias.replaceAll(_separators, ''));
+        final hankakuAlias = alias.toHankaku().toLowerCase();
+        index.putIfAbsent(hankakuAlias, () => {}).add(emoji);
+        final kanaAlias = safeToKatakana(hankakuAlias);
         index.putIfAbsent(kanaAlias, () => {}).add(emoji);
       }
     }

diff --git a/lib/provider/search_custom_emojis_provider.dart b/lib/provider/search_custom_emojis_provider.dart
@@ -2,7 +2,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:misskey_dart/misskey_dart.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-import '../util/safe_to_hiragana.dart';
+import '../extension/string_extension.dart';
+import '../util/safe_to_katakana.dart';
 import 'custom_emoji_index_provider.dart';
 
 part 'search_custom_emojis_provider.g.dart';
@@ -19,14 +20,11 @@ Set<Emoji> searchCustomEmojis(Ref ref, String host, String query) {
     return {};
   }
   const maxEmojis = 50;
-  final hankakuQuery = query.replaceAllMapped(
-    RegExp('[Ａ-Ｚａ-ｚ０-９]'),
-    (match) => String.fromCharCode(match[0]!.codeUnitAt(0) - 65248),
-  );
-  final hiraganaQuery = safeToHiragana(hankakuQuery);
+  final hankakuQuery = query.toHankaku().toLowerCase();
+  final kanaQuery = safeToKatakana(hankakuQuery);
   final result = {
     ...?customEmojiIndex[hankakuQuery],
-    ...?customEmojiIndex[hiraganaQuery],
+    ...?customEmojiIndex[kanaQuery],
   };
   if (result.length >= maxEmojis) {
     return result;
@@ -38,7 +36,7 @@ Set<Emoji> searchCustomEmojis(Ref ref, String host, String query) {
         if (result.length >= maxEmojis) {
           return result;
         }
-      } else if (entry.key.startsWith(hiraganaQuery)) {
+      } else if (entry.key.startsWith(kanaQuery)) {
         result.addAll(entry.value);
         if (result.length >= maxEmojis) {
           return result;
@@ -52,7 +50,7 @@ Set<Emoji> searchCustomEmojis(Ref ref, String host, String query) {
         if (result.length >= maxEmojis) {
           return result;
         }
-      } else if (entry.key.contains(hiraganaQuery)) {
+      } else if (entry.key.contains(kanaQuery)) {
         result.addAll(entry.value);
         if (result.length >= maxEmojis) {
           return result;

diff --git a/lib/provider/search_custom_emojis_provider.g.dart b/lib/provider/search_custom_emojis_provider.g.dart
diff --git a/lib/provider/search_unicode_emojis_provider.dart b/lib/provider/search_unicode_emojis_provider.dart
@@ -2,6 +2,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import '../constant/unicode_emoji_index.g.dart';
+import '../extension/string_extension.dart';
 
 part 'search_unicode_emojis_provider.g.dart';
 
@@ -11,13 +12,14 @@ Set<String> searchUnicodeEmojis(Ref ref, String query) {
     return {};
   }
   const maxEmojis = 50;
-  final result = {...?unicodeEmojiIndex[query]};
+  final hankakuQuery = query.toHankaku();
+  final result = {...?unicodeEmojiIndex[hankakuQuery]};
   if (result.length >= maxEmojis) {
     return result;
   }
-  if (query.length == 1) {
+  if (hankakuQuery.length == 1) {
     for (final entry in unicodeEmojiIndex.entries) {
-      if (entry.key.startsWith(query)) {
+      if (entry.key.startsWith(hankakuQuery)) {
         result.addAll(entry.value);
         if (result.length >= maxEmojis) {
           return result;
@@ -26,7 +28,7 @@ Set<String> searchUnicodeEmojis(Ref ref, String query) {
     }
   } else {
     for (final entry in unicodeEmojiIndex.entries) {
-      if (entry.key.contains(query)) {
+      if (entry.key.contains(hankakuQuery)) {
         result.addAll(entry.value);
         if (result.length >= maxEmojis) {
           return result;

diff --git a/lib/provider/search_unicode_emojis_provider.g.dart b/lib/provider/search_unicode_emojis_provider.g.dart
diff --git a/lib/provider/searched_queries_notifier_provider.dart b/lib/provider/searched_queries_notifier_provider.dart
@@ -0,0 +1,30 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+import '../model/account.dart';
+import 'shared_preferences_provider.dart';
+
+part 'searched_queries_notifier_provider.g.dart';
+
+@riverpod
+class SearchedQueriesNotifier extends _$SearchedQueriesNotifier {
+  @override
+  List<String> build(Account account) {
+    return ref.watch(sharedPreferencesProvider).getStringList(_key) ?? [];
+  }
+
+  String get _key => '$account/searched-queries';
+
+  Future<void> _save() async {
+    await ref.read(sharedPreferencesProvider).setStringList(_key, state);
+  }
+
+  void add(String query) {
+    state = [query, ...state.where((q) => q != query)];
+    _save();
+  }
+
+  void delete(String query) {
+    state = state.where((q) => q != query).toList();
+    _save();
+  }
+}