From b91d90d75cbaa183bf94497d63d8dbe31bf7518d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 14 Aug 2024 13:36:15 +0200 Subject: [PATCH] Fix some specs, improve config Allow empty string to unset nostr relay URL config --- app/controllers/well_known_controller.rb | 2 +- spec/requests/well_known_spec.rb | 4 ++++ spec/services/nostr_manager/publish_zap_receipt_spec.rb | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/well_known_controller.rb b/app/controllers/well_known_controller.rb index b028562..72443be 100644 --- a/app/controllers/well_known_controller.rb +++ b/app/controllers/well_known_controller.rb @@ -4,7 +4,7 @@ class WellKnownController < ApplicationController def nostr http_status :unprocessable_entity and return if params[:name].blank? domain = request.headers["X-Forwarded-Host"].presence || Setting.primary_domain - relay_url = Setting.nostr_relay_url + relay_url = Setting.nostr_relay_url.presence if params[:name] == "_" # pubkey for the primary domain without a username (e.g. kosmos.org) diff --git a/spec/requests/well_known_spec.rb b/spec/requests/well_known_spec.rb index 989ed00..97c617f 100644 --- a/spec/requests/well_known_spec.rb +++ b/spec/requests/well_known_spec.rb @@ -47,6 +47,10 @@ RSpec.describe "Well-known URLs", type: :request do end context "without relay configured" do + before do + Setting.nostr_relay_url = "" + end + it "does not include a recommended relay" do get "/.well-known/nostr.json?name=bobdylan" res = JSON.parse(response.body) diff --git a/spec/services/nostr_manager/publish_zap_receipt_spec.rb b/spec/services/nostr_manager/publish_zap_receipt_spec.rb index 5136af9..02885bb 100644 --- a/spec/services/nostr_manager/publish_zap_receipt_spec.rb +++ b/spec/services/nostr_manager/publish_zap_receipt_spec.rb @@ -4,6 +4,10 @@ RSpec.describe NostrManager::PublishZapReceipt, type: :model do let(:user) { create :user, ln_account: "123456abcdef" } let(:zap) { create :zap, user: user } + before do + Setting.nostr_relay_url = "" + end + describe "Default/delayed execution" do it "publishes zap receipts to all requested relays" do expect(NostrPublishEventJob).to receive(:perform_later)