From 4f1bd6e0c2dc43bbea61d3d14f5ea31832786556 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Thu, 30 Jul 2026 21:05:57 -0400
Subject: [PATCH] feat(relays): name which public chats each subscription
 serves
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Public Chat collapsed into a single unnamed row because none of its
producers carried an entity id, so the screen could say how many filters
were running but not which chats caused them.

The six channel-scoped producers now tag their channel ids — including
the batched ones, which carry every channel a relay serves so the screen
fans them into a row each.

The six discovery producers (global, by author, by community, by hashtag,
by geohash) stay untagged on purpose: they search for chats rather than
serving known ones, so there is no entity to name.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../nip28PublicChats/FilterChannelMetadataCreationById.kt       | 1 +
 .../nip28PublicChats/FilterChannelMetadataUpdatesById.kt        | 1 +
 .../datasource/subassemblies/FilterMessagesToPublicChat.kt      | 1 +
 .../datasource/subassemblies/FilterMyMessagesToPublicChat.kt    | 1 +
 .../chats/rooms/datasource/FilterFollowingPublicChats.kt        | 1 +
 .../rooms/datasource/FilterLastMessageFollowingPublicChats.kt   | 2 ++
 6 files changed, 7 insertions(+)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/nip28PublicChats/FilterChannelMetadataCreationById.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/nip28PublicChats/FilterChannelMetadataCreationById.kt
index c02515c72a..ce2042c354 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/nip28PublicChats/FilterChannelMetadataCreationById.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/nip28PublicChats/FilterChannelMetadataCreationById.kt
@@ -57,6 +57,7 @@ fun filterMissingChannelsById(keys: List<ChannelFinderQueryState>): List<RelayBa
             filter =
                 ExplainedFilter(
                     purpose = SubPurpose.PUBLIC_CHATS,
+                    entityIds = channelIds.sorted(),
                     kinds = filterMissingPublicChannelsByIdKinds,
                     ids = channelIds.sorted(),
                 ),
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/nip28PublicChats/FilterChannelMetadataUpdatesById.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/nip28PublicChats/FilterChannelMetadataUpdatesById.kt
index f076affc38..db309f1b9d 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/nip28PublicChats/FilterChannelMetadataUpdatesById.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/nip28PublicChats/FilterChannelMetadataUpdatesById.kt
@@ -40,6 +40,7 @@ fun filterChannelMetadataUpdatesById(
             filter =
                 ExplainedFilter(
                     purpose = SubPurpose.PUBLIC_CHATS,
+                    entityIds = channels.map { it.idHex }.sorted(),
                     kinds = channelMetadataKinds,
                     tags = mapOf("e" to channels.map { it.idHex }),
                     since = since,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/datasource/subassemblies/FilterMessagesToPublicChat.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/datasource/subassemblies/FilterMessagesToPublicChat.kt
index f876bce08b..2c61617087 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/datasource/subassemblies/FilterMessagesToPublicChat.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/datasource/subassemblies/FilterMessagesToPublicChat.kt
@@ -37,6 +37,7 @@ fun filterMessagesToPublicChat(
             filter =
                 ExplainedFilter(
                     purpose = SubPurpose.PUBLIC_CHATS,
+                    entityIds = listOfNotNull(channel.idHex),
                     kinds = listOf(ChannelMessageEvent.KIND),
                     tags = mapOf("e" to listOfNotNull(channel.idHex)),
                     limit = 200,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/datasource/subassemblies/FilterMyMessagesToPublicChat.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/datasource/subassemblies/FilterMyMessagesToPublicChat.kt
index f541908bc6..a83ed76a73 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/datasource/subassemblies/FilterMyMessagesToPublicChat.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/datasource/subassemblies/FilterMyMessagesToPublicChat.kt
@@ -39,6 +39,7 @@ fun filterMyMessagesToPublicChat(
             filter =
                 ExplainedFilter(
                     purpose = SubPurpose.PUBLIC_CHATS,
+                    entityIds = listOfNotNull(channel.idHex),
                     kinds = listOf(ChannelMessageEvent.KIND),
                     tags = mapOf("e" to listOfNotNull(channel.idHex)),
                     authors = listOf(pubKey),
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingPublicChats.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingPublicChats.kt
index 000fab8036..aaadd69211 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingPublicChats.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingPublicChats.kt
@@ -59,6 +59,7 @@ fun filterFollowingPublicChatsCreationEvent(
             filter =
                 ExplainedFilter(
                     purpose = SubPurpose.PUBLIC_CHATS,
+                    entityIds = it.value.sorted(),
                     kinds = listOf(ChannelCreateEvent.KIND),
                     ids = it.value.sorted(),
                     since = since?.get(it.key)?.time,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterLastMessageFollowingPublicChats.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterLastMessageFollowingPublicChats.kt
index 600e75815e..f99e8a4453 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterLastMessageFollowingPublicChats.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterLastMessageFollowingPublicChats.kt
@@ -60,6 +60,7 @@ fun filterLastMessageFollowingPublicChats(
                     filter =
                         ExplainedFilter(
                             purpose = SubPurpose.PUBLIC_CHATS,
+                            entityIds = it.value.sorted(),
                             kinds = listOf(ChannelMetadataEvent.KIND),
                             tags = mapOf("e" to it.value.sorted()),
                             since = since?.get(it.key)?.time,
@@ -71,6 +72,7 @@ fun filterLastMessageFollowingPublicChats(
                     filter =
                         ExplainedFilter(
                             purpose = SubPurpose.PUBLIC_CHATS,
+                            entityIds = it.value.sorted(),
                             kinds = listOf(ChannelMessageEvent.KIND),
                             tags = mapOf("e" to it.value.sorted()),
                             since = since?.get(it.key)?.time,