From 369fcdbd4bc265ea1bc17966d6bdafc6ecc57251 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 16 May 2025 18:46:57 +0200
Subject: [PATCH] lib/search/word_search: fix rubification

---
 lib/search/word_search/regrouping.dart | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/search/word_search/regrouping.dart b/lib/search/word_search/regrouping.dart
index eed03eb..5749a68 100644
--- a/lib/search/word_search/regrouping.dart
+++ b/lib/search/word_search/regrouping.dart
@@ -145,15 +145,19 @@ GroupedWordResult _regroup_words({
       .toList();
 
   for (final readingElement in readingElements_) {
+    if (readingElement['doesNotMatchKanji'] == 1 || kanjiElements_.isEmpty) {
+      final ruby = WordSearchRuby(
+        base: readingElement['reading'] as String,
+      );
+      result.add(ruby);
+
+      continue;
+    }
+
     for (final kanjiElement in kanjiElements_) {
       final kanji = kanjiElement['reading'] as String;
       final reading = readingElement['reading'] as String;
 
-      final doesNotMatchKanji = readingElement['doesNotMatchKanji'] == 1;
-      if (doesNotMatchKanji) {
-        continue;
-      }
-
       final restrictions = readingElementRestrictions_
           .where((element) => element['reading'] == reading)
           .toList();
@@ -171,15 +175,6 @@ GroupedWordResult _regroup_words({
     }
   }
 
-  for (final readingElement
-      in readingElements_.where((e) => e['doesNotMatchKanji'] == 1)) {
-    final reading = readingElement['reading'] as String;
-    final ruby = WordSearchRuby(
-      base: reading,
-    );
-    result.add(ruby);
-  }
-
   return GroupedWordResult(
     rubys: result,
     readingInfos: Map.fromEntries(