Merge branch 'master' into live

app/controllers/webfinger_controller.rb

@@ -74,7 +74,7 @@ class WebfingerController < WellKnownController
   end
 
   def remotestorage_link
-    auth_url = new_rs_oauth_url(@username, host: Setting.accounts_domain)
+    auth_url = new_rs_oauth_url(@username)
     storage_url = "#{Setting.rs_storage_url}/#{@username}"
 
     {

app/javascript/controllers/settings/nostr_pubkey_controller.js

@@ -1,14 +1,8 @@
 import { Controller } from "@hotwired/stimulus"
-import { Nostrify } from "nostrify"
 
 // Connects to data-controller="settings--nostr-pubkey"
 export default class extends Controller {
-  static targets = [
+  static targets = [ "noExtension", "setPubkey", "pubkeyBech32Input" ]
-    "noExtension",
-    "setPubkey", "pubkeyBech32Input",
-    "relayList", "relayListStatus",
-    "profileStatusNip05", "profileStatusLud16"
-  ]
   static values  = {
     userAddress: String,
     pubkeyHex: String,
@@ -21,14 +15,6 @@ export default class extends Controller {
       if (this.hasSetPubkeyTarget) {
         this.setPubkeyTarget.disabled = false
       }
-
-      if (this.pubkeyHexValue) {
-        this.discoverUserOnNostr().then(() => {
-          this.renderRelayStatus()
-          this.renderProfileNip05Status()
-          this.renderProfileLud16Status()
-        })
-      }
     } else {
       this.noExtensionTarget.classList.remove("hidden")
     }
@@ -63,172 +49,8 @@ export default class extends Controller {
     }
   }
 
-  async discoverUserOnNostr () {
-    this.nip65Relays = await this.findUserRelays()
-    this.profile = await this.findUserProfile()
-  }
-
-  async findUserRelays () {
-    const controller = new AbortController();
-    const signal = controller.signal;
-    const filters = [{ kinds: [10002], authors: [this.pubkeyHexValue], limit: 1 }]
-    const messages = []
-
-    for await (const msg of this.discoveryPool.req(filters, { signal })) {
-      if (msg[0] === 'EVENT') {
-        if (!messages.find(m => m.id === msg[2].id)) {
-          messages.push(msg[2])
-        }
-      }
-      if (msg[0] === 'EOSE') { break }
-    }
-
-    // Close the relay subscription
-    controller.abort()
-    if (messages.length === 0) { return messages }
-
-    const sortedMessages = messages.sort((a, b) => a.createdAt - b.createdAt)
-    const newestMessage = messages[messages.length - 1]
-
-    return newestMessage.tags.filter(t => t[0] === 'r')
-                             .map(t => { return { url: t[1], marker: t[2] } })
-  }
-
-  async findUserProfile () {
-    const controller = new AbortController();
-    const signal = controller.signal;
-    const filters = [{ kinds: [0], authors: [this.pubkeyHexValue], limit: 1 }]
-    const messages = []
-
-    for await (const msg of this.discoveryPool.req(filters, { signal })) {
-      if (msg[0] === 'EVENT') {
-        if (!messages.find(m => m.id === msg[2].id)) {
-          messages.push(msg[2])
-        }
-      }
-      if (msg[0] === 'EOSE') { break }
-    }
-
-    // Close the relay subscription
-    controller.abort()
-    if (messages.length === 0) { return null }
-
-    const sortedMessages = messages.sort((a, b) => a.createdAt - b.createdAt)
-    const newestMessage = messages[messages.length - 1]
-
-    return JSON.parse(newestMessage.content)
-  }
-
-  renderRelayStatus () {
-    let showStatus
-
-    if (this.nip65Relays.length > 0) {
-      if (this.relaysContainAccountsRelay) {
-        showStatus = 'green'
-      } else {
-        showStatus = 'orange'
-      }
-    } else {
-      showStatus = 'red'
-    }
-    // showStatus = 'red'
-
-    this.relayListStatusTarget
-      .querySelector(`.status-${showStatus}`)
-      .classList.remove("hidden")
-  }
-
-  renderProfileNip05Status () {
-    let showStatus
-
-    if (this.profile?.nip05) {
-      if (this.profile.nip05 === this.userAddressValue) {
-        showStatus = 'green'
-      } else {
-        showStatus = 'red'
-      }
-    } else {
-      showStatus = 'orange'
-    }
-
-    this.profileStatusNip05Target
-      .querySelector(`.status-${showStatus}`)
-      .classList.remove("hidden")
-  }
-
-  renderProfileLud16Status () {
-    let showStatus
-
-    if (this.profile?.lud16) {
-      if (this.profile.lud16 === this.userAddressValue) {
-        showStatus = 'green'
-      } else {
-        showStatus = 'red'
-      }
-    } else {
-      showStatus = 'orange'
-    }
-
-    this.profileStatusLud16Target
-      .querySelector(`.status-${showStatus}`)
-      .classList.remove("hidden")
-  }
-
-  // renderRelayList (relays) {
-  //   const html = relays.map(relay => `
-  //     <li class="flex items-center justify-between p-2 border-b">
-  //       <span>${relay.url}</span>
-  //       <button 
-  //         data-action="click->list#handleItemClick" 
-  //         data-item="${relay.url}"
-  //         class="bg-blue-500 text-white px-3 py-1 rounded">
-  //         Action
-  //       </button>
-  //     </li>
-  //   `).join("")
-  //
-  //   this.relayListTarget.innerHTML = html
-  // }
-
   get csrfToken () {
     const element = document.head.querySelector('meta[name="csrf-token"]')
     return element.getAttribute("content")
   }
-
-  // Used to find a user's profile and relays
-  get discoveryRelays () {
-    return [
-      'ws://localhost:4777',
-      'wss://nostr.kosmos.org',
-      'wss://purplepag.es',
-      // 'wss://relay.nostr.band',
-      // 'wss://njump.me',
-      // 'wss://relay.damus.io',
-      // 'wss://nos.lol',
-      // 'wss://eden.nostr.land',
-      // 'wss://relay.snort.social',
-      // 'wss://nostr.wine',
-      // 'wss://relay.primal.net',
-      // 'wss://nostr.bitcoiner.social',
-    ]
-  }
-
-  get discoveryPool () {
-    if (!this._discoveryPool) {
-      this._discoveryPool = new Nostrify.NPool({
-        open: (url) => new Nostrify.NRelay1(url),
-        reqRouter: async (filters) => new Map(
-          this.discoveryRelays.map(relayUrl => [ relayUrl, filters ])
-        ),
-        eventRouter: async (event) => [],
-      })
-    }
-
-    return this._discoveryPool
-  }
-
-  get relaysContainAccountsRelay () {
-    // TODO use URL from view/settings
-    return !!this.nip65Relays.find(r => r.url.match('wss://nostr.kosmos.org'))
-  }
 }

app/views/admin/users/show.html.erb

@@ -184,7 +184,7 @@
           <td>XMPP (ejabberd)</td>
           <td>
             <%= render FormElements::ToggleComponent.new(
-              enabled: @services_enabled.include?("ejabberd"),
+              enabled: @services_enabled.include?("xmpp"),
               input_enabled: false
             ) %>
           </td>
@@ -205,7 +205,9 @@
             ) %>
           </td>
           <td class="text-right">
+            <% if @user.nostr_pubkey.present? %>
             <%= link_to "Open profile", "https://njump.me/#{@user.nostr_pubkey_bech32}", class: "btn-sm btn-gray" %>
+            <% end %>
           </td>
         </tr>
         <% end %>

app/views/settings/_nostr.html.erb

@@ -1,32 +1,46 @@
-<div data-controller="settings--nostr-pubkey"
+<section>
-     data-settings--nostr-pubkey-user-address-value="<%= current_user.address %>"
+  <h3>Nostr</h3>
-     data-settings--nostr-pubkey-site-value="<%= Setting.accounts_domain %>"
+  <h4 class="mb-0">Public Key</h4>
-     data-settings--nostr-pubkey-shared-secret-value="<%= session[:shared_secret] %>"
+  <div data-controller="settings--nostr-pubkey"
-     data-settings--nostr-pubkey-pubkey-hex-value="<%= current_user.nostr_pubkey %>">
+       data-settings--nostr-pubkey-user-address-value="<%= current_user.address %>"
-  <section>
+       data-settings--nostr-pubkey-site-value="<%= Setting.accounts_domain %>"
-    <h3>Nostr</h3>
+       data-settings--nostr-pubkey-shared-secret-value="<%= session[:shared_secret] %>"
-    <h4 class="mb-0">
+       data-settings--nostr-pubkey-pubkey-hex-value="<%= current_user.nostr_pubkey %>">
-      Public Key
+
-    </h4>
+    <p class="<%= current_user.nostr_pubkey.present? ? '' : 'hidden' %> mt-2 flex gap-1">
-    <p class="<%= current_user.nostr_pubkey.present? ? '' : 'hidden' %> mt-2 flex gap-x-1">
       <input type="text" value="<%= current_user.nostr_pubkey_bech32 %>" disabled
              data-settings--nostr-pubkey-target="pubkeyBech32Input"
-             name="nostr_public_key" class="w-full" />
+             name="nostr_public_key" class="relative grow" />
       <%= link_to nostr_pubkey_settings_path,
-            class: 'btn-md btn-outline relative grow-0 shrink-0 text-red-700',
+            class: 'btn-md btn-outline text-red-700 relative shrink-0',
             data: { turbo_method: :delete, turbo_confirm: 'Are you sure?' } do %>
         Remove
       <% end %>
     </p>
 
     <% if current_user.nostr_pubkey.present? %>
-    <!-- <div> -->
+    <div class="rounded-md bg-blue-50 p-4">
-    <!--   Pubkey present -->
+      <div class="flex">
-    <!-- </div> -->
+        <div class="flex-shrink-0">
+          <svg class="h-5 w-5 text-blue-400" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+            <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a.75.75 0 000 1.5h.253a.25.25 0 01.244.304l-.459 2.066A1.75 1.75 0 0010.747 15H11a.75.75 0 000-1.5h-.253a.25.25 0 01-.244-.304l.459-2.066A1.75 1.75 0 009.253 9H9z" clip-rule="evenodd" />
+          </svg>
+        </div>
+        <div class="ml-3 flex-1">
+          <p class="text-sm text-blue-800">
+            Your user address <strong><%= current_user.address %></strong> is
+            also a Nostr address now. Use your favorite Nostr app, or for
+            example <a href="http://metadata.nostr.com" target="_blank"
+              class="underline">metadata.nostr.com</a>, to add this
+            <strong>NIP-05</strong> address to your public profile.
+          </p>
+        </div>
+      </div>
+    </div>
     <% else %>
     <p class="my-4">
-      Verify your Nostr public key with us in order to enable Nostr-specific
+      If you use any apps on the Nostr network, you can verify your public key
-      features for your account.
+      with us in order to enable Nostr-specific features for your account.
     </p>
     <% end %>
 
@@ -44,8 +58,8 @@
           </h3>
           <div class="mt-2 mb-0 text-sm text-blue-800">
             <p>
-              We recommend Alby, which you can also use a wallet for your
+              We recommend Alby, which you can also use for your Lightning
-              Lightning account.
+              Wallet.
             </p>
           </div>
           <div class="mt-4">
@@ -72,113 +86,5 @@
       </button>
     </p>
     <% end %>
-  </section>
+  </div>
-
+</section>
-  <% if current_user.nostr_pubkey.present? %>
-    <section>
-      <h3>Profile</h3>
-      <div data-settings--nostr-pubkey-target="profileStatus" class="mb-4">
-        <p class="status-green hidden flex gap-x-4 items-center">
-          <span class="inline-block h-6 w-6 grow-0 text-emerald-500 %>">
-            <%= render "icons/check-circle" %>
-          </span>
-          <span>
-            You already have a profile for your public key
-          </span>
-        </p>
-        <p class="status-orange hidden flex gap-x-4 items-center">
-          <span class="inline-block h-6 w-6 grow-0 text-amber-500 %>">
-            <%= render "icons/alert-octagon" %>
-          </span>
-          <span>
-            <strong><%= current_user.address %></strong> is not set as your Nostr address
-          </span>
-        </p>
-      </div>
-      <div data-settings--nostr-pubkey-target="profileStatusNip05" class="mb-4">
-        <p class="status-green hidden flex gap-x-4 items-center">
-          <span class="inline-block h-6 w-6 grow-0 text-emerald-500 %>">
-            <%= render "icons/check-circle" %>
-          </span>
-          <span>
-            <strong><%= current_user.address %></strong> is set as your Nostr address
-          </span>
-        </p>
-        <p class="status-orange hidden flex gap-x-4 items-center">
-          <span class="inline-block h-6 w-6 grow-0 text-amber-500 %>">
-            <%= render "icons/alert-octagon" %>
-          </span>
-          <span>
-            <strong><%= current_user.address %></strong> is not set as your Nostr address
-          </span>
-        </p>
-        <p class="status-red hidden flex gap-x-4 items-center">
-          <span class="inline-block h-6 w-6 grow-0 text-amber-500 %>">
-            <%= render "icons/alert-octagon" %>
-          </span>
-          <span>
-            Your profile's Nostr address is not set to <strong><%= current_user.address %></strong> yet
-          </span>
-        </p>
-      </div>
-      <div data-settings--nostr-pubkey-target="profileStatusLud16">
-        <p class="status-green hidden flex gap-x-4 items-center">
-          <span class="inline-block h-6 w-6 grow-0 text-emerald-500 %>">
-            <%= render "icons/check-circle" %>
-          </span>
-          <span>
-            <strong><%= current_user.address %></strong> is set as your Lightning address
-          </span>
-        </p>
-        <p class="status-orange hidden flex gap-x-4 items-center">
-          <span class="inline-block h-6 w-6 grow-0 text-amber-500 %>">
-            <%= render "icons/alert-octagon" %>
-          </span>
-          <span>
-            <strong><%= current_user.address %></strong> is not set as your Lightning address yet
-          </span>
-        </p>
-        <p class="status-red hidden flex gap-x-4 items-center">
-          <span class="inline-block h-6 w-6 grow-0 text-amber-500 %>">
-            <%= render "icons/alert-octagon" %>
-          </span>
-          <span>
-            Your profile's Lightning address is not set to <strong><%= current_user.address %></strong> yet
-          </span>
-        </p>
-      </div>
-    </section>
-
-    <section>
-      <h3>Relays</h3>
-      <div data-settings--nostr-pubkey-target="relayListStatus">
-        <p class="status-green hidden flex gap-x-4 items-center">
-          <span class="inline-block h-6 w-6 grow-0 text-emerald-500 %>">
-            <%= render "icons/check-circle" %>
-          </span>
-          <span>
-            You have a relay list, and the Kosmos relay is part of it
-          </span>
-        </p>
-        <p class="status-orange hidden flex gap-x-4 items-center">
-          <span class="inline-block h-6 w-6 grow-0 text-amber-500 %>">
-            <%= render "icons/alert-octagon" %>
-          </span>
-          <span>
-            The Kosmos relay is missing from your relay list
-          </span>
-        </p>
-        <p class="status-red hidden flex gap-x-4 items-center">
-          <span class="inline-block h-6 w-6 grow-0 text-amber-500 %>">
-            <%= render "icons/alert-octagon" %>
-          </span>
-          <span>
-            We could not find a relay list for your public key
-          </span>
-        </p>
-      </div>
-      <ul data-settings--nostr-pubkey-target="relayList">
-      </ul>
-    </section>
-  <% end %>
-</div>

config/importmap.rb

@@ -6,4 +6,3 @@ pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
 pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
 pin_all_from "app/javascript/controllers", under: "controllers"
 pin "tailwindcss-stimulus-components" # @4.0.3
-pin "nostrify"

config/sidekiq.yml

@@ -1,4 +1,6 @@
 :concurrency: 2
+production:
+  :concurrency: 10
 :queues:
   - default
   - mailers

package.json

@@ -11,7 +11,7 @@
     "postcss-preset-env": "^7.8.3",
     "tailwindcss": "^3.2.4"
   },
-  "version": "0.10.0",
+  "version": "0.9.0",
   "scripts": {
     "build:css:tailwind": "tailwindcss --postcss -i ./app/assets/stylesheets/application.tailwind.css -o ./app/assets/builds/application.css",
     "build:css": "yarn run build:css:tailwind"

spec/requests/webfinger_spec.rb

@@ -92,7 +92,7 @@ RSpec.describe "WebFinger", type: :request do
           expect(rs_link["href"]).to eql("#{Setting.rs_storage_url}/tony")
 
           oauth_url = rs_link["properties"]["http://tools.ietf.org/html/rfc6749#section-4.2"]
-          expect(oauth_url).to eql("http://accounts.kosmos.org/rs/oauth/tony")
+          expect(oauth_url).to eql("http://www.example.com/rs/oauth/tony")
         end
 
         it "returns CORS headers" do