Browse Source

bug-fix last http relay problems

imwald
Silberengel 3 weeks ago
parent
commit
36475f009e
  1. 6
      src/components/NoteList/index.tsx
  2. 4
      src/components/RelayInfo/RelayReviewsPreview.tsx
  3. 4
      src/services/client.service.ts

6
src/components/NoteList/index.tsx

@ -14,7 +14,7 @@ import {
stableSpellFeedFilterKey stableSpellFeedFilterKey
} from '@/lib/spell-feed-request-identity' } from '@/lib/spell-feed-request-identity'
import logger from '@/lib/logger' import logger from '@/lib/logger'
import { normalizeUrl } from '@/lib/url' import { normalizeAnyRelayUrl, normalizeUrl } from '@/lib/url'
import { shouldIncludeZapReceiptAtReplyThreshold } from '@/lib/event-metadata' import { shouldIncludeZapReceiptAtReplyThreshold } from '@/lib/event-metadata'
import { isTouchDevice } from '@/lib/utils' import { isTouchDevice } from '@/lib/utils'
import { useContentPolicy } from '@/providers/ContentPolicyProvider' import { useContentPolicy } from '@/providers/ContentPolicyProvider'
@ -625,7 +625,7 @@ const NoteList = forwardRef(
const subRequestsKey = useMemo(() => { const subRequestsKey = useMemo(() => {
return JSON.stringify( return JSON.stringify(
subRequests.map((req) => ({ subRequests.map((req) => ({
urls: [...req.urls].map((u) => normalizeUrl(u) || u).filter(Boolean).sort(), urls: [...req.urls].map((u) => normalizeAnyRelayUrl(u) || u).filter(Boolean).sort(),
filter: stableSpellFeedFilterKey(req.filter) filter: stableSpellFeedFilterKey(req.filter)
})) }))
) )
@ -635,7 +635,7 @@ const NoteList = forwardRef(
() => () =>
JSON.stringify( JSON.stringify(
(followingFeedDeltaSubRequests ?? []).map((req) => ({ (followingFeedDeltaSubRequests ?? []).map((req) => ({
urls: [...req.urls].map((u) => normalizeUrl(u) || u).filter(Boolean).sort(), urls: [...req.urls].map((u) => normalizeAnyRelayUrl(u) || u).filter(Boolean).sort(),
filter: stableSpellFeedFilterKey(req.filter) filter: stableSpellFeedFilterKey(req.filter)
})) }))
), ),

4
src/components/RelayInfo/RelayReviewsPreview.tsx

@ -21,7 +21,7 @@ import {
relayReviewEventTargetsRelay, relayReviewEventTargetsRelay,
relayReviewsFeedSnapshotKey relayReviewsFeedSnapshotKey
} from '@/lib/relay-review-feed' } from '@/lib/relay-review-feed'
import { normalizeUrl } from '@/lib/url' import { normalizeAnyRelayUrl } from '@/lib/url'
import { cn, isTouchDevice } from '@/lib/utils' import { cn, isTouchDevice } from '@/lib/utils'
import { useMuteList } from '@/contexts/mute-list-context' import { useMuteList } from '@/contexts/mute-list-context'
import { muteSetHas } from '@/lib/mute-set' import { muteSetHas } from '@/lib/mute-set'
@ -93,7 +93,7 @@ export default function RelayReviewsPreview({ relayUrl }: { relayUrl: string })
setReviews([]) setReviews([])
setInitialized(false) setInitialized(false)
const normalizedTarget = normalizeUrl(relayUrl) || relayUrl const normalizedTarget = normalizeAnyRelayUrl(relayUrl) || relayUrl
const dTags = relayReviewDTagsForRelayUrl(relayUrl) const dTags = relayReviewDTagsForRelayUrl(relayUrl)
const snapKey = relayReviewsFeedSnapshotKey(normalizedTarget) const snapKey = relayReviewsFeedSnapshotKey(normalizedTarget)
const fromSession = getSessionFeedSnapshot(snapKey) const fromSession = getSessionFeedSnapshot(snapKey)

4
src/services/client.service.ts

@ -2576,7 +2576,9 @@ class ClientService extends EventTarget {
that.scheduleTimelinePersist(key) that.scheduleTimelinePersist(key)
} }
const subCloser = this.subscribe(relays, filter, { // HTTP index relays are handled via httpTimelinePollBases above — never pass them to the WS subscribe path.
const wsRelays = relays.filter((u) => !isHttpRelayUrl(u))
const subCloser = this.subscribe(wsRelays, filter, {
startLogin, startLogin,
onevent: (evt: NEvent) => { onevent: (evt: NEvent) => {
applySubscribedTimelineEvent(evt) applySubscribedTimelineEvent(evt)

Loading…
Cancel
Save