Merge remote-tracking branch 'upstream/dev' into feat/space-invite-share

src/app/core/state.ts

@@ -615,7 +615,12 @@ export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByU
 
     for (const event of deleteEvents) {
       for (const h of getTagValues("h", event.tags)) {
-        deletedByH.set(h, max([deletedByH.get(h), event.created_at]))
+        const deletedAt = deletedByH.get(h)
+
+        deletedByH.set(
+          h,
+          deletedAt === undefined ? event.created_at : max([deletedAt, event.created_at]),
+        )
       }
     }
 
@@ -623,8 +628,9 @@ export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByU
 
     for (const event of metaEvents) {
       const meta = tryCatch(() => readRoomMeta(event))
+      const deletedAt = meta ? deletedByH.get(meta.h) : undefined
 
-      if (!meta || gt(deletedByH.get(meta.h), meta.event.created_at)) {
+      if (!meta || (deletedAt !== undefined && !gt(meta.event.created_at, deletedAt))) {
         continue
       }
 

src/routes/settings/relays/+page.svelte

@@ -58,14 +58,14 @@
     <RelaySettingsItem
       icon={Inbox}
       title="Inbox Relays"
-      subtitle="Where you send your public notes. Be sure to select relays that will accept your notes, and which will let people who follow you read them."
+      subtitle="Where other people should send notes intended for you. Be sure to select relays that will accept notes that tag you."
       relays={readRelayUrls}
       addRelay={addReadRelay}
       removeRelay={removeReadRelay} />
     <RelaySettingsItem
       icon={Plane}
       title="Outbox Relays"
-      subtitle="Where other people should send notes intended for you. Be sure to select relays that will accept notes that tag you."
+      subtitle="Where you send your public notes. Be sure to select relays that will accept your notes, and which will let people who follow you read them."
       relays={writeRelayUrls}
       addRelay={addWriteRelay}
       removeRelay={removeWriteRelay} />