From b7bf776e9f114ef7c1edf578869f251be97fac90 Mon Sep 17 00:00:00 2001 From: poppingmoon <63451158+poppingmoon@users.noreply.github.com> Date: Tue, 28 Jan 2025 07:52:30 +0900 Subject: [PATCH] fix: use LineSplitter to split lines (#533) --- lib/view/page/settings/mute_block_page.dart | 10 ++++------ lib/view/widget/muted_words_editor.dart | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/view/page/settings/mute_block_page.dart b/lib/view/page/settings/mute_block_page.dart index 85f71c65..91ef563c 100644 --- a/lib/view/page/settings/mute_block_page.dart +++ b/lib/view/page/settings/mute_block_page.dart @@ -1,3 +1,5 @@ +import 'dart:convert'; + import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:go_router/go_router.dart'; @@ -164,9 +166,7 @@ class _MutedEmojisEditor extends HookConsumerWidget { child: ElevatedButton.icon( onPressed: isChanged.value ? () async { - final mutes = controller.text - .trim() - .split('\n') + final mutes = LineSplitter.split(controller.text.trim()) .map((emoji) => emoji.trim()) .where((emoji) => emoji.isNotEmpty); await ref @@ -260,9 +260,7 @@ class _InstanceMuteEditor extends HookConsumerWidget { child: ElevatedButton.icon( onPressed: isChanged.value ? () async { - final mutes = controller.text - .trim() - .split('\n') + final mutes = LineSplitter.split(controller.text.trim()) .map((server) => server.trim()) .where((server) => server.isNotEmpty) .toList(); diff --git a/lib/view/widget/muted_words_editor.dart b/lib/view/widget/muted_words_editor.dart index 61a81d66..edb79927 100644 --- a/lib/view/widget/muted_words_editor.dart +++ b/lib/view/widget/muted_words_editor.dart @@ -1,3 +1,5 @@ +import 'dart:convert'; + import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; @@ -22,9 +24,7 @@ class MutedWordsEditor extends HookConsumerWidget { final bool hardMute; List _parseMutes(BuildContext context, String mutes) { - return mutes - .trim() - .split('\n') + return LineSplitter.split(mutes.trim()) .map((line) => line.trim()) .mapIndexed((index, line) { if (line.isEmpty) {