Merge pull request 'Avoid duplicate site entries in Nostr list editors' (#271) from bugfix/nostr_relay_list_editing into master
CI / Test (push) Successful in 46s

Reviewed-on: #271
This commit was merged in pull request #271.
This commit is contained in:
raucao committed 2026-11-19 11:51:25 +00:00
commit b6320b80f6
4 files changed
+52 -4

No files matched your search

@@ -11,6 +11,7 @@ module Settings
def build_servers
site_server = Setting.nostr_blossom_server_url
normalized_site_server = NostrManagerService.normalize_url(site_server)
if @media_list_event.blank?
return [] if site_server.blank?
@@ -21,7 +22,7 @@ module Settings
.select { |t| t.is_a?(Array) && t[0] == "server" }
.map { |t| { url: t[1], added: false } }
if site_server.present? && existing.none? { |s| s[:url] == site_server }
if site_server.present? && existing.none? { |s| NostrManagerService.normalize_url(s[:url]) == normalized_site_server }
existing.unshift({ url: site_server, added: true })
end
existing
@@ -11,20 +11,21 @@ module Settings
def build_relays
site_relay = Setting.nostr_relay_url
normalized_site_relay = NostrManagerService.normalize_url(site_relay)
if @nip65_event.blank?
relays = Setting.nostr_discovery_relays.map { |url| { url: url, marker: nil, added: false } }
if site_relay.present?
relays.reject! { |r| r[:url] == site_relay }
relays.reject! { |r| NostrManagerService.normalize_url(r[:url]) == normalized_site_relay }
relays.unshift({ url: site_relay, marker: nil, added: true })
end
relays
else
existing = @nip65_event["tags"]
.select { |t| t[0] == "r" }
.select { |t| t.is_a?(Array) && t[0] == "r" }
.map { |t| { url: t[1], marker: t[2], added: false } }
if site_relay.present? && existing.none? { |r| r[:url] == site_relay }
if site_relay.present? && existing.none? { |r| NostrManagerService.normalize_url(r[:url]) == normalized_site_relay }
existing.unshift({ url: site_relay, marker: nil, added: true })
end
existing
@@ -74,6 +74,29 @@ RSpec.describe Settings::NostrEditMediaServersComponent, type: :component do
end
end
describe "when the site server is present only as a normalized variant" do
let(:media_list_event) do
{
"kind" => 10063,
"tags" => [
["server", "https://blossom.example.com/"],
["server", "https://cdn.example.com"]
]
}
end
it "does not add a duplicate and renders no added badges" do
rendered = render_inline(described_class.new(media_list_event: media_list_event))
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"])
badges = rendered.css("span.rounded-full").select { |el| el.text.strip == "added" }
expect(badges).to be_empty
end
end
describe "when no site media server is configured" do
before { allow(Setting).to receive(:nostr_blossom_server_url).and_return(nil) }
@@ -102,4 +102,27 @@ RSpec.describe Settings::NostrEditRelaysComponent, type: :component do
expect(badges).to be_empty
end
end
describe "when the site relay is present only as a normalized variant" do
let(:nip65_event) do
{
"kind" => 10002,
"tags" => [
["r", "WSS://Nostr.Kosmos.org/"],
["r", "wss://nos.lol"]
]
}
end
it "does not add a duplicate and renders no added badges" do
rendered = render_inline(described_class.new(nip65_event: nip65_event))
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/", "wss://nos.lol"])
badges = rendered.css("span.rounded-full").select { |el| el.text.strip == "added" }
expect(badges).to be_empty
end
end
end