Compare commits

...

2 Commits

Author SHA1 Message Date
Jon Staab 9af3e3b2e9 Fix relay badge overflow 2026-05-05 09:11:12 -07:00
Jon Staab 341c1b45b2 Stop publishing join requests every time we open a space 2026-05-05 09:09:28 -07:00
2 changed files with 8 additions and 23 deletions
+5 -5
View File
@@ -26,22 +26,22 @@
{@const {pubkey, software, version, supported_nips, limitation} = $relay}
<div class="flex flex-wrap gap-1">
{#if pubkey}
<div class="badge badge-neutral">
<div class="badge badge-neutral text-wrap h-auto">
<span class="ellipsize">Administrator: <ProfileLink unstyled {pubkey} /></span>
</div>
{/if}
{#if $relay?.contact}
<div class="badge badge-neutral">
<div class="badge badge-neutral text-wrap h-auto">
<span class="ellipsize">Contact: {$relay.contact}</span>
</div>
{/if}
{#if software}
<div class="badge badge-neutral">
<div class="badge badge-neutral text-wrap h-auto">
<span class="ellipsize">Software: {software}</span>
</div>
{/if}
{#if version}
<div class="badge badge-neutral">
<div class="badge badge-neutral text-wrap h-auto">
<span class="ellipsize">Version: {version}</span>
</div>
{/if}
@@ -61,7 +61,7 @@
</p>
{/if}
{#if limitation?.min_pow_difficulty}
<p class="badge badge-warning">
<p class="badge badge-warning text-wrap h-auto">
<span class="ellipsize">Min PoW: {limitation?.min_pow_difficulty}</span>
</p>
{/if}
+3 -18
View File
@@ -73,7 +73,6 @@ import {
waitForThunkError,
getPubkeyRelays,
userBlossomServerList,
getThunkError,
addRoomMember,
manageRelay,
getRelay,
@@ -264,16 +263,12 @@ export const attemptRelayAccess = async (url: string, claim = "") => {
return stripPrefix(error)
}
export const deriveRelayAuthError = (url: string, claim = "") => {
// Kick off the auth process
export const deriveRelayAuthError = (url: string) => {
Pool.get().get(url).auth.attemptAuth(sign)
// Attempt to join the relay
const thunk = publishJoinRequest({url, claim})
return derived(
[thunk, relaysMostlyRestricted, deriveSocket(url)],
([$thunk, $relaysMostlyRestricted, $socket]) => {
[relaysMostlyRestricted, deriveSocket(url)],
([$relaysMostlyRestricted, $socket]) => {
if ($socket.auth.status === AuthStatus.Forbidden && $socket.auth.details) {
return stripPrefix($socket.auth.details)
}
@@ -281,16 +276,6 @@ export const deriveRelayAuthError = (url: string, claim = "") => {
if ($relaysMostlyRestricted[url]) {
return stripPrefix($relaysMostlyRestricted[url])
}
const error = getThunkError($thunk)
if (error) {
const isEmptyInvite = !claim && error.includes("invite code")
if (!shouldIgnoreError(error) && !isEmptyInvite) {
return stripPrefix(error) || "join request rejected"
}
}
},
)
}