Merge remote-tracking branch 'poppingmoon-miria/instance-info-respons…

…e' into testing
4ster1sk · Dec 22, 2024 · df321f5 · df321f5
2 parents b070ffb + 7d2037f
commit df321f5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/lib/model/federation_data.dart b/lib/model/federation_data.dart
@@ -98,7 +98,7 @@ class FederationState extends _$FederationState {
       isSupportedEmoji: false,
       isSupportedAnnouncement: false,
       isSupportedLocalTimeline: false,
-      name: federation.name,
+      name: federation.name ?? "",
       usersCount: federation.usersCount,
       notesCount: federation.notesCount,
       softwareName: federation.softwareName ?? "",
@@ -156,7 +156,7 @@ class FederationState extends _$FederationState {
       privacyPolicyUrl: misskeyMeta?.privacyPolicyUrl?.toString(),
       impressumUrl: misskeyMeta?.impressumUrl?.toString(),
       repositoryUrl: misskeyMeta?.repositoryUrl?.toString(),
-      name: misskeyMeta?.name ?? federation.name,
+      name: misskeyMeta?.name ?? federation.name ?? "",
       description: misskeyMeta?.description ?? federation.description ?? "",
       maintainerName: misskeyMeta?.maintainerName,
       maintainerEmail: misskeyMeta?.maintainerEmail,

diff --git a/lib/model/federation_data.g.dart b/lib/model/federation_data.g.dart
diff --git a/lib/state_notifier/common/download_file_notifier.g.dart b/lib/state_notifier/common/download_file_notifier.g.dart
diff --git a/lib/state_notifier/note_create_page/note_create_state_notifier.g.dart b/lib/state_notifier/note_create_page/note_create_state_notifier.g.dart
diff --git a/lib/view/common/misskey_notes/renote_modal_sheet.g.dart b/lib/view/common/misskey_notes/renote_modal_sheet.g.dart
diff --git a/lib/view/user_page/user_info_notifier.g.dart b/lib/view/user_page/user_info_notifier.g.dart