Unify the URL list editors and harden the metadata fetch

- Replace the relay and media server list editors with one shared
  url-list-editor controller (kind, tag, markers, URL pattern and
  messages as values); give the relay editor ws/wss validation and
  dedupe entries
- Extract the shared "added" badge/class logic into lib/added_badge and
  use it from the field suggestion controller
- Normalize relay/media URLs when comparing against the user's list, so
  trailing slashes or casing don't read as missing
- Add a fetch timeout and a "Try again" affordance, and show
  "Saved. Updating…" after a publish
This commit is contained in:
raucao committed 2026-11-18 21:47:39 +04:00
1 parent 4ed88d1e78
commit c4c9a61297
15 files changed
+312 -249

No files matched your search

@@ -2,20 +2,26 @@
<h3 class="mb-6">Edit media servers</h3>
<%= form_with url: "#", local: true,
html: { data: {
controller: "media-server-list-editor",
action: "submit->media-server-list-editor#save"
controller: "url-list-editor",
action: "submit->url-list-editor#save",
:'url-list-editor-kind-value' => NostrManagerService::MEDIA_SERVER_LIST_KIND,
:'url-list-editor-tag-value' => "server",
:'url-list-editor-markers-value' => false,
:'url-list-editor-pattern-value' => "^https?://",
:'url-list-editor-empty-message-value' => "Please add at least one media server.",
:'url-list-editor-invalid-message-value' => "Media server URLs must start with http:// or https://."
} } do |f| %>
<ul data-media-server-list-editor-target="list" class="mb-4 space-y-2">
<ul data-url-list-editor-target="list" class="mb-4 space-y-2">
<% @servers.each do |server| %>
<li class="flex gap-x-2 items-center">
<div class="relative grow">
<% if server[:added] %>
<input type="text" name="server_urls[]" value="<%= server[:url] %>"
data-added-value="<%= server[:url] %>"
data-action="input->media-server-list-editor#checkAdded"
data-action="input->url-list-editor#checkAdded"
class="w-full pr-16 border-emerald-500 ring-1 ring-emerald-500 focus:border-emerald-500 focus:ring-emerald-500 bg-emerald-50/20" />
<span class="absolute inset-y-0 right-2.5 flex items-center pointer-events-none"
data-media-server-list-editor-target="addedBadge">
data-url-list-editor-target="addedBadge">
<span class="rounded-full bg-emerald-100 px-2 py-0.5 text-xs font-semibold text-emerald-800">
added
</span>
@@ -25,34 +31,34 @@
<% end %>
</div>
<button type="button" class="btn-md btn-icon btn-outline text-red-700 shrink-0"
data-action="click->media-server-list-editor#remove" title="Remove media server">
data-action="click->url-list-editor#remove" title="Remove media server">
<%= render partial: "icons/trash-2", locals: { custom_class: "h-4 w-4" } %>
</button>
</li>
<% end %>
</ul>
<template data-media-server-list-editor-target="template">
<template data-url-list-editor-target="template">
<li class="flex gap-x-2 items-center">
<div class="relative grow">
<input type="text" name="server_urls[]" value="" class="w-full" />
</div>
<button type="button" class="btn-md btn-icon btn-outline text-red-700 shrink-0"
data-action="click->media-server-list-editor#remove" title="Remove media server">
data-action="click->url-list-editor#remove" title="Remove media server">
<%= render partial: "icons/trash-2", locals: { custom_class: "h-4 w-4" } %>
</button>
</li>
</template>
<button type="button" class="btn-md btn-gray w-full mb-6"
data-action="click->media-server-list-editor#add">
data-action="click->url-list-editor#add">
<%= render partial: "icons/plus", locals: { custom_class: "h-4 w-4 inline mr-1" } %>
Add media server
</button>
<p class="error-msg mt-2 mb-4 hidden" data-media-server-list-editor-target="error"></p>
<p class="error-msg mt-2 mb-4 hidden" data-url-list-editor-target="error"></p>
<%= f.submit "Save media servers", class: "btn-md btn-blue w-full",
data: { :'media-server-list-editor-target' => "submit" } %>
data: { :'url-list-editor-target' => "submit" } %>
<% end %>
</div>
@@ -2,20 +2,26 @@
<h3 class="mb-6">Edit relays</h3>
<%= form_with url: "#", local: true,
html: { data: {
controller: "relay-list-editor",
action: "submit->relay-list-editor#save"
controller: "url-list-editor",
action: "submit->url-list-editor#save",
:'url-list-editor-kind-value' => NostrManagerService::RELAY_LIST_KIND,
:'url-list-editor-tag-value' => "r",
:'url-list-editor-markers-value' => true,
:'url-list-editor-pattern-value' => "^wss?://",
:'url-list-editor-empty-message-value' => "Please add at least one relay.",
:'url-list-editor-invalid-message-value' => "Relay URLs must start with ws:// or wss://."
} } do |f| %>
<ul data-relay-list-editor-target="list" class="mb-4 space-y-2">
<ul data-url-list-editor-target="list" class="mb-4 space-y-2">
<% @relays.each do |relay| %>
<li class="flex gap-x-2 items-center">
<div class="relative grow">
<% if relay[:added] %>
<input type="text" name="relay_urls[]" value="<%= relay[:url] %>"
data-added-value="<%= relay[:url] %>"
data-action="input->relay-list-editor#checkAdded"
data-action="input->url-list-editor#checkAdded"
class="w-full pr-16 border-emerald-500 ring-1 ring-emerald-500 focus:border-emerald-500 focus:ring-emerald-500 bg-emerald-50/20" />
<span class="absolute inset-y-0 right-2.5 flex items-center pointer-events-none"
data-relay-list-editor-target="addedBadge">
data-url-list-editor-target="addedBadge">
<span class="rounded-full bg-emerald-100 px-2 py-0.5 text-xs font-semibold text-emerald-800">
added
</span>
@@ -30,14 +36,14 @@
<option value="write"<%= %( selected="selected") if relay[:marker] == "write" %>>Write only</option>
</select>
<button type="button" class="btn-md btn-icon btn-outline text-red-700 shrink-0"
data-action="click->relay-list-editor#remove" title="Remove relay">
data-action="click->url-list-editor#remove" title="Remove relay">
<%= render partial: "icons/trash-2", locals: { custom_class: "h-4 w-4" } %>
</button>
</li>
<% end %>
</ul>
<template data-relay-list-editor-target="template">
<template data-url-list-editor-target="template">
<li class="flex gap-x-2 items-center">
<div class="relative grow">
<input type="text" name="relay_urls[]" value="" class="w-full" />
@@ -48,21 +54,21 @@
<option value="write">Write only</option>
</select>
<button type="button" class="btn-md btn-icon btn-outline text-red-700 shrink-0"
data-action="click->relay-list-editor#remove" title="Remove relay">
data-action="click->url-list-editor#remove" title="Remove relay">
<%= render partial: "icons/trash-2", locals: { custom_class: "h-4 w-4" } %>
</button>
</li>
</template>
<button type="button" class="btn-md btn-gray w-full mb-6"
data-action="click->relay-list-editor#add">
data-action="click->url-list-editor#add">
<%= render partial: "icons/plus", locals: { custom_class: "h-4 w-4 inline mr-1" } %>
Add relay
</button>
<p class="error-msg mt-2 mb-4 hidden" data-relay-list-editor-target="error"></p>
<p class="error-msg mt-2 mb-4 hidden" data-url-list-editor-target="error"></p>
<%= f.submit "Save relay list", class: "btn-md btn-blue w-full",
data: { :'relay-list-editor-target' => "submit" } %>
data: { :'url-list-editor-target' => "submit" } %>
<% end %>
</div>
@@ -16,7 +16,7 @@ module Settings
})
if @server_url.present?
if server_urls(media_list_event).include?(@server_url)
if normalized_server_urls(media_list_event).include?(NostrManagerService.normalize_url(@server_url))
@statuses.push({
text: "The <strong>#{@server_host}</strong> media server is part of your list",
icon_name: "check-circle",
@@ -52,5 +52,9 @@ module Settings
def server_urls(event)
event["tags"].select { |t| t.is_a?(Array) && t[0] == "server" }.map { |t| t[1] }
end
def normalized_server_urls(event)
server_urls(event).map { |url| NostrManagerService.normalize_url(url) }
end
end
end
@@ -5,7 +5,7 @@ module Settings
def initialize(nip65_event:, relay_url: Setting.nostr_relay_url)
@nip65_event = nip65_event
@relay_url = relay_url
@relay_host = relay_url.present? ? URI.parse(relay_url).host : nil
@relay_host = relay_host(relay_url)
@statuses = []
if nip65_event.present?
@@ -15,18 +15,20 @@ module Settings
icon_color: "emerald-500"
})
if relay_urls(nip65_event).include?(@relay_url)
@statuses.push({
text: "The <strong>#{@relay_host}</strong> relay is part of your relay list",
icon_name: "check-circle",
icon_color: "emerald-500"
})
else
@statuses.push({
text: "<strong>#{@relay_host}</strong> is missing from your relay list",
icon_name: "alert-octagon",
icon_color: "amber-500"
})
if @relay_url.present?
if normalized_relay_urls(nip65_event).include?(NostrManagerService.normalize_url(@relay_url))
@statuses.push({
text: "The <strong>#{@relay_host}</strong> relay is part of your relay list",
icon_name: "check-circle",
icon_color: "emerald-500"
})
else
@statuses.push({
text: "<strong>#{@relay_host}</strong> is missing from your relay list",
icon_name: "alert-octagon",
icon_color: "amber-500"
})
end
end
else
@statuses.push({
@@ -41,8 +43,18 @@ module Settings
private
def relay_host(url)
URI.parse(url).host
rescue URI::InvalidURIError
nil
end
def relay_urls(nip65_event)
nip65_event["tags"].select { |t| t[0] == "r" }.map { |t| t[1] }
nip65_event["tags"].select { |t| t.is_a?(Array) && t[0] == "r" }.map { |t| t[1] }
end
def normalized_relay_urls(nip65_event)
relay_urls(nip65_event).map { |url| NostrManagerService.normalize_url(url) }
end
end
end
@@ -1,4 +1,16 @@
import { Controller } from "@hotwired/stimulus"
import { isAdded, setAddedClasses } from "lib/added_badge"
const AMBER_CLASSES = [
"border-amber-400", "ring-1", "ring-amber-400",
"focus:border-amber-400", "focus:ring-amber-400"
]
const ADDED_BADGE_HTML = `
<span class="rounded-full bg-emerald-100 px-2 py-0.5 text-xs font-semibold text-emerald-800">
added
</span>
`.trim()
export default class extends Controller {
static targets = [ "input", "badge", "suggestion" ]
@@ -20,44 +32,22 @@ export default class extends Controller {
const addedValue = this.hasAddedValueValue ? this.addedValueValue : null
if (!addedValue) return
const isMatch = (this.inputTarget.value.trim() === addedValue.trim())
const added = isAdded(this.inputTarget, addedValue)
setAddedClasses(this.inputTarget, added)
const emeraldClasses = [
"border-emerald-500", "ring-1", "ring-emerald-500",
"focus:border-emerald-500", "focus:ring-emerald-500",
"bg-emerald-50/20"
]
const amberClasses = [
"border-amber-400", "ring-1", "ring-amber-400",
"focus:border-amber-400", "focus:ring-amber-400"
]
if (isMatch) {
this.inputTarget.classList.remove(...amberClasses)
this.inputTarget.classList.add(...emeraldClasses)
if (added) {
this.inputTarget.classList.remove(...AMBER_CLASSES)
if (this.hasBadgeTarget) {
this.badgeTarget.innerHTML = `
<span class="rounded-full bg-emerald-100 px-2 py-0.5 text-xs font-semibold text-emerald-800">
added
</span>
`.trim()
this.badgeTarget.innerHTML = ADDED_BADGE_HTML
this.badgeTarget.classList.remove("hidden")
}
} else if (this.hasBadgeTarget) {
this.badgeTarget.classList.add("hidden")
}
if (this.hasSuggestionTarget) {
this.suggestionTarget.classList.add("hidden")
}
} else {
this.inputTarget.classList.remove(...emeraldClasses)
if (this.hasBadgeTarget) {
this.badgeTarget.classList.add("hidden")
}
if (this.hasSuggestionTarget) {
this.suggestionTarget.classList.remove("hidden")
}
if (this.hasSuggestionTarget) {
this.suggestionTarget.classList.toggle("hidden", added)
}
}
}
@@ -1,11 +1,17 @@
import { Controller } from "@hotwired/stimulus"
const REQUEST_TIMEOUT = 30000
const REFRESH_ATTEMPTS = 5
const REFRESH_DELAY = 2000
const STEP_FOR_KIND = { 10002: "relays", 0: "profile", 10063: "blossom" }
const MESSAGES = {
relays: "Looking up your relay list…",
profile: "Fetching your profile…",
blossom: "Fetching your media server list…"
}
export default class extends Controller {
static targets = [ "status", "loading", "content" ]
static targets = [ "status", "loading", "content", "retry" ]
static values = { url: String }
connect () {
@@ -19,30 +25,27 @@ export default class extends Controller {
this.contentTarget.innerHTML = ""
this.loadingTarget.classList.remove("hidden")
this.runStep("relays", {
message: "Saved. Updating…",
expectedKind: detail.kind,
expectedId: detail.eventId,
attempts: 0
})
}
async runStep (step, options = {}) {
const messages = {
relays: "Looking up your relay list…",
profile: "Fetching your profile…",
blossom: "Fetching your media server list…",
render: null
}
retry () {
this.runStep("relays")
}
if (messages[step]) {
this.statusTarget.textContent = messages[step]
async runStep (step, options = {}) {
this.hideRetry()
const message = options.message || MESSAGES[step]
if (message) {
this.statusTarget.textContent = message
}
try {
const headers = (step === "render")
? { "Accept": "text/html" }
: { "Accept": "application/json" }
const res = await fetch(`${this.urlValue}?step=${step}`, { headers })
const res = await this.request(step)
if (!res.ok) {
throw new Error(`HTTP ${res.status}`)
@@ -60,19 +63,38 @@ export default class extends Controller {
const attempts = (options.attempts || 0) + 1
this.statusTarget.textContent = "Waiting for your changes to appear…"
setTimeout(
() => this.runStep(step, { ...options, attempts }),
() => this.runStep(step, { ...options, message: null, attempts }),
REFRESH_DELAY
)
return
}
if (data.next) {
this.runStep(data.next, options)
this.runStep(data.next, { ...options, message: null })
}
}
} catch (error) {
console.warn("Nostr metadata fetch failed:", error.message)
this.statusTarget.textContent = "Something went wrong. Please reload."
this.statusTarget.textContent = "Something went wrong. You can try again."
this.showRetry()
}
}
async request (step) {
const controller = new AbortController()
const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT)
const headers = (step === "render")
? { "Accept": "text/html" }
: { "Accept": "application/json" }
try {
return await fetch(`${this.urlValue}?step=${step}`, {
headers,
signal: controller.signal
})
} finally {
clearTimeout(timer)
}
}
@@ -82,4 +104,12 @@ export default class extends Controller {
data.event_id !== options.expectedId &&
(options.attempts || 0) < REFRESH_ATTEMPTS
}
showRetry () {
if (this.hasRetryTarget) this.retryTarget.classList.remove("hidden")
}
hideRetry () {
if (this.hasRetryTarget) this.retryTarget.classList.add("hidden")
}
}
@@ -1,116 +0,0 @@
import { Controller } from "@hotwired/stimulus"
import { signAndPublish, hasNostrExtension } from "lib/nostr_publish"
const RELAY_LIST_KIND = 10002
export default class extends Controller {
static targets = [ "list", "template", "addedBadge", "error", "submit" ]
add (event) {
event.preventDefault()
const row = this.templateTarget.content.cloneNode(true)
this.listTarget.appendChild(row)
this.clearError()
}
remove (event) {
event.preventDefault()
event.target.closest("li").remove()
this.clearError()
}
checkAdded (event) {
const input = event.target
const addedValue = input.dataset.addedValue
if (!addedValue) return
const container = input.closest(".relative")
const badge = container?.querySelector("[data-relay-list-editor-target='addedBadge']")
const addedClasses = [
"border-emerald-500", "ring-1", "ring-emerald-500",
"focus:border-emerald-500", "focus:ring-emerald-500",
"bg-emerald-50/20"
]
if (input.value.trim() === addedValue.trim()) {
input.classList.add(...addedClasses)
if (badge) badge.classList.remove("hidden")
} else {
input.classList.remove(...addedClasses)
if (badge) badge.classList.add("hidden")
}
}
async save (event) {
event.preventDefault()
this.clearError()
const relays = this.relays()
if (relays.length === 0) {
this.showError("Please add at least one relay.")
return
}
if (!hasNostrExtension()) {
this.showError("No Nostr extension (NIP-07) found.")
return
}
this.setBusy(true)
try {
const signedEvent = await signAndPublish({
kind: RELAY_LIST_KIND,
created_at: Math.floor(Date.now() / 1000),
tags: relays.map(({ url, marker }) => marker ? ["r", url, marker] : ["r", url]),
content: ""
})
this.element.dispatchEvent(new CustomEvent("nostr:publish", {
bubbles: true,
detail: { kind: RELAY_LIST_KIND, eventId: signedEvent.id }
}))
} catch (error) {
this.showError(error.message)
} finally {
this.setBusy(false)
}
}
relays () {
return Array.from(this.listTarget.querySelectorAll("li")).map((row) => {
const input = row.querySelector("input[name='relay_urls[]']")
const select = row.querySelector("select[name='relay_markers[]']")
return {
url: input ? input.value.trim() : "",
marker: select ? select.value : ""
}
}).filter((relay) => relay.url.length > 0)
}
setBusy (busy) {
if (!this.hasSubmitTarget) return
if (busy) {
this.submitTarget.dataset.originalValue = this.submitTarget.value
this.submitTarget.disabled = true
this.submitTarget.value = "Saving…"
} else {
this.submitTarget.disabled = false
this.submitTarget.value = this.submitTarget.dataset.originalValue || this.submitTarget.value
}
}
showError (message) {
if (!this.hasErrorTarget) return
this.errorTarget.textContent = message
this.errorTarget.classList.remove("hidden")
}
clearError () {
if (!this.hasErrorTarget) return
this.errorTarget.textContent = ""
this.errorTarget.classList.add("hidden")
}
}
@@ -1,11 +1,17 @@
import { Controller } from "@hotwired/stimulus"
import { signAndPublish, hasNostrExtension } from "lib/nostr_publish"
const MEDIA_SERVER_LIST_KIND = 10063
const SERVER_URL_PATTERN = /^https?:\/\/.+/i
import { updateAddedBadge } from "lib/added_badge"
export default class extends Controller {
static targets = [ "list", "template", "addedBadge", "error", "submit" ]
static values = {
kind: Number,
tag: String,
markers: Boolean,
pattern: String,
emptyMessage: String,
invalidMessage: String
}
add (event) {
event.preventDefault()
@@ -22,39 +28,24 @@ export default class extends Controller {
checkAdded (event) {
const input = event.target
const addedValue = input.dataset.addedValue
if (!addedValue) return
const badge = input.closest(".relative")
?.querySelector("[data-url-list-editor-target='addedBadge']")
const container = input.closest(".relative")
const badge = container?.querySelector("[data-media-server-list-editor-target='addedBadge']")
const addedClasses = [
"border-emerald-500", "ring-1", "ring-emerald-500",
"focus:border-emerald-500", "focus:ring-emerald-500",
"bg-emerald-50/20"
]
if (input.value.trim() === addedValue.trim()) {
input.classList.add(...addedClasses)
if (badge) badge.classList.remove("hidden")
} else {
input.classList.remove(...addedClasses)
if (badge) badge.classList.add("hidden")
}
updateAddedBadge(input, badge, input.dataset.addedValue)
}
async save (event) {
event.preventDefault()
this.clearError()
const servers = this.servers()
const rows = this.rows()
if (servers.length === 0) {
this.showError("Please add at least one media server.")
if (rows.length === 0) {
this.showError(this.emptyMessageValue || "Please add at least one entry.")
return
}
if (!servers.every((url) => SERVER_URL_PATTERN.test(url))) {
this.showError("Media server URLs must start with http:// or https://.")
if (this.patternValue && !rows.every((row) => this.valid(row.url))) {
this.showError(this.invalidMessageValue || "Please check the URLs.")
return
}
if (!hasNostrExtension()) {
@@ -66,14 +57,14 @@ export default class extends Controller {
try {
const signedEvent = await signAndPublish({
kind: MEDIA_SERVER_LIST_KIND,
kind: this.kindValue,
created_at: Math.floor(Date.now() / 1000),
tags: servers.map((url) => ["server", url]),
tags: rows.map((row) => this.tag(row)),
content: ""
})
this.element.dispatchEvent(new CustomEvent("nostr:publish", {
bubbles: true,
detail: { kind: MEDIA_SERVER_LIST_KIND, eventId: signedEvent.id }
detail: { kind: this.kindValue, eventId: signedEvent.id }
}))
} catch (error) {
this.showError(error.message)
@@ -82,13 +73,44 @@ export default class extends Controller {
}
}
servers () {
rows () {
const seen = new Set()
return Array.from(this.listTarget.querySelectorAll("li"))
.map((row) => {
const input = row.querySelector("input[name='server_urls[]']")
return input ? input.value.trim() : ""
const input = row.querySelector("input[name$='_urls[]']")
const select = row.querySelector("select[name$='_markers[]']")
return {
url: input ? input.value.trim() : "",
marker: select ? select.value : ""
}
})
.filter((url) => url.length > 0)
.filter((row) => {
if (row.url.length === 0) return false
const key = this.normalize(row.url)
if (seen.has(key)) return false
seen.add(key)
return true
})
}
tag (row) {
if (this.markersValue && row.marker) {
return [this.tagValue, row.url, row.marker]
}
return [this.tagValue, row.url]
}
valid (url) {
return new RegExp(this.patternValue, "i").test(url)
}
normalize (url) {
return url.replace(/\/+$/, "").toLowerCase()
}
setBusy (busy) {
+30
View File
@@ -0,0 +1,30 @@
export const ADDED_CLASSES = [
"border-emerald-500", "ring-1", "ring-emerald-500",
"focus:border-emerald-500", "focus:ring-emerald-500",
"bg-emerald-50/20"
]
export function isAdded (input, addedValue) {
return Boolean(addedValue) && input.value.trim() === addedValue.trim()
}
export function setAddedClasses (input, added) {
if (added) {
input.classList.add(...ADDED_CLASSES)
} else {
input.classList.remove(...ADDED_CLASSES)
}
}
export function updateAddedBadge (input, badge, addedValue) {
if (!addedValue) return false
const added = isAdded(input, addedValue)
setAddedClasses(input, added)
if (badge) {
badge.classList.toggle("hidden", !added)
}
return added
}
+4
View File
@@ -17,6 +17,10 @@ class NostrManagerService < ApplicationService
METADATA_CACHE_SUFFIXES.map { |suffix| metadata_cache_key(user_id, suffix) }
end
def self.normalize_url(url)
url.to_s.strip.chomp("/").downcase
end
def parse_tags(tags)
out = {}
# TODO support more than 1 item for each tag type
+6
View File
@@ -96,6 +96,12 @@
<div class="mb-4 h-12 w-12"></div>
<p data-nostr-metadata-target="status"
class="text-gray-500 animate-pulse">Loading…</p>
<button type="button"
data-nostr-metadata-target="retry"
data-action="click->nostr-metadata#retry"
class="btn-md btn-blue mt-4 hidden">
Try again
</button>
</div>
<div data-nostr-metadata-target="content" class="hidden"></div>
</div>
@@ -11,18 +11,22 @@ RSpec.describe Settings::NostrEditMediaServersComponent, type: :component do
rendered = render_inline(described_class.new(media_list_event: nil))
form = rendered.css("form").first
expect(form["data-controller"]).to eq("media-server-list-editor")
expect(form["data-action"]).to include("submit->media-server-list-editor#save")
expect(form["data-controller"]).to eq("url-list-editor")
expect(form["data-action"]).to include("submit->url-list-editor#save")
expect(form["data-url-list-editor-kind-value"]).to eq("10063")
expect(form["data-url-list-editor-tag-value"]).to eq("server")
expect(form["data-url-list-editor-markers-value"]).to eq("false")
expect(form["data-url-list-editor-pattern-value"]).to eq("^https?://")
expect(rendered.css("[data-media-server-list-editor-target='error']")).to be_present
expect(rendered.css("[data-media-server-list-editor-target='submit']")).to be_present
expect(rendered.css("[data-url-list-editor-target='error']")).to be_present
expect(rendered.css("[data-url-list-editor-target='submit']")).to be_present
end
describe "when user has no media server list" do
it "prepends the site media server marked as added" do
rendered = render_inline(described_class.new(media_list_event: nil))
list = rendered.css("[data-media-server-list-editor-target='list']").first
list = rendered.css("[data-url-list-editor-target='list']").first
inputs = list.css("input[name='server_urls[]']").map { |el| el["value"] }
expect(inputs).to eq(["https://blossom.example.com"])
@@ -42,7 +46,7 @@ RSpec.describe Settings::NostrEditMediaServersComponent, type: :component do
it "prepends the site server as added, preserving existing servers" do
rendered = render_inline(described_class.new(media_list_event: media_list_event))
list = rendered.css("[data-media-server-list-editor-target='list']").first
list = rendered.css("[data-url-list-editor-target='list']").first
inputs = list.css("input[name='server_urls[]']").map { |el| el["value"] }
expect(inputs).to eq(["https://blossom.example.com", "https://cdn.example.com"])
@@ -76,7 +80,7 @@ RSpec.describe Settings::NostrEditMediaServersComponent, type: :component do
it "renders an empty list" do
rendered = render_inline(described_class.new(media_list_event: nil))
list = rendered.css("[data-media-server-list-editor-target='list']").first
list = rendered.css("[data-url-list-editor-target='list']").first
expect(list.css("input[name='server_urls[]']")).to be_empty
end
end
@@ -15,18 +15,22 @@ RSpec.describe Settings::NostrEditRelaysComponent, type: :component do
rendered = render_inline(described_class.new(nip65_event: nil))
form = rendered.css("form").first
expect(form["data-controller"]).to eq("relay-list-editor")
expect(form["data-action"]).to include("submit->relay-list-editor#save")
expect(form["data-controller"]).to eq("url-list-editor")
expect(form["data-action"]).to include("submit->url-list-editor#save")
expect(form["data-url-list-editor-kind-value"]).to eq("10002")
expect(form["data-url-list-editor-tag-value"]).to eq("r")
expect(form["data-url-list-editor-markers-value"]).to eq("true")
expect(form["data-url-list-editor-pattern-value"]).to eq("^wss?://")
expect(rendered.css("[data-relay-list-editor-target='error']")).to be_present
expect(rendered.css("[data-relay-list-editor-target='submit']")).to be_present
expect(rendered.css("[data-url-list-editor-target='error']")).to be_present
expect(rendered.css("[data-url-list-editor-target='submit']")).to be_present
end
describe "when user has no relay list (nip65_event is nil)" do
it "prepends the site relay as added and suggests discovery relays without a badge" do
rendered = render_inline(described_class.new(nip65_event: nil))
list = rendered.css("[data-relay-list-editor-target='list']").first
list = rendered.css("[data-url-list-editor-target='list']").first
relay_inputs = list.css("input[name='relay_urls[]']").map { |el| el["value"] }
expect(relay_inputs).to eq([
"wss://nostr.kosmos.org",
@@ -69,7 +73,7 @@ RSpec.describe Settings::NostrEditRelaysComponent, type: :component do
site_input = rendered.css("input[value='wss://nostr.kosmos.org']").first
expect(site_input["class"]).to include("border-emerald-500")
expect(site_input["data-added-value"]).to eq("wss://nostr.kosmos.org")
expect(site_input["data-action"]).to include("input->relay-list-editor#checkAdded")
expect(site_input["data-action"]).to include("input->url-list-editor#checkAdded")
other_input = rendered.css("input[value='wss://nos.lol']").first
expect(other_input["class"]).not_to include("border-emerald-500")
@@ -40,4 +40,14 @@ RSpec.describe Settings::NostrMediaServerStatusComponent, type: :component do
expect(rendered.text).to include("is missing from your media server list")
end
end
describe "with a normalized variant of the site server in the list" do
let(:media_list_event) { { "tags" => [["server", "HTTPS://Blossom.Example.com/"]] } }
it "still reports it as part of the list" do
rendered = render_status(media_list_event: media_list_event)
expect(rendered.text).to include("is part of your list")
end
end
end
@@ -0,0 +1,51 @@
# frozen_string_literal: true
require "rails_helper"
RSpec.describe Settings::NostrRelayStatusComponent, type: :component do
let(:relay_url) { "wss://nostr.kosmos.org" }
def render_status(nip65_event:)
render_inline(described_class.new(nip65_event: nip65_event, relay_url: relay_url))
end
describe "without a relay list" do
it "reports that no list was found and offers setup" do
rendered = render_status(nip65_event: nil)
expect(rendered.text).to include("We could not find a relay list")
expect(rendered.text).to include("Set up relays")
end
end
describe "with the site relay in the list" do
let(:nip65_event) { { "tags" => [["r", relay_url]] } }
it "reports that the site relay is part of the list" do
rendered = render_status(nip65_event: nip65_event)
expect(rendered.text).to include("is part of your relay list")
expect(rendered.text).to include("Edit relays")
end
end
describe "without the site relay in the list" do
let(:nip65_event) { { "tags" => [["r", "wss://other.example.com"]] } }
it "reports that the site relay is missing" do
rendered = render_status(nip65_event: nip65_event)
expect(rendered.text).to include("is missing from your relay list")
end
end
describe "with a normalized variant of the site relay in the list" do
let(:nip65_event) { { "tags" => [["r", "WSS://Nostr.Kosmos.org/"]] } }
it "still reports it as part of the list" do
rendered = render_status(nip65_event: nip65_event)
expect(rendered.text).to include("is part of your relay list")
end
end
end