feat: emoji mute (#445)

* refactor: split instance mute editor widget * feat: emoji mute
poppingmoon · Oct 23, 2024 · 8fbfe5e · 8fbfe5e
1 parent 3523baa
commit 8fbfe5e
Show file tree

Hide file tree

Showing 20 changed files with 638 additions and 146 deletions.
diff --git a/lib/i18n/aria/aria.i18n.yaml b/lib/i18n/aria/aria.i18n.yaml
@@ -63,6 +63,7 @@ media: "Media"
 mentionToRemoteWarning: "This note includes mentions to remote users"
 moved: "Moved"
 muted: "Muted"
+mutedEmojis: "Muted emojis"
 nFiles:
   one: "{n} file"
   other: "{n} files"

diff --git a/lib/i18n/strings.g.dart b/lib/i18n/strings.g.dart
@@ -4,7 +4,7 @@
 /// To regenerate, run: `dart run slang`
 ///
 /// Locales: 31
-/// Strings: 54609 (1761 per locale)
+/// Strings: 54610 (1761 per locale)
 
 // coverage:ignore-file
 // ignore_for_file: type=lint, unused_import

diff --git a/lib/i18n/strings_en_US.g.dart b/lib/i18n/strings_en_US.g.dart
@@ -131,6 +131,7 @@ class TranslationsAriaEnUs {
 	String get mentionToRemoteWarning => 'This note includes mentions to remote users';
 	String get moved => 'Moved';
 	String get muted => 'Muted';
+	String get mutedEmojis => 'Muted emojis';
 	String nFiles({required num n}) => (_root.$meta.cardinalResolver ?? PluralResolvers.cardinal('en'))(n,
 		one: '${n} file',
 		other: '${n} files',

diff --git a/lib/model/account_settings.dart b/lib/model/account_settings.dart
@@ -37,6 +37,7 @@ class AccountSettings with _$AccountSettings {
     // Mute
     @Default([]) List<MuteWord> mutedWords,
     @Default([]) List<MuteWord> hardMutedWords,
+    @Default([]) List<String> mutedEmojis,
 
     // UserSelectDialog
     @Default([]) List<String> recentlyUsedUsers,

diff --git a/lib/model/account_settings.freezed.dart b/lib/model/account_settings.freezed.dart
@@ -45,7 +45,8 @@ mixin _$AccountSettings {
   bool get keepOriginalUploading => throw _privateConstructorUsedError;
   bool get keepOriginalFilename => throw _privateConstructorUsedError; // Mute
   List<MuteWord> get mutedWords => throw _privateConstructorUsedError;
-  List<MuteWord> get hardMutedWords =>
+  List<MuteWord> get hardMutedWords => throw _privateConstructorUsedError;
+  List<String> get mutedEmojis =>
       throw _privateConstructorUsedError; // UserSelectDialog
   List<String> get recentlyUsedUsers =>
       throw _privateConstructorUsedError; // PostForm
@@ -89,6 +90,7 @@ abstract class $AccountSettingsCopyWith<$Res> {
       bool keepOriginalFilename,
       List<MuteWord> mutedWords,
       List<MuteWord> hardMutedWords,
+      List<String> mutedEmojis,
       List<String> recentlyUsedUsers,
       List<String> hashtags});
 }
@@ -129,6 +131,7 @@ class _$AccountSettingsCopyWithImpl<$Res, $Val extends AccountSettings>
     Object? keepOriginalFilename = null,
     Object? mutedWords = null,
     Object? hardMutedWords = null,
+    Object? mutedEmojis = null,
     Object? recentlyUsedUsers = null,
     Object? hashtags = null,
   }) {
@@ -217,6 +220,10 @@ class _$AccountSettingsCopyWithImpl<$Res, $Val extends AccountSettings>
           ? _value.hardMutedWords
           : hardMutedWords // ignore: cast_nullable_to_non_nullable
               as List<MuteWord>,
+      mutedEmojis: null == mutedEmojis
+          ? _value.mutedEmojis
+          : mutedEmojis // ignore: cast_nullable_to_non_nullable
+              as List<String>,
       recentlyUsedUsers: null == recentlyUsedUsers
           ? _value.recentlyUsedUsers
           : recentlyUsedUsers // ignore: cast_nullable_to_non_nullable
@@ -259,6 +266,7 @@ abstract class _$$AccountSettingsImplCopyWith<$Res>
       bool keepOriginalFilename,
       List<MuteWord> mutedWords,
       List<MuteWord> hardMutedWords,
+      List<String> mutedEmojis,
       List<String> recentlyUsedUsers,
       List<String> hashtags});
 }
@@ -297,6 +305,7 @@ class __$$AccountSettingsImplCopyWithImpl<$Res>
     Object? keepOriginalFilename = null,
     Object? mutedWords = null,
     Object? hardMutedWords = null,
+    Object? mutedEmojis = null,
     Object? recentlyUsedUsers = null,
     Object? hashtags = null,
   }) {
@@ -385,6 +394,10 @@ class __$$AccountSettingsImplCopyWithImpl<$Res>
           ? _value._hardMutedWords
           : hardMutedWords // ignore: cast_nullable_to_non_nullable
               as List<MuteWord>,
+      mutedEmojis: null == mutedEmojis
+          ? _value._mutedEmojis
+          : mutedEmojis // ignore: cast_nullable_to_non_nullable
+              as List<String>,
       recentlyUsedUsers: null == recentlyUsedUsers
           ? _value._recentlyUsedUsers
           : recentlyUsedUsers // ignore: cast_nullable_to_non_nullable
@@ -422,13 +435,15 @@ class _$AccountSettingsImpl implements _AccountSettings {
       this.keepOriginalFilename = true,
       final List<MuteWord> mutedWords = const [],
       final List<MuteWord> hardMutedWords = const [],
+      final List<String> mutedEmojis = const [],
       final List<String> recentlyUsedUsers = const [],
       final List<String> hashtags = const []})
       : _pinnedEmojisForReaction = pinnedEmojisForReaction,
         _pinnedEmojis = pinnedEmojis,
         _recentlyUsedEmojis = recentlyUsedEmojis,
         _mutedWords = mutedWords,
         _hardMutedWords = hardMutedWords,
+        _mutedEmojis = mutedEmojis,
         _recentlyUsedUsers = recentlyUsedUsers,
         _hashtags = hashtags;
 
@@ -533,6 +548,15 @@ class _$AccountSettingsImpl implements _AccountSettings {
     return EqualUnmodifiableListView(_hardMutedWords);
   }
 
+  final List<String> _mutedEmojis;
+  @override
+  @JsonKey()
+  List<String> get mutedEmojis {
+    if (_mutedEmojis is EqualUnmodifiableListView) return _mutedEmojis;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_mutedEmojis);
+  }
+
 // UserSelectDialog
   final List<String> _recentlyUsedUsers;
 // UserSelectDialog
@@ -558,7 +582,7 @@ class _$AccountSettingsImpl implements _AccountSettings {
 
   @override
   String toString() {
-    return 'AccountSettings(keepCw: $keepCw, rememberNoteVisibility: $rememberNoteVisibility, defaultNoteVisibility: $defaultNoteVisibility, defaultNoteLocalOnly: $defaultNoteLocalOnly, rememberRenoteVisibility: $rememberRenoteVisibility, defaultRenoteVisibility: $defaultRenoteVisibility, defaultRenoteLocalOnly: $defaultRenoteLocalOnly, reactionAcceptance: $reactionAcceptance, visibility: $visibility, localOnly: $localOnly, renoteVisibility: $renoteVisibility, renoteLocalOnly: $renoteLocalOnly, pinnedEmojisForReaction: $pinnedEmojisForReaction, pinnedEmojis: $pinnedEmojis, recentlyUsedEmojis: $recentlyUsedEmojis, defaultReaction: $defaultReaction, uploadFolder: $uploadFolder, keepOriginalUploading: $keepOriginalUploading, keepOriginalFilename: $keepOriginalFilename, mutedWords: $mutedWords, hardMutedWords: $hardMutedWords, recentlyUsedUsers: $recentlyUsedUsers, hashtags: $hashtags)';
+    return 'AccountSettings(keepCw: $keepCw, rememberNoteVisibility: $rememberNoteVisibility, defaultNoteVisibility: $defaultNoteVisibility, defaultNoteLocalOnly: $defaultNoteLocalOnly, rememberRenoteVisibility: $rememberRenoteVisibility, defaultRenoteVisibility: $defaultRenoteVisibility, defaultRenoteLocalOnly: $defaultRenoteLocalOnly, reactionAcceptance: $reactionAcceptance, visibility: $visibility, localOnly: $localOnly, renoteVisibility: $renoteVisibility, renoteLocalOnly: $renoteLocalOnly, pinnedEmojisForReaction: $pinnedEmojisForReaction, pinnedEmojis: $pinnedEmojis, recentlyUsedEmojis: $recentlyUsedEmojis, defaultReaction: $defaultReaction, uploadFolder: $uploadFolder, keepOriginalUploading: $keepOriginalUploading, keepOriginalFilename: $keepOriginalFilename, mutedWords: $mutedWords, hardMutedWords: $hardMutedWords, mutedEmojis: $mutedEmojis, recentlyUsedUsers: $recentlyUsedUsers, hashtags: $hashtags)';
   }
 
   @override
@@ -609,6 +633,8 @@ class _$AccountSettingsImpl implements _AccountSettings {
                 .equals(other._mutedWords, _mutedWords) &&
             const DeepCollectionEquality()
                 .equals(other._hardMutedWords, _hardMutedWords) &&
+            const DeepCollectionEquality()
+                .equals(other._mutedEmojis, _mutedEmojis) &&
             const DeepCollectionEquality()
                 .equals(other._recentlyUsedUsers, _recentlyUsedUsers) &&
             const DeepCollectionEquality().equals(other._hashtags, _hashtags));
@@ -639,6 +665,7 @@ class _$AccountSettingsImpl implements _AccountSettings {
         keepOriginalFilename,
         const DeepCollectionEquality().hash(_mutedWords),
         const DeepCollectionEquality().hash(_hardMutedWords),
+        const DeepCollectionEquality().hash(_mutedEmojis),
         const DeepCollectionEquality().hash(_recentlyUsedUsers),
         const DeepCollectionEquality().hash(_hashtags)
       ]);
@@ -683,6 +710,7 @@ abstract class _AccountSettings implements AccountSettings {
       final bool keepOriginalFilename,
       final List<MuteWord> mutedWords,
       final List<MuteWord> hardMutedWords,
+      final List<String> mutedEmojis,
       final List<String> recentlyUsedUsers,
       final List<String> hashtags}) = _$AccountSettingsImpl;
 
@@ -731,7 +759,9 @@ abstract class _AccountSettings implements AccountSettings {
   @override
   List<MuteWord> get mutedWords;
   @override
-  List<MuteWord> get hardMutedWords; // UserSelectDialog
+  List<MuteWord> get hardMutedWords;
+  @override
+  List<String> get mutedEmojis; // UserSelectDialog
   @override
   List<String> get recentlyUsedUsers; // PostForm
   @override

diff --git a/lib/model/account_settings.g.dart b/lib/model/account_settings.g.dart
diff --git a/lib/model/mfm_config.dart b/lib/model/mfm_config.dart
@@ -16,7 +16,8 @@ class MfmConfig with _$MfmConfig {
       double scale,
       double opacity,
       TextStyle fallbackTextStyle,
-    ) emojiBuilder,
+    ) customEmojiBuilder,
+    required Widget Function(String emoji, TextStyle style) unicodeEmojiBuilder,
     required Widget Function(
       String username,
       String? host,