From 6b8ee46b5c6c6fe67b098d02289b8329865261f3 Mon Sep 17 00:00:00 2001
From: Roscoe Rubin-Rottenberg <roscoe@knotbin.com>
Date: Tue, 18 Aug 2026 21:06:08 -0400
Subject: [PATCH] fix: show moderator handle in label details

---
 .../core/moderation/moderated_content.dart    |  8 +--
 .../core/moderation/moderation_engine.dart    |  7 ++-
 .../core/moderation/moderation_models.dart    |  2 +
 .../core/moderation/moderation_provider.dart  |  3 ++
 .../moderation/moderated_content_test.dart    | 26 ++++++++++
 .../moderation/moderation_provider_test.dart  | 50 +++++++++++++++++++
 6 files changed, 91 insertions(+), 5 deletions(-)

diff --git a/lib/src/core/moderation/moderated_content.dart b/lib/src/core/moderation/moderated_content.dart
index 404c5d16..e0f399c4 100644
--- a/lib/src/core/moderation/moderated_content.dart
+++ b/lib/src/core/moderation/moderated_content.dart
@@ -443,6 +443,10 @@ class _ModerationDetailsState extends State<_ModerationDetails> {
             Builder(
               builder: (context) {
                 final strings = cause.localizedStrings(l10n);
+                final source = switch (cause.sourceHandle) {
+                  final handle? => '@$handle',
+                  null => cause.sourceDid,
+                };
                 return Card(
                   child: Padding(
                     padding: const EdgeInsets.all(16),
@@ -458,9 +462,7 @@ class _ModerationDetailsState extends State<_ModerationDetails> {
                           Text(description),
                         ],
                         const SizedBox(height: 8),
-                        SelectableText(
-                          '${l10n.moderationAppliedBy}: ${cause.sourceDid}',
-                        ),
+                        SelectableText('${l10n.moderationAppliedBy}: $source'),
                         if (cause.label.exp case final expires?)
                           Text(
                             '${l10n.moderationExpires}: ${expires.toLocal()}',
diff --git a/lib/src/core/moderation/moderation_engine.dart b/lib/src/core/moderation/moderation_engine.dart
index b18715d9..0530dd69 100644
--- a/lib/src/core/moderation/moderation_engine.dart
+++ b/lib/src/core/moderation/moderation_engine.dart
@@ -3,17 +3,19 @@ import 'package:spark/src/core/moderation/moderation_definitions.dart';
 import 'package:spark/src/core/moderation/moderation_models.dart';
 
 final class ModerationEngine {
-  const ModerationEngine({
+  ModerationEngine({
     required this.definitions,
     required this.preferences,
     this.currentUserDid,
     this.selfLabelerDid,
-  });
+    Map<String, String> labelerHandles = const {},
+  }) : _labelerHandles = Map.unmodifiable(labelerHandles);
 
   final ModerationLabelDefinitions definitions;
   final ModerationPreferences preferences;
   final String? currentUserDid;
   final String? selfLabelerDid;
+  final Map<String, String> _labelerHandles;
 
   ModerationDecision evaluate(
     Iterable<Label> labels, {
@@ -70,6 +72,7 @@ final class ModerationEngine {
             noOverride: noOverride,
           ),
           strings: definition.stringsFor(preferredLocales),
+          sourceHandle: _labelerHandles[label.src],
         ),
       );
     }
diff --git a/lib/src/core/moderation/moderation_models.dart b/lib/src/core/moderation/moderation_models.dart
index cfdae6b6..9b13825d 100644
--- a/lib/src/core/moderation/moderation_models.dart
+++ b/lib/src/core/moderation/moderation_models.dart
@@ -232,6 +232,7 @@ final class ModerationCause {
     required this.noOverride,
     required this.priority,
     this.strings,
+    this.sourceHandle,
   });
 
   final Label label;
@@ -242,6 +243,7 @@ final class ModerationCause {
   final bool noOverride;
   final int priority;
   final ModerationLabelStrings? strings;
+  final String? sourceHandle;
 
   String get sourceDid => label.src;
 }
diff --git a/lib/src/core/moderation/moderation_provider.dart b/lib/src/core/moderation/moderation_provider.dart
index e3070d00..2c0aac35 100644
--- a/lib/src/core/moderation/moderation_provider.dart
+++ b/lib/src/core/moderation/moderation_provider.dart
@@ -21,11 +21,13 @@ final moderationEngineProvider = FutureProvider<ModerationEngine>((ref) async {
   };
 
   final definitions = <String, Iterable<LabelValueDefinition>>{};
+  final labelerHandles = <String, String>{};
   await Future.wait(
     labelerDids.map((did) async {
       try {
         final service = await repository.labeler.getServicesDetailed([did]);
         definitions[did] = service.policies.labelValueDefinitions ?? const [];
+        labelerHandles[did] = service.creator.handle;
       } catch (error, stackTrace) {
         logger.w(
           'Could not load label definitions for $did',
@@ -46,5 +48,6 @@ final moderationEngineProvider = FutureProvider<ModerationEngine>((ref) async {
     ),
     currentUserDid: repository.authRepository.did,
     selfLabelerDid: repository.modDid.split('#').first,
+    labelerHandles: labelerHandles,
   );
 });
diff --git a/test/src/core/moderation/moderated_content_test.dart b/test/src/core/moderation/moderated_content_test.dart
index e25bc559..61dfb083 100644
--- a/test/src/core/moderation/moderated_content_test.dart
+++ b/test/src/core/moderation/moderated_content_test.dart
@@ -340,6 +340,30 @@ void main() {
     );
   });
 
+  testWidgets('label details show the moderator handle instead of its DID', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      _app(
+        _engine(labelerHandles: const {'did:plc:labeler': 'labeler.test'}),
+        ModeratedContent(
+          labels: [_label('gore', source: 'did:plc:labeler')],
+          target: ModerationTarget.content,
+          context: ModerationContext.contentView,
+          subjectDid: 'did:plc:author',
+          child: const SizedBox.expand(),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.text('Why am I seeing this?'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Applied by: @labeler.test'), findsOneWidget);
+    expect(find.textContaining('did:plc:labeler'), findsNothing);
+  });
+
   testWidgets('does not offer an account appeal for a CID-less record label', (
     tester,
   ) async {
@@ -501,6 +525,7 @@ ModerationEngine _engine({
   bool adultContentEnabled = true,
   String? currentUserDid,
   Map<String, Iterable<LabelValueDefinition>> definitions = const {},
+  Map<String, String> labelerHandles = const {},
 }) {
   return ModerationEngine(
     definitions: ModerationLabelDefinitions.fromLabelers(definitions),
@@ -510,6 +535,7 @@ ModerationEngine _engine({
       authenticated: true,
     ),
     currentUserDid: currentUserDid,
+    labelerHandles: labelerHandles,
   );
 }
 
diff --git a/test/src/core/moderation/moderation_provider_test.dart b/test/src/core/moderation/moderation_provider_test.dart
index fbe4af93..01a38532 100644
--- a/test/src/core/moderation/moderation_provider_test.dart
+++ b/test/src/core/moderation/moderation_provider_test.dart
@@ -1,7 +1,10 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:get_it/get_it.dart';
+import 'package:poptart/poptart.dart';
+import 'package:poptart_lex/com/atproto/label/defs.dart';
 import 'package:spark/src/core/auth/data/repositories/auth_repository.dart';
+import 'package:spark/src/core/moderation/moderation.dart';
 import 'package:spark/src/core/moderation/moderation_provider.dart';
 import 'package:spark/src/core/network/atproto/data/models/labeler_models.dart';
 import 'package:spark/src/core/network/atproto/data/models/pref_models.dart';
@@ -9,6 +12,7 @@ import 'package:spark/src/core/network/atproto/data/repositories/labeler_reposit
 import 'package:spark/src/core/network/atproto/data/repositories/pref_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 void main() {
   setUp(() async {
@@ -39,6 +43,33 @@ void main() {
 
     expect(container.read(moderationEngineProvider).hasError, isTrue);
   });
+
+  test('preserves labeler handles for moderation details', () async {
+    GetIt.I
+      ..registerSingleton<PrefRepository>(_FakePrefRepository())
+      ..registerSingleton<SprkRepository>(
+        _FakeSprkRepository(_SuccessfulLabelerRepository()),
+      )
+      ..registerSingleton<LogService>(LogService());
+    final container = ProviderContainer.test();
+    addTearDown(container.dispose);
+
+    final engine = await container.read(moderationEngineProvider.future);
+    final decision = engine.evaluate(
+      [
+        Label(
+          src: 'did:plc:moderator',
+          uri: 'at://did:plc:author/so.sprk.feed.post/example',
+          val: 'porn',
+          cts: DateTime.utc(2026),
+        ),
+      ],
+      target: ModerationTarget.content,
+      subjectDid: 'did:plc:author',
+    );
+
+    expect(decision.causes.single.sourceHandle, 'moderator.test');
+  });
 }
 
 class _FakePrefRepository implements PrefRepository {
@@ -79,6 +110,25 @@ class _FailingLabelerRepository implements LabelerRepository {
   dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
 
+class _SuccessfulLabelerRepository implements LabelerRepository {
+  @override
+  Future<LabelerViewDetailed> getServicesDetailed(List<String> dids) async {
+    final did = dids.single;
+    return LabelerViewDetailed(
+      uri: AtUri.parse('at://$did/app.bsky.labeler.service/self'),
+      cid: 'cid',
+      creator: ProfileView(did: did, handle: 'moderator.test'),
+      policies: LabelerPolicies(
+        labelValues: const [LabelValue.knownValue(data: KnownLabelValue.porn)],
+      ),
+      indexedAt: DateTime.utc(2026),
+    );
+  }
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
 class _FakeAuthRepository implements AuthRepository {
   @override
   Future<void> initializationComplete = Future<void>.value();
-- 
2.51.2