Send email confirmation when BTC payment is confirmed

Implement bitcoin donations via BTCPay
Allow other controllers to access lndhub user balance
2024-02-22 15:20:17 +01:00 · 2024-02-22 15:19:27 +01:00 · 2024-02-22 15:19:27 +01:00 · 2024-02-22 15:19:27 +01:00 · 2024-02-22 15:19:27 +01:00
146 changed files with 512 additions and 3348 deletions
--- a/.env.example
+++ b/.env.example
@@ -1,14 +1,14 @@
-# PRIMARY_DOMAIN=kosmos.org
-# AKKOUNTS_DOMAIN=accounts.example.com
+PRIMARY_DOMAIN=kosmos.org
+AKKOUNTS_DOMAIN=accounts.example.com

-# SMTP_SERVER=smtp.example.com
-# SMTP_PORT=587
-# SMTP_LOGIN=accounts
-# SMTP_PASSWORD=123abc
-# SMTP_FROM_ADDRESS=accounts@example.com
-# SMTP_DOMAIN=example.com
-# SMTP_AUTH_METHOD=plain
-# SMTP_ENABLE_STARTTLS=auto
+SMTP_SERVER=smtp.example.com
+SMTP_PORT=587
+SMTP_LOGIN=accounts
+SMTP_PASSWORD=123abc
+SMTP_FROM_ADDRESS=accounts@example.com
+SMTP_DOMAIN=example.com
+SMTP_AUTH_METHOD=plain
+SMTP_ENABLE_STARTTLS=auto

 # S3_ENABLED=true
 # S3_ENDPOINT=https://s3.kosmos.org
@@ -18,54 +18,48 @@
 # S3_ACCESS_KEY=123456abcdefg
 # S3_SECRET_KEY=123456789123456789123456789

-# LDAP_HOST=localhost
-# LDAP_PORT=389
-# LDAP_ADMIN_PASSWORD=passthebutter
-# LDAP_SUFFIX='dc=kosmos,dc=org'
+LDAP_HOST=localhost
+LDAP_PORT=389
+LDAP_ADMIN_PASSWORD=passthebutter
+LDAP_SUFFIX='dc=kosmos,dc=org'

-# REDIS_URL='redis://localhost:6379/1'
+REDIS_URL='redis://localhost:6379/1'

-# WEBHOOKS_ALLOWED_IPS='10.1.1.163'
+WEBHOOKS_ALLOWED_IPS='10.1.1.163'

 #
 # Service Integrations
-# (sorted alphabetically by service name)
 #

-# BTCPAY_PUBLIC_URL='https://btcpay.example.com'
-# BTCPAY_API_URL='http://localhost:23001/api/v1'
-# BTCPAY_STORE_ID=''
-# BTCPAY_AUTH_TOKEN=''
+BTCPAY_PUBLIC_URL='https://btcpay.example.com'
+BTCPAY_API_URL='http://localhost:23001/api/v1'
+BTCPAY_STORE_ID=''
+BTCPAY_AUTH_TOKEN=''

-# DISCOURSE_PUBLIC_URL='https://community.kosmos.org'
-# DISCOURSE_CONNECT_SECRET='discourse_connect_ftw'
+DISCOURSE_PUBLIC_URL='https://community.kosmos.org'
+DISCOURSE_CONNECT_SECRET='discourse_connect_ftw'

-# DRONECI_PUBLIC_URL='https://drone.kosmos.org'
+DRONECI_PUBLIC_URL='https://drone.kosmos.org'

-# EJABBERD_ADMIN_URL='https://xmpp.kosmos.org/admin'
-# EJABBERD_API_URL='https://xmpp.kosmos.org/api'
+EJABBERD_ADMIN_URL='https://xmpp.kosmos.org/admin'
+EJABBERD_API_URL='https://xmpp.kosmos.org/api'

-# GITEA_PUBLIC_URL='https://gitea.kosmos.org'
+GITEA_PUBLIC_URL='https://gitea.kosmos.org'

-# LNDHUB_API_URL='http://localhost:3023'
-# LNDHUB_PUBLIC_URL='https://lndhub.kosmos.org'
-# LNDHUB_PUBLIC_KEY='0123d3be18617f39cf645851e3ba63f51fc13f0bb09e3bb25e6fd4de556486d946'
-# LNDHUB_ADMIN_UI=true
-# LNDHUB_ADMIN_TOKEN=123456789
-# LNDHUB_PG_HOST=localhost
-# LNDHUB_PG_PORT=5432
-# LNDHUB_PG_DATABASE=lndhub
-# LNDHUB_PG_USERNAME=lndhub
-# LNDHUB_PG_PASSWORD=''
+LNDHUB_API_URL='http://localhost:3023'
+LNDHUB_PUBLIC_URL='https://lndhub.kosmos.org'
+LNDHUB_PUBLIC_KEY='0123d3be18617f39cf645851e3ba63f51fc13f0bb09e3bb25e6fd4de556486d946'
+LNDHUB_ADMIN_UI=true
+LNDHUB_ADMIN_TOKEN=123456789
+LNDHUB_PG_HOST=localhost
+LNDHUB_PG_PORT=5432
+LNDHUB_PG_DATABASE=lndhub
+LNDHUB_PG_USERNAME=lndhub
+LNDHUB_PG_PASSWORD=''

-# MASTODON_PUBLIC_URL='https://kosmos.social'
-# MASTODON_ADDRESS_DOMAIN='https://kosmos.org'
+MASTODON_PUBLIC_URL='https://kosmos.social'

-# MEDIAWIKI_PUBLIC_URL='https://wiki.kosmos.org'
+MEDIAWIKI_PUBLIC_URL='https://wiki.kosmos.org'

-# NOSTR_PRIVATE_KEY='123456abcdef...'
-# NOSTR_PUBLIC_KEY='123456abcdef...'
-# NOSTR_RELAY_URL='wss://nostr.kosmos.org'
-
-# RS_STORAGE_URL='https://storage.kosmos.org'
-# RS_REDIS_URL='redis://localhost:6379/2'
+RS_STORAGE_URL='https://storage.kosmos.org'
+RS_REDIS_URL='redis://localhost:6379/2'
--- a/.env.test
+++ b/.env.test
@@ -1,5 +1,4 @@
 PRIMARY_DOMAIN=kosmos.org
-AKKOUNTS_DOMAIN=accounts.kosmos.org

 REDIS_URL='redis://localhost:6379/0'

@@ -12,15 +11,10 @@ DISCOURSE_CONNECT_SECRET='discourse_connect_ftw'

 EJABBERD_API_URL='http://xmpp.example.com/api'

-MASTODON_PUBLIC_URL='http://example.social'
-
 LNDHUB_API_URL='http://localhost:3026'
 LNDHUB_PUBLIC_URL='https://lndhub.kosmos.org'
 LNDHUB_PUBLIC_KEY='024cd3be18617f39cf645851e3ba63f51fc13f0bb09e3bb25e6fd4de556486d946'

-NOSTR_PRIVATE_KEY='7c3ef7e448505f0615137af38569d01807d3b05b5005d5ecf8aaafcd40323cea'
-NOSTR_PUBLIC_KEY='bdd76ce2934b2f591f9fad2ebe9da18f20d2921de527494ba00eeaa0a0efadcf'
-
 RS_STORAGE_URL='https://storage.kosmos.org'
 RS_REDIS_URL='redis://localhost:6379/1'

--- a/4
+++ b/4
@@ -61,8 +61,8 @@ gem "sentry-rails"
 # Services
 gem 'discourse_api'
 gem "lnurl"
-gem 'manifique', '~> 1.1.0'
-gem 'nostr', '~> 0.6.0'
+gem 'manifique'
+gem 'nostr'

 group :development, :test do
  # Use sqlite3 as the database for Active Record
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -155,7 +155,7 @@ GEM
      ruby2_keywords
    e2mmap (0.1.0)
    ecdsa (1.2.0)
-    ecdsa_ext (0.5.1)
+    ecdsa_ext (0.5.0)
      ecdsa (~> 1.2.0)
    erubi (1.12.0)
    et-orbi (1.2.7)
@@ -245,7 +245,7 @@ GEM
      net-imap
      net-pop
      net-smtp
-    manifique (1.1.0)
+    manifique (1.0.1)
      faraday (~> 2.9.0)
      faraday-follow_redirects (= 0.3.0)
      nokogiri (~> 1.16.0)
@@ -278,9 +278,9 @@ GEM
      racc (~> 1.4)
    nokogiri (1.16.0-x86_64-linux)
      racc (~> 1.4)
-    nostr (0.6.0)
+    nostr (0.5.0)
      bech32 (~> 1.4)
-      bip-schnorr (~> 0.7)
+      bip-schnorr (~> 0.6)
      ecdsa (~> 1.2)
      event_emitter (~> 0.2)
      faye-websocket (~> 0.11)
@@ -515,9 +515,9 @@ DEPENDENCIES
  listen (~> 3.2)
  lnurl
  lockbox
-  manifique (~> 1.1.0)
+  manifique
  net-ldap
-  nostr (~> 0.6.0)
+  nostr
  pagy (~> 6.0, >= 6.0.2)
  pg (~> 1.5)
  puma (~> 4.1)
--- a/README.md
+++ b/README.md
@@ -14,10 +14,8 @@ so:

 1. Make sure [Docker Compose is installed][1] and Docker is running (included in
   Docker Desktop)
-3. Run `docker compose up --build` and wait until all services have started
-   (389ds might take an extra minute to be ready). This will take a while when
-   running for the first time, so you might want to do something else in the
-   meantime.
+3. Run `docker compose up` and wait until 389ds announces its successful start
+   in the log output
 4. `docker-compose exec ldap dsconf localhost backend create --suffix="dc=kosmos,dc=org" --be-name="dev"`
 5. `docker compose run web rails ldap:setup`
 6. `docker compose run web rails db:setup`
@@ -30,44 +28,38 @@ have the password "user is user".

 ### Rails app

-_Note: when using Docker Compose, prefix the following commands with `docker-compose
-run web`._
-
 Installing dependencies:

    bundle install
    yarn install

-Migrating the local database (after schema changes):
+Setting up local database (SQLite):

+    bundle exec rails db:create
    bundle exec rails db:migrate

-Running the dev server, and auto-building CSS files on change _(automatic with Docker Compose)_:
+Running the dev server and auto-building CSS files on change:

    bin/dev

-Running the background workers (requires Redis) _(automatic with Docker Compose)_:
+Running the background workers (requires Redis):

    bundle exec sidekiq -C config/sidekiq.yml

-Running the test suite:
+Running all specs:

    bundle exec rspec

-Running the test suite with Docker Compose requires overriding the Rails
-environment:
+### Docker (Compose)

-    docker-compose run -e "RAILS_ENV=test" web rspec
+There is a working Docker Compose config file, which define a number of services including
+an app server for Rails as well as a local 389ds (LDAP) server.

-### Docker Compose
+For Rails developers, you probably just want to start the LDAP server: `docker-compose up ldap`, 
+listening on port 389 on your machine. 

-Services/containers are configured in `docker-compose.yml`.
-
-You can run services selectively, for example if you want to run the Rails app
-and test suite on the host machine. Just add the service names of the
-containers you want to run to the `up` command, like so:
-
-    docker-compose up ldap redis
+You can pick and choose your services adding them by name (listed in `docker-compose.yml`) at 
+the end of the docker compose command. eg. `docker compose up ldap redis`

 #### LDAP server

@@ -84,15 +76,13 @@ Now you can seed the back-end with data using this Rails task:
 The setup task will first delete any existing entries in the directory tree
 ("dc=kosmos,dc=org"), and then create our development entries.

-Note that all 389ds data is stored in the `389ds-data` volume. So if you want
-to start over with a fresh installation, delete both that volume as well as the
-container.
+Note that all 389ds data is stored in `tmp/389ds`. So if you want to start over
+with a fresh installation, delete both that directory as well as the container.

-#### Minio / remoteStorage
+#### Minio / RS

 If you want to run remoteStorage accounts locally, you will have to create the
-respective bucket first. With the `minio` container running (run by default
-when using Docker Compose), follow these steps:
+respective bucket first:

 * `docker compose up web redis minio liquor-cabinet`
 * Head to http://localhost:9001 and log in with user `minioadmin`, password
--- a/app/assets/stylesheets/components/buttons.css
+++ b/app/assets/stylesheets/components/buttons.css
@@ -42,11 +42,6 @@
           focus:ring-red-500 focus:ring-opacity-75;
  }

-  .btn-outline-purple {
-    @apply border-2 border-purple-500 hover:bg-purple-100
-           focus:ring-purple-400 focus:ring-opacity-75;
-  }
-
  .btn:disabled {
    @apply bg-gray-100 hover:bg-gray-200 text-gray-400
           focus:ring-gray-300 focus:ring-opacity-75;
--- a/app/assets/stylesheets/components/dashboard_services.css
+++ b/app/assets/stylesheets/components/dashboard_services.css
@@ -1,5 +1,5 @@
@layer components {
  .services > div > a {
-    background-image: linear-gradient(110deg, rgba(255,255,255,0.99) 20%, rgba(255,255,255,0.88) 100%);
+    background-image: linear-gradient(110deg, rgba(255,255,255,0.99) 0, rgba(255,255,255,0.88) 100%);
  }
 }
--- a/app/components/app_catalog/web_app_icon_component.html.erb
+++ b/app/components/app_catalog/web_app_icon_component.html.erb
@@ -1,5 +0,0 @@
-<% if @image_url %>
-  <%= image_tag @image_url, class: "h-full w-full" %>
-<% else %>
-  <%= render partial: "icons/remotestorage", locals: { custom_class: "h-full w-full p-0.5 text-gray-200" } %>
-<% end %>
--- a/app/components/app_catalog/web_app_icon_component.rb
+++ b/app/components/app_catalog/web_app_icon_component.rb
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module AppCatalog
-  class WebAppIconComponent < ViewComponent::Base
-    def initialize(web_app:)
-      if web_app&.icon&.attached?
-        @image_url = image_url_for(web_app.icon)
-      elsif web_app&.apple_touch_icon&.attached?
-        @image_url = image_url_for(web_app.apple_touch_icon)
-      end
-    end
-
-    def image_url_for(attachment)
-      if Setting.s3_enabled?
-        s3_image_url(attachment)
-      else
-        Rails.application.routes.url_helpers.rails_blob_path(attachment, only_path: true)
-      end
-    end
-  end
-end
--- a/app/components/form_elements/fieldset_resettable_setting_component.html.erb
+++ b/app/components/form_elements/fieldset_resettable_setting_component.html.erb
@@ -6,7 +6,6 @@
    ) do %>
  <%= method("#{@type}_field").call :setting, @key,
    value: Setting.public_send(@key),
-    placeholder: @placeholder,
    data: {
      :'default-value' => Setting.get_field(@key)[:default]
    },
--- a/app/components/form_elements/fieldset_resettable_setting_component.rb
+++ b/app/components/form_elements/fieldset_resettable_setting_component.rb
@@ -2,7 +2,7 @@

 module FormElements
  class FieldsetResettableSettingComponent < ViewComponent::Base
-    def initialize(tag: "li", key:, type: :text, title:, description: nil, placeholder: nil)
+    def initialize(tag: "li", key:, type: :text, title:, description: nil)
      @tag         = tag
      @positioning = :vertical
      @title       = title
@@ -10,7 +10,6 @@ module FormElements
      @key         = key.to_sym
      @type        = type
      @resettable  = is_resettable?(@key)
-      @placeholder = placeholder
    end

    def is_resettable?(key)
--- a/app/components/form_elements/fieldset_toggle_component.html.erb
+++ b/app/components/form_elements/fieldset_toggle_component.html.erb
@@ -6,7 +6,7 @@
  <div class="flex flex-col">
    <label class="font-bold mb-1"><%= @title %></label>
    <% if @description.present? %>
-    <p class="text-gray-500"><%= @description %></p>
+    <p class="text-gray-500"><%= @descripton %></p>
    <% end %>
  </div>
  <div class="relative ml-4 inline-flex flex-shrink-0">
--- a/app/components/form_elements/fieldset_toggle_component.rb
+++ b/app/components/form_elements/fieldset_toggle_component.rb
@@ -12,7 +12,7 @@ module FormElements
      @enabled = enabled
      @input_enabled = input_enabled
      @title = title
-      @description = description
+      @descripton = description
      @button_text = @enabled ? "Switch off" : "Switch on"
    end
  end
--- a/app/components/rs_auth_component.html.erb
+++ b/app/components/rs_auth_component.html.erb
@@ -1,10 +1,16 @@
 <div class="flex items-center gap-4">
  <div class="h-16 w-16 flex-none">
-    <%= render AppCatalog::WebAppIconComponent.new(web_app: @web_app) %>
+    <% if @web_app.icon.attached? %>
+    <%= image_tag s3_image_url(@web_app.icon), class: "h-full w-full" %>
+    <% elsif @web_app.apple_touch_icon.attached? %>
+    <%= image_tag s3_image_url(@web_app.apple_touch_icon), class: "h-full w-full" %>
+    <% else %>
+    <%= render partial: "icons/remotestorage", locals: { custom_class: "h-full w-full p-0.5 text-gray-200" } %>
+    <% end %>
  </div>
  <div class="flex-grow">
    <h4 class="mb-1 text-lg font-bold">
-      <%= @web_app&.name || @auth.app_name %>
+      <%= @web_app.name %>
    </h4>
    <p class="text-sm text-gray-500">
      <%= @auth.client_id %>
--- a/app/controllers/admin/donations_controller.rb
+++ b/app/controllers/admin/donations_controller.rb
@@ -8,7 +8,7 @@ class Admin::DonationsController < Admin::BaseController

    @stats = {
      overall_sats: @donations.sum("amount_sats"),
-      donor_count: Donation.completed.count(:user_id)
+      donor_count: @donations.distinct.count(:user_id)
    }
  end

--- a/app/controllers/admin/settings/registrations_controller.rb
+++ b/app/controllers/admin/settings/registrations_controller.rb
@@ -1,8 +1,8 @@
 class Admin::Settings::RegistrationsController < Admin::SettingsController
-  def show
+  def index
  end

-  def update
+  def create
    update_settings

    redirect_to admin_settings_registrations_path, flash: {
--- a/app/controllers/admin/settings/services_controller.rb
+++ b/app/controllers/admin/settings/services_controller.rb
@@ -1,32 +1,19 @@
 class Admin::Settings::ServicesController < Admin::SettingsController
-  before_action :set_service, only: [:show, :update]
-
  def index
-    redirect_to admin_settings_service_path("btcpay")
+    @service = params[:s]
+
+    if @service.blank?
+      redirect_to admin_settings_services_path(params: { s: "btcpay" })
+    end
  end

-  def show
-  end
+  def create
+    service = params.require(:service)

-  def update
    update_settings

-    redirect_to admin_settings_service_path(@service), flash: {
+    redirect_to admin_settings_services_path(params: { s: service }), flash: {
      success: "Settings saved"
    }
  end
-
-  private
-
-    def set_subsection
-      @subsection = "services"
-    end
-
-    def set_service
-      @service = params[:service]
-
-      if @service.blank?
-        redirect_to admin_settings_services_path and return
-      end
-    end
 end
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -20,7 +20,7 @@ class Admin::SettingsController < Admin::BaseController
    end

    if @errors.any?
-      render :show and return
+      render :index and return
    end

    changed_keys.each do |key|
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -63,9 +63,4 @@ class ApplicationController < ActionController::Base
    @fetch_balance_retried = true
    lndhub_fetch_balance
  end
-
-  def nostr_event_from_params
-    params.permit!
-    params[:signed_event].to_h.symbolize_keys
-  end
 end
--- a/app/controllers/contributions/donations_controller.rb
+++ b/app/controllers/contributions/donations_controller.rb
@@ -28,7 +28,6 @@ class Contributions::DonationsController < ApplicationController
    if params[:currency] == "sats"
      fiat_amount = nil
      fiat_currency = nil
-      amount_sats = params[:amount]
    else
      fiat_amount = params[:amount].to_i
      fiat_currency = params[:currency]
--- a/app/controllers/lnurlpay_controller.rb
+++ b/app/controllers/lnurlpay_controller.rb
@@ -1,15 +1,13 @@
 class LnurlpayController < ApplicationController
  before_action :check_service_available
  before_action :find_user
-  before_action :set_cors_access_control_headers, only: [:invoice]

  MIN_SATS = 10
  MAX_SATS = 1_000_000
  MAX_COMMENT_CHARS = 100

-  # GET /.well-known/lnurlp/:username
  def index
-    res = {
+    render json: {
      status: "OK",
      callback: "https://#{Setting.accounts_domain}/lnurlpay/#{@user.cn}/invoice",
      tag: "payRequest",
@@ -18,16 +16,8 @@ class LnurlpayController < ApplicationController
      metadata: metadata(@user.address),
      commentAllowed: MAX_COMMENT_CHARS
    }
-
-    if Setting.nostr_enabled?
-      res[:allowsNostr] = true
-      res[:nostrPubkey] = Setting.nostr_public_key
-    end
-
-    render json: res
  end

-  # GET /.well-known/keysend/:username
  def keysend
    http_status :not_found and return unless Setting.lndhub_keysend_enabled?

@@ -42,9 +32,8 @@ class LnurlpayController < ApplicationController
    }
  end

-  # GET /lnurlpay/:username/invoice
  def invoice
-    amount = params[:amount].to_i / 1000 # msats to sats
+    amount = params[:amount].to_i / 1000 # msats
    comment = params[:comment] || ""
    address = @user.address

@@ -53,109 +42,53 @@ class LnurlpayController < ApplicationController
      return
    end

-    if params[:nostr].present? && Setting.nostr_enabled?
-      handle_zap_request amount, params[:nostr], params[:lnurl]
-    else
-      handle_pay_request address, amount, comment
+    if !valid_comment?(comment)
+      render json: { status: "ERROR", reason: "Comment too long" }
+      return
    end
+
+    memo = "To #{address}"
+    memo = "#{memo}: \"#{comment}\"" if comment.present?
+
+    payment_request = @user.ln_create_invoice({
+      amount: amount, # we create invoices in sats
+      memo: memo,
+      description_hash: Digest::SHA2.hexdigest(metadata(address)),
+    })
+
+    render json: {
+      status: "OK",
+      successAction: {
+        tag: "message",
+        message: "Sats received. Thank you!"
+      },
+      routes: [],
+      pr: payment_request
+    }
  end

  private

-    def set_cors_access_control_headers
-      headers['Access-Control-Allow-Origin'] = "*"
-      headers['Access-Control-Allow-Headers'] = "*"
-      headers['Access-Control-Allow-Methods'] = "GET"
-    end
+  def find_user
+    @user = User.where(cn: params[:username], ou: Setting.primary_domain).first
+    http_status :not_found if @user.nil?
+  end

-    def check_service_available
-      http_status :not_found unless Setting.lndhub_enabled?
-    end
+  def metadata(address)
+    "[[\"text/identifier\", \"#{address}\"], [\"text/plain\", \"Send sats, receive thanks.\"]]"
+  end

-    def find_user
-      @user = User.where(cn: params[:username], ou: Setting.primary_domain).first
-      http_status :not_found if @user.nil?
-    end
+  def valid_amount?(amount_in_sats)
+    amount_in_sats <= MAX_SATS && amount_in_sats >= MIN_SATS
+  end

-    def metadata(address)
-      "[[\"text/identifier\",\"#{address}\"],[\"text/plain\",\"Sats for #{address}\"]]"
-    end
+  def valid_comment?(comment)
+    comment.length <= MAX_COMMENT_CHARS
+  end

-    def valid_amount?(amount_in_sats)
-      amount_in_sats <= MAX_SATS && amount_in_sats >= MIN_SATS
-    end
+  private

-    def valid_comment?(comment)
-      comment.length <= MAX_COMMENT_CHARS
-    end
-
-    def handle_pay_request(address, amount, comment)
-      if !valid_comment?(comment)
-        render json: { status: "ERROR", reason: "Comment too long" }
-        return
-      end
-
-      desc = "To #{address}"
-      desc = "#{desc}: \"#{comment}\"" if comment.present?
-
-      invoice = LndhubManager::CreateUserInvoice.call(
-        user: @user, payload: {
-          amount: amount, # sats
-          description: desc,
-          description_hash: Digest::SHA256.hexdigest(metadata(address)),
-        }
-      )
-
-      render json: {
-        status: "OK",
-        successAction: {
-          tag: "message",
-          message: "Sats received. Thank you!"
-        },
-        routes: [],
-        pr: invoice["payment_request"]
-      }
-    end
-
-    def nostr_event_from_payload(nostr_param)
-      event_obj = JSON.parse(nostr_param).transform_keys(&:to_sym)
-      Nostr::Event.new(**event_obj)
-    rescue => e
-      return nil
-    end
-
-    def valid_zap_request?(amount, event, lnurl)
-      NostrManager::VerifyZapRequest.call(
-        amount: amount, event: event, lnurl: lnurl
-      )
-    end
-
-    def handle_zap_request(amount, nostr_param, lnurl_param)
-      event = nostr_event_from_payload(nostr_param)
-
-      unless event.present? && valid_zap_request?(amount*1000, event, lnurl_param)
-        render json: { status: "ERROR", reason: "Invalid zap request" }
-        return
-      end
-
-      # TODO might want to use the existing invoice and zap record if there are
-      # multiple calls with the same zap request
-
-      desc = "Zap for #{@user.address}"
-      desc = "#{desc}: \"#{event.content}\"" if event.content.present?
-
-      invoice = LndhubManager::CreateUserInvoice.call(
-        user: @user, payload: {
-          amount: amount, # sats
-          description: desc,
-          description_hash: Digest::SHA256.hexdigest(event.to_json),
-        }
-      )
-
-      @user.zaps.create! request: event,
-                         payment_request: invoice["payment_request"],
-                         amount: amount
-
-      render json: { status: "OK", pr: invoice["payment_request"] }
-    end
+  def check_service_available
+    http_status :not_found unless Setting.lndhub_enabled?
+  end
 end
--- a/app/controllers/services/chat_controller.rb
+++ b/app/controllers/services/chat_controller.rb
@@ -3,7 +3,7 @@ class Services::ChatController < Services::BaseController
  before_action :require_service_available

  def show
-    @service_enabled = current_user.service_enabled?(:xmpp)
+    @service_enabled = current_user.services_enabled.include?(:xmpp)
  end

  private
--- a/app/controllers/services/mastodon_controller.rb
+++ b/app/controllers/services/mastodon_controller.rb
@@ -3,7 +3,7 @@ class Services::MastodonController < Services::BaseController
  before_action :require_service_available

  def show
-    @service_enabled = current_user.service_enabled?(:mastodon)
+    @service_enabled = current_user.services_enabled.include?(:mastodon)
  end

  private
--- a/app/controllers/services/remotestorage_controller.rb
+++ b/app/controllers/services/remotestorage_controller.rb
@@ -5,10 +5,11 @@ class Services::RemotestorageController < Services::BaseController

  # Dashboard
  def show
-    # unless current_user.service_enabled?(:remotestorage)
+    # unless current_user.services_enabled.include?(:remotestorage)
    #   redirect_to service_remotestorage_info_path
    # end
-    # @rs_apps_connected = current_user.remote_storage_authorizations.any?
+    @rs_auths = current_user.remote_storage_authorizations
+    # TODO sort by app name
  end

  private
--- a/app/controllers/services/rs_auths_controller.rb
+++ b/app/controllers/services/rs_auths_controller.rb
@@ -3,18 +3,13 @@ class Services::RsAuthsController < Services::BaseController
  before_action :require_feature_enabled
  before_action :require_service_available
  # before_action :require_service_enabled
-  before_action :find_rs_auth, only: [:destroy, :launch_app]
-
-  def index
-    @rs_auths = current_user.remote_storage_authorizations
-    # TODO sort by app name?
-  end
+  before_action :find_rs_auth

  def destroy
    @auth.destroy!

    respond_to do |format|
-      format.html do redirect_to apps_services_storage_url, flash: {
+      format.html do redirect_to services_storage_url, flash: {
        success: 'App authorization revoked'
      }
      end
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -12,11 +12,7 @@ class SettingsController < ApplicationController
  end

  def show
-    case @settings_section
-    when "lightning"
-      @notifications_enabled = @user.preferences[:lightning_notify_sats_received] != "disabled" ||
-                               @user.preferences[:lightning_notify_zap_received] != "disabled"
-    when "nostr"
+    if @settings_section == "experiments"
      session[:shared_secret] ||= SecureRandom.base64(12)
    end
  end
@@ -91,39 +87,40 @@ class SettingsController < ApplicationController
  end

  def set_nostr_pubkey
-    signed_event = Nostr::Event.new(**nostr_event_from_params)
+    signed_event = nostr_event_params[:signed_event].to_h.symbolize_keys
+    is_valid_id  = NostrManager::ValidateId.call(event: signed_event)
+    is_valid_sig = NostrManager::VerifySignature.call(event: signed_event)
+    is_correct_content = signed_event[:content] == "Connect my public key to #{current_user.address} (confirmation #{session[:shared_secret]})"

-    is_valid_sig  = signed_event.verify_signature
-    is_valid_auth = NostrManager::VerifyAuth.call(
-      event: signed_event,
-      challenge: session[:shared_secret]
-    )
-
-    unless is_valid_sig && is_valid_auth
+    unless is_valid_id && is_valid_sig && is_correct_content
      flash[:alert] = "Public key could not be verified"
      http_status :unprocessable_entity and return
    end

-    user_with_pubkey = LdapManager::FetchUserByNostrKey.call(pubkey: signed_event.pubkey)
+    pubkey_taken = User.all_except(current_user).where(
+      ou: current_user.ou, nostr_pubkey: signed_event[:pubkey]
+    ).any?

-    if user_with_pubkey.present? && (user_with_pubkey != current_user)
+    if pubkey_taken
      flash[:alert] = "Public key already in use for a different account"
      http_status :unprocessable_entity and return
    end

-    LdapManager::UpdateNostrKey.call(dn: current_user.dn, pubkey: signed_event.pubkey)
+    current_user.update! nostr_pubkey: signed_event[:pubkey]
    session[:shared_secret] = nil

    flash[:success] = "Public key verification successful"
    http_status :ok
+  rescue
+    flash[:alert] = "Public key could not be verified"
+    http_status :unprocessable_entity and return
  end

  # DELETE /settings/nostr_pubkey
  def remove_nostr_pubkey
-    # TODO require current pubkey or password to delete
-    LdapManager::UpdateNostrKey.call(dn: current_user.dn, pubkey: nil)
+    current_user.update! nostr_pubkey: nil

-    redirect_to setting_path(:nostr), flash: {
+    redirect_to setting_path(:experiments), flash: {
      success: 'Public key removed from account'
    }
  end
@@ -137,8 +134,8 @@ class SettingsController < ApplicationController
    def set_settings_section
      @settings_section = params[:section]
      allowed_sections = [
-        :profile, :account, :xmpp, :email,
-        :lightning, :remotestorage, :nostr
+        :profile, :account, :xmpp, :email, :lightning, :remotestorage,
+        :experiments
      ]

      unless allowed_sections.include?(@settings_section.to_sym)
@@ -151,9 +148,11 @@ class SettingsController < ApplicationController
    end

    def user_params
-      params.require(:user).permit(
-        :display_name, :avatar, preferences: UserPreferences.pref_keys
-      )
+      params.require(:user).permit(:display_name, :avatar, preferences: [
+        :lightning_notify_sats_received,
+        :remotestorage_notify_auth_created,
+        :xmpp_exchange_contacts_with_invitees
+      ])
    end

    def email_params
@@ -164,6 +163,12 @@ class SettingsController < ApplicationController
      params.require(:user).permit(:current_password)
    end

+    def nostr_event_params
+      params.permit(signed_event: [
+        :id, :pubkey, :created_at, :kind, :tags, :content, :sig
+      ])
+    end
+
    def generate_email_password
      characters = [('a'..'z'), ('A'..'Z'), (0..9)].map(&:to_a).flatten
      SecureRandom.random_bytes(16).each_byte.map { |b| characters[b % characters.length] }.join
--- a/app/controllers/users/sessions_controller.rb
+++ b/app/controllers/users/sessions_controller.rb
@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-class Users::SessionsController < Devise::SessionsController
-  # before_action :configure_sign_in_params, only: [:create]
-
-  # GET /resource/sign_in
-  def new
-    session[:shared_secret] = SecureRandom.base64(12)
-    super
-  end
-
-  # POST /resource/sign_in
-  # def create
-  #   super
-  # end
-
-  # DELETE /resource/sign_out
-  # def destroy
-  #   super
-  # end
-
-  # POST /users/nostr_login
-  def nostr_login
-    signed_event = Nostr::Event.new(**nostr_event_from_params)
-
-    is_valid_sig  = signed_event.verify_signature
-    is_valid_auth = NostrManager::VerifyAuth.call(
-      event: signed_event,
-      challenge: session[:shared_secret]
-    )
-
-    session[:shared_secret] = nil
-
-    unless is_valid_sig && is_valid_auth
-      flash[:alert] = "Login verification failed"
-      http_status :unauthorized and return
-    end
-
-    user = LdapManager::FetchUserByNostrKey.call(pubkey: signed_event.pubkey)
-
-    if user.present?
-      set_flash_message!(:notice, :signed_in)
-      sign_in("user", user)
-      render json: { redirect_url: after_sign_in_path_for(user) }, status: :ok
-    else
-      flash[:alert] = "Failed to find your account. Nostr login may be disabled."
-      http_status :unauthorized
-    end
-  end
-
-  protected
-
-    def set_flash_message(key, kind, options = {})
-      # Hide flash message after redirecting from a signin route while logged in
-      super unless key == :alert && kind == "already_authenticated"
-    end
-
-  # If you have extra params to permit, append them to the sanitizer.
-  # def configure_sign_in_params
-  #   devise_parameter_sanitizer.permit(:sign_in, keys: [:attribute])
-  # end
-end
--- a/app/controllers/webfinger_controller.rb
+++ b/app/controllers/webfinger_controller.rb
@@ -7,15 +7,14 @@ class WebfingerController < ApplicationController
    resource = params[:resource]

    if resource && @useraddress = resource.match(/acct:(.+)/)&.[](1)
-      @username, @domain = @useraddress.split("@")
+      @username, @org = @useraddress.split("@")

      unless Rails.env.development?
        # Allow different domains (e.g. localhost:3000) in development only
-        head 404 and return unless @domain == Setting.primary_domain
+        head 404 and return unless @org == Setting.primary_domain
      end

-      unless @user = User.where(ou: Setting.primary_domain)
-                         .find_by(cn: @username.downcase)
+      unless User.where(cn: @username.downcase, ou: Setting.primary_domain).any?
        head 404 and return
      end

@@ -29,50 +28,12 @@ class WebfingerController < ApplicationController
  private

  def webfinger
-    jrd = {
-      subject: "acct:#{@user.address}",
-      aliases: [],
-      links: []
-    }
+    links = [];

-    if Setting.mastodon_enabled && @user.service_enabled?(:mastodon)
-      # https://docs.joinmastodon.org/spec/webfinger/
-      jrd[:aliases] += mastodon_aliases
-      jrd[:links] += mastodon_links
-    end
+    # TODO check if storage service is enabled for user, not just globally
+    links << remotestorage_link if Setting.remotestorage_enabled

-    if Setting.remotestorage_enabled && @user.service_enabled?(:remotestorage)
-      # https://datatracker.ietf.org/doc/draft-dejong-remotestorage/
-      jrd[:links] << remotestorage_link
-    end
-
-    jrd
-  end
-
-  def mastodon_aliases
-    [
-      "#{Setting.mastodon_public_url}/@#{@user.cn}",
-      "#{Setting.mastodon_public_url}/users/#{@user.cn}"
-    ]
-  end
-
-  def mastodon_links
-    [
-      {
-        rel: "http://webfinger.net/rel/profile-page",
-        type: "text/html",
-        href: "#{Setting.mastodon_public_url}/@#{@user.cn}"
-      },
-      {
-        rel: "self",
-        type: "application/activity+json",
-        href: "#{Setting.mastodon_public_url}/users/#{@user.cn}"
-      },
-      {
-        rel: "http://ostatus.org/schema/1.0/subscribe",
-        template: "#{Setting.mastodon_public_url}/authorize_interaction?uri={uri}"
-      }
-    ]
+    { "links" => links }
  end

  def remotestorage_link
@@ -80,9 +41,9 @@ class WebfingerController < ApplicationController
    storage_url = "#{Setting.rs_storage_url}/#{@username}"

    {
-      rel: "http://tools.ietf.org/id/draft-dejong-remotestorage",
-      href: storage_url,
-      properties: {
+      "rel" => "http://tools.ietf.org/id/draft-dejong-remotestorage",
+      "href" => storage_url,
+      "properties" => {
        "http://remotestorage.io/spec/version" => "draft-dejong-remotestorage-13",
        "http://tools.ietf.org/html/rfc6749#section-4.2" => auth_url,
        "http://tools.ietf.org/html/rfc6750#section-2.3" => nil, # access token via a HTTP query parameter
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -2,76 +2,45 @@ class WebhooksController < ApplicationController
  skip_forgery_protection

  before_action :authorize_request
-  before_action :process_payload

  def lndhub
-    @user = User.find_by!(ln_account: @payload[:user_login])
-
-    if @zap = @user.zaps.find_by(payment_request: @payload[:payment_request])
-      settled_at = Time.parse(@payload[:settled_at])
-      zap_receipt = NostrManager::CreateZapReceipt.call(
-        zap: @zap,
-        paid_at: settled_at.to_i,
-        preimage: @payload[:preimage]
-      )
-      @zap.update! settled_at: settled_at, receipt: zap_receipt.to_h
-      NostrManager::PublishZapReceipt.call(zap: @zap)
+    begin
+      payload = JSON.parse(request.body.read, symbolize_names: true)
+      head :no_content and return unless payload[:type] == "incoming"
+    rescue
+      head :unprocessable_entity and return
    end

-    send_notifications
+    user = User.find_by!(ln_account: payload[:user_login])
+    notify = user.preferences[:lightning_notify_sats_received]
+    case notify
+    when "xmpp"
+      notify_xmpp(user.address, payload[:amount], payload[:memo])
+    when "email"
+      NotificationMailer.with(user: user, amount_sats: payload[:amount])
+                        .lightning_sats_received.deliver_later
+    end

    head :ok
  end

  private

+  # TODO refactor into mailer-like generic class/service
+  def notify_xmpp(address, amt_sats, memo)
+    payload = {
+      type: "normal",
+      from: Setting.xmpp_notifications_from_address,
+      to: address,
+      subject: "Sats received!",
+      body: "#{helpers.number_with_delimiter amt_sats} sats received in your Lightning wallet:\n> #{memo}"
+    }
+    XmppSendMessageJob.perform_later(payload)
+  end
+
  def authorize_request
    if !ENV['WEBHOOKS_ALLOWED_IPS'].split(',').include?(request.remote_ip)
      head :forbidden and return
    end
  end
-
-  def process_payload
-    @payload = JSON.parse(request.body.read, symbolize_names: true)
-    unless @payload[:type] == "incoming" &&
-           @payload[:state] == "settled"
-      head :no_content and return
-    end
-  rescue
-    head :unprocessable_entity and return
-  end
-
-  def send_notifications
-    return if @payload[:amount] < @user.preferences[:lightning_notify_min_sats]
-
-    if @user.preferences[:lightning_notify_only_with_message]
-      return if @payload[:memo].blank?
-    end
-
-    target = @zap.present? ? @user.preferences[:lightning_notify_zap_received] :
-                             @user.preferences[:lightning_notify_sats_received]
-
-    case target
-    when "xmpp"
-      notify_xmpp
-    when "email"
-      notify_email
-    end
-  end
-
-  # TODO refactor into mailer-like generic class/service
-  def notify_xmpp
-    XmppSendMessageJob.perform_later({
-      type: "normal",
-      from: Setting.xmpp_notifications_from_address,
-      to: @user.address,
-      subject: "Sats received!",
-      body: "#{helpers.number_with_delimiter @payload[:amount]} sats received in your Lightning wallet:\n> #{@payload[:memo]}"
-    })
-  end
-
-  def notify_email
-    NotificationMailer.with(user: @user, amount_sats: @payload[:amount])
-                      .lightning_sats_received.deliver_later
-  end
 end
--- a/app/controllers/well_known_controller.rb
+++ b/app/controllers/well_known_controller.rb
@@ -1,33 +1,16 @@
 class WellKnownController < ApplicationController
-  before_action :require_nostr_enabled, only: [ :nostr ]
-
  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.presence
-
-    if params[:name] == "_"
-      # pubkey for the primary domain without a username (e.g. kosmos.org)
-      res = { names: { "_": Setting.nostr_public_key } }
-      res[:relays] = { "_" => [ relay_url ] } if relay_url
-    else
-      @user = User.where(cn: params[:name], ou: domain).first
-      http_status :not_found and return if @user.nil? || @user.nostr_pubkey.blank?
-
-      res = { names: { @user.cn => @user.nostr_pubkey } }
-      res[:relays] = { @user.nostr_pubkey => [ relay_url ] } if relay_url
-    end
+    @user = User.where(cn: params[:name], ou: domain).first
+    http_status :not_found and return if @user.nil? || @user.nostr_pubkey.blank?

    respond_to do |format|
      format.json do
-        render json: res.to_json
+        render json: {
+          names: { "#{@user.cn}": @user.nostr_pubkey }
+        }.to_json
      end
    end
  end
-
-  private
-
-    def require_nostr_enabled
-      http_status :not_found unless Setting.nostr_enabled?
-    end
 end
--- a/app/javascript/controllers/nostr_login_controller.js
+++ b/app/javascript/controllers/nostr_login_controller.js
@@ -1,53 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-// Connects to data-controller="nostr-login"
-export default class extends Controller {
-  static targets = [ "loginForm", "loginButton" ]
-  static values  = { site: String, sharedSecret: String }
-
-  connect() {
-    if (window.nostr) {
-      this.loginButtonTarget.disabled = false
-      this.loginFormTarget.classList.remove("hidden")
-    }
-  }
-
-  async login () {
-    this.loginButtonTarget.disabled = true
-
-    try {
-      // Auth based on NIP-42
-      const signedEvent = await window.nostr.signEvent({
-        created_at: Math.floor(Date.now() / 1000),
-        kind: 22242,
-        tags: [
-          ["site", this.siteValue],
-          ["challenge", this.sharedSecretValue]
-        ],
-        content: ""
-      })
-
-      const res = await fetch("/users/nostr_login", {
-        method: "POST", credentials: "include", headers: {
-          "Accept": "application/json", 'Content-Type': 'application/json',
-          "X-CSRF-Token": this.csrfToken
-        }, body: JSON.stringify({ signed_event: signedEvent })
-      })
-
-      if (res.status === 200) {
-        res.json().then(r => { window.location.href = r.redirect_url })
-      } else {
-        window.location.reload()
-      }
-    } catch (error) {
-      console.warn('Unable to authenticate:', error.message)
-    } finally {
-      this.loginButtonTarget.disabled = false
-    }
-  }
-
-  get csrfToken () {
-    const element = document.head.querySelector('meta[name="csrf-token"]')
-    return element.getAttribute("content")
-  }
-}
--- a/app/javascript/controllers/settings/nostr_pubkey_controller.js
+++ b/app/javascript/controllers/settings/nostr_pubkey_controller.js
@@ -3,12 +3,7 @@ import { Controller } from "@hotwired/stimulus"
 // Connects to data-controller="settings--nostr-pubkey"
 export default class extends Controller {
  static targets = [ "noExtension", "setPubkey", "pubkeyBech32Input" ]
-  static values  = {
-    userAddress: String,
-    pubkeyHex: String,
-    site: String,
-    sharedSecret: String
-  }
+  static values  = { userAddress: String, pubkeyHex: String, sharedSecret: String }

  connect () {
    if (window.nostr) {
@@ -24,15 +19,11 @@ export default class extends Controller {
    this.setPubkeyTarget.disabled = true

    try {
-      // Auth based on NIP-42
      const signedEvent = await window.nostr.signEvent({
        created_at: Math.floor(Date.now() / 1000),
-        kind: 22242,
-        tags: [
-          ["site", this.siteValue],
-          ["challenge", this.sharedSecretValue]
-        ],
-        content: ""
+        kind: 1,
+        tags: [],
+        content: `Connect my public key to ${this.userAddressValue} (confirmation ${this.sharedSecretValue})`
      })

      const res = await fetch("/settings/set_nostr_pubkey", {
--- a/app/jobs/create_ldap_user_job.rb
+++ b/app/jobs/create_ldap_user_job.rb
@@ -1,7 +1,7 @@
 class CreateLdapUserJob < ApplicationJob
  queue_as :default

-  def perform(username:, domain:, email:, hashed_pw:, confirmed: false)
+  def perform(username, domain, email, hashed_pw)
    dn = "cn=#{username},ou=#{domain},cn=users,dc=kosmos,dc=org"
    attr = {
      objectclass: ["top", "account", "person", "extensibleObject"],
@@ -12,10 +12,6 @@ class CreateLdapUserJob < ApplicationJob
      userPassword: hashed_pw
    }

-    if confirmed
-      attr[:serviceEnabled] = Setting.default_services
-    end
-
    ldap_client.add(dn: dn, attributes: attr)
  end

--- a/app/jobs/nostr_publish_event_job.rb
+++ b/app/jobs/nostr_publish_event_job.rb
@@ -1,7 +0,0 @@
-class NostrPublishEventJob < ApplicationJob
-  queue_as :nostr
-
-  def perform(event:, relay_url:)
-    NostrManager::PublishEvent.call(event: event, relay_url: relay_url)
-  end
-end
--- a/app/jobs/xmpp_exchange_contacts_job.rb
+++ b/app/jobs/xmpp_exchange_contacts_job.rb
@@ -2,8 +2,8 @@ class XmppExchangeContactsJob < ApplicationJob
  queue_as :default

  def perform(inviter, invitee)
-    return unless inviter.service_enabled?(:xmpp) &&
-                  invitee.service_enabled?(:xmpp) &&
+    return unless inviter.services_enabled.include?("xmpp") &&
+                  invitee.services_enabled.include?("xmpp") &&
                  inviter.preferences[:xmpp_exchange_contacts_with_invitees]

    ejabberd = EjabberdApiClient.new
--- a/app/models/app_catalog/web_app.rb
+++ b/app/models/app_catalog/web_app.rb
@@ -1,7 +1,7 @@
 class AppCatalog::WebApp < ApplicationRecord
  store :metadata, coder: JSON

-  has_many :remote_storage_authorizations, dependent: :destroy
+  has_many :remote_storage_authorizations

  has_one_attached :icon
  has_one_attached :apple_touch_icon
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -15,9 +15,6 @@ class Setting < RailsSettings::Base
  field :redis_url, type: :string,
    default: ENV["REDIS_URL"] || "redis://localhost:6379/0"

-  field :s3_enabled, type: :boolean,
-    default: ENV["S3_ENABLED"] && ENV["S3_ENABLED"].to_s != "false"
-
  #
  # Registrations
  #
@@ -160,20 +157,7 @@ class Setting < RailsSettings::Base
  # Nostr
  #

-  field :nostr_enabled, type: :boolean,
-    default: ENV["NOSTR_PRIVATE_KEY"].present?
-
-  field :nostr_private_key, type: :string,
-    default: ENV["NOSTR_PRIVATE_KEY"].presence
-
-  field :nostr_public_key, type: :string,
-    default: ENV["NOSTR_PUBLIC_KEY"].presence
-
-  field :nostr_relay_url, type: :string,
-    default: ENV["NOSTR_RELAY_URL"].presence
-
-  field :nostr_zaps_relay_limit, type: :integer,
-    default: 12
+  field :nostr_enabled, type: :boolean, default: false

  #
  # OpenCollective
@@ -219,9 +203,4 @@ class Setting < RailsSettings::Base
  #
  # field :email_imap_port, type: :string,
  #   default: ENV["EMAIL_IMAP_PORT"].presence || 993
-
-  def self.default_services
-    # TODO Make configurable from respective service settings page
-    %w[ discourse gitea mastodon mediawiki xmpp ]
-  end
 end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -17,15 +17,16 @@ class User < ApplicationRecord
  has_one  :invitation, inverse_of: :invitee, foreign_key: 'invited_user_id'
  has_one  :inviter, through: :invitation, source: :user
  has_many :invitees, through: :invitations
+
  has_many :donations, dependent: :nullify
-  has_many :remote_storage_authorizations
-  has_many :zaps

  has_one  :lndhub_user, class_name: "LndhubUser", inverse_of: "user",
                         primary_key: "ln_account", foreign_key: "login"

  has_many :accounts, through: :lndhub_user

+  has_many :remote_storage_authorizations
+
  #
  # Validations
  #
@@ -49,6 +50,8 @@ class User < ApplicationRecord
  validates_length_of :display_name, minimum: 3, maximum: 35, allow_blank: true,
                                     if: -> { defined?(@display_name) }

+  validates_uniqueness_of :nostr_pubkey, allow_blank: true
+
  validate :acceptable_avatar

  #
@@ -92,7 +95,9 @@ class User < ApplicationRecord
      LdapManager::UpdateEmail.call(dn: self.dn, address: self.email)
    else
      # E-Mail from signup confirmed (i.e. account activation)
-      enable_default_services
+
+      # TODO Make configurable, only activate globally enabled services
+      enable_service %w[ discourse gitea mediawiki xmpp ]

      # TODO enable in development when we have easy setup of ejabberd etc.
      return if Rails.env.development? || !Setting.ejabberd_enabled?
@@ -130,7 +135,7 @@ class User < ApplicationRecord

  def mastodon_address
    return nil unless Setting.mastodon_enabled?
-    "#{self.cn.gsub("-", "_")}@#{Setting.mastodon_address_domain}"
+    "#{self.cn}@#{Setting.mastodon_address_domain}"
  end

  def valid_attribute?(attribute_name)
@@ -138,8 +143,10 @@ class User < ApplicationRecord
    self.errors[attribute_name].blank?
  end

-  def enable_default_services
-    enable_service Setting.default_services
+  def ln_create_invoice(payload)
+    lndhub = Lndhub.new
+    lndhub.authenticate self
+    lndhub.addinvoice payload
  end

  def dn
@@ -156,45 +163,37 @@ class User < ApplicationRecord
    @display_name ||= ldap_entry[:display_name]
  end

-  def nostr_pubkey
-    @nostr_pubkey ||= ldap_entry[:nostr_key]
-  end
-
-  def nostr_pubkey_bech32
-    return nil unless nostr_pubkey.present?
-    Nostr::PublicKey.new(nostr_pubkey).to_bech32
-  end
-
  def avatar
    @avatar_base64 ||= LdapManager::FetchAvatar.call(cn: cn)
  end

  def services_enabled
-    ldap_entry[:services_enabled] || []
-  end
-
-  def service_enabled?(name)
-    services_enabled.map(&:to_sym).include?(name.to_sym)
+    ldap_entry[:service] || []
  end

  def enable_service(service)
    current_services = services_enabled
    new_services = Array(service).map(&:to_s)
    services = (current_services + new_services).uniq
-    ldap.replace_attribute(dn, :serviceEnabled, services)
+    ldap.replace_attribute(dn, :service, services)
  end

  def disable_service(service)
    current_services = services_enabled
    disabled_services = Array(service).map(&:to_s)
    services = (current_services - disabled_services).uniq
-    ldap.replace_attribute(dn, :serviceEnabled, services)
+    ldap.replace_attribute(dn, :service, services)
  end

  def disable_all_services
    ldap.delete_attribute(dn,:service)
  end

+  def nostr_pubkey_bech32
+    return nil unless nostr_pubkey.present?
+    Nostr::PublicKey.new(nostr_pubkey).to_bech32
+  end
+
  private

    def ldap
--- a/app/models/user_preferences.rb
+++ b/app/models/user_preferences.rb
@@ -26,8 +26,4 @@ class UserPreferences
    end
    hash.stringify_keys!.to_h
  end
-
-  def self.pref_keys
-    DEFAULT_PREFS.keys.map(&:to_sym)
-  end
 end
--- a/app/models/zap.rb
+++ b/app/models/zap.rb
@@ -1,20 +0,0 @@
-class Zap < ApplicationRecord
-  belongs_to :user
-
-  scope :settled, -> { where.not(settled_at: nil) }
-  scope :unpaid, -> { where(settled_at: nil) }
-
-  def request_event
-    nostr_event_from_hash(request)
-  end
-
-  def receipt_event
-    nostr_event_from_hash(receipt)
-  end
-
-  private
-
-    def nostr_event_from_hash(hash)
-      Nostr::Event.new(**hash.symbolize_keys)
-    end
-end
--- a/app/services/app_catalog_manager/update_metadata.rb
+++ b/app/services/app_catalog_manager/update_metadata.rb
@@ -18,10 +18,6 @@ module AppCatalogManager
        @app.metadata[prop] = metadata.send(prop) if prop
      end

-      @app.save!
-
-      # TODO move icon downloads to separate, async job
-
      if icon = metadata.select_icon(sizes: "256x256") ||
         icon = metadata.select_icon(sizes: "192x192")
        attach_remote_image(:icon, icon)
@@ -31,6 +27,8 @@ module AppCatalogManager
      if apple_touch_icon = metadata.select_icon(purpose: "apple-touch-icon")
        attach_remote_image(:apple_touch_icon, apple_touch_icon)
      end
+
+      @app.save!
    rescue Manifique::Error => e
      msg = "Fetching web app manifest failed for #{e.url}: #{e.type}"
      Rails.logger.warn(msg)
@@ -44,19 +42,14 @@ module AppCatalogManager
      else
        download_url = "#{@app.url}/#{icon["src"].gsub(/^\//,'')}"
      end
-      filename = "#{attachment_name}-#{Time.now.to_i}.png"
-      key = "web_apps/#{@app.id}/icons/#{filename}"
+      filename = "#{attachment_name}.png"
+      key = "web_apps/#{@app.id}/icons/#{attachment_name}.png"

      begin
        tempfile = Down.download(download_url)
        @app.send(attachment_name).attach(key: key, io: tempfile, filename: filename)
      rescue Down::NotFound
-        msg = "Download of \"#{attachment_name}\" failed: NotFound error for #{download_url}"
-        Rails.logger.warn(msg)
-        Sentry.capture_message(msg)
-      rescue => e
-        Rails.logger.warn "Saving attachment \"#{attachment_name}\" failed: \"#{e.message}\""
-        Sentry.capture_exception(e) if Setting.sentry_enabled?
+        Rails.logger.warn "Icon download failed: NotFound error for #{download_url}"
      end
    end
  end
--- a/app/services/create_account.rb
+++ b/app/services/create_account.rb
@@ -35,15 +35,11 @@ class CreateAccount < ApplicationService
    @invitation.update! invited_user_id: user_id, used_at: DateTime.now
  end

+  # TODO move to confirmation
+  # (and/or add email_confirmed to entry and use in login filter)
  def add_ldap_document
    hashed_pw = Devise.ldap_auth_password_builder.call(@password)
-    CreateLdapUserJob.perform_later(
-      username: @username,
-      domain: @domain,
-      email: @email,
-      hashed_pw: hashed_pw,
-      confirmed: @confirmed
-    )
+    CreateLdapUserJob.perform_later(@username, @domain, @email, hashed_pw)
  end

  def create_lndhub_account(user)
--- a/app/services/ldap_manager/fetch_avatar.rb
+++ b/app/services/ldap_manager/fetch_avatar.rb
@@ -9,7 +9,7 @@ module LdapManager
      attributes = %w{ jpegPhoto }
      filter     = Net::LDAP::Filter.eq("cn", @cn)

-      entry = client.search(base: treebase, filter: filter, attributes: attributes).first
+      entry = ldap_client.search(base: treebase, filter: filter, attributes: attributes).first
      entry.try(:jpegPhoto) ? entry.jpegPhoto.first : nil
    end
  end
--- a/app/services/ldap_manager/fetch_user_by_nostr_key.rb
+++ b/app/services/ldap_manager/fetch_user_by_nostr_key.rb
@@ -1,18 +0,0 @@
-module LdapManager
-  class FetchUserByNostrKey < LdapManagerService
-    def initialize(pubkey:)
-      @ou = Setting.primary_domain
-      @pubkey = pubkey
-    end
-
-    def call
-      treebase   = "ou=#{@ou},cn=users,#{ldap_suffix}"
-      attributes = %w{ cn }
-      filter     = Net::LDAP::Filter.eq("nostrKey", @pubkey)
-
-      entry = client.search(base: treebase, filter: filter, attributes: attributes).first
-
-      User.find_by cn: entry.cn, ou: @ou  unless entry.nil?
-    end
-  end
-end
--- a/app/services/ldap_manager/update_nostr_key.rb
+++ b/app/services/ldap_manager/update_nostr_key.rb
@@ -1,16 +0,0 @@
-module LdapManager
-  class UpdateNostrKey < LdapManagerService
-    def initialize(dn:, pubkey:)
-      @dn = dn
-      @pubkey = pubkey
-    end
-
-    def call
-      if @pubkey.present?
-        replace_attribute @dn, :nostrKey, @pubkey
-      else
-        delete_attribute @dn, :nostrKey
-      end
-    end
-  end
-end
--- a/app/services/ldap_manager_service.rb
+++ b/app/services/ldap_manager_service.rb
@@ -1,2 +1,5 @@
 class LdapManagerService < LdapService
+  def suffix
+    @suffix ||= ENV["LDAP_SUFFIX"] || "dc=kosmos,dc=org"
+  end
 end
--- a/app/services/ldap_service.rb
+++ b/app/services/ldap_service.rb
@@ -1,47 +1,41 @@
 class LdapService < ApplicationService
-  def modify(dn, operations=[])
-    client.modify dn: dn, operations: operations
-    client.get_operation_result.code
+  def initialize
+    @suffix = ENV["LDAP_SUFFIX"] || "dc=kosmos,dc=org"
  end

  def add_attribute(dn, attr, values)
-    client.add_attribute dn, attr, values
-    client.get_operation_result.code
+    ldap_client.add_attribute dn, attr, values
  end

  def replace_attribute(dn, attr, values)
-    client.replace_attribute dn, attr, values
-    client.get_operation_result.code
+    ldap_client.replace_attribute dn, attr, values
  end

  def delete_attribute(dn, attr)
-    client.delete_attribute dn, attr
-    client.get_operation_result.code
+    ldap_client.delete_attribute dn, attr
  end

  def add_entry(dn, attrs, interactive=false)
-    puts "Add entry: #{dn}" if interactive
-    client.add dn: dn, attributes: attrs
-    client.get_operation_result.code
+    puts "Adding entry: #{dn}" if interactive
+    res = ldap_client.add dn: dn, attributes: attrs
+    puts res.inspect if interactive && !res
+    res
  end

  def delete_entry(dn, interactive=false)
-    puts "Delete entry: #{dn}" if interactive
-    client.delete dn: dn
-    client.get_operation_result.code
+    puts "Deleting entry: #{dn}" if interactive
+    res = ldap_client.delete dn: dn
+    puts res.inspect if interactive && !res
+    res
  end

-  def delete_all_users!
-    delete_all_entries!(objectclass: "person")
-  end
-
-  def delete_all_entries!(objectclass: "*")
+  def delete_all_entries!
    if Rails.env.production?
      raise "Mass deletion of entries not allowed in production"
    end

-    filter  = Net::LDAP::Filter.eq("objectClass", objectclass)
-    entries = client.search(base: ldap_suffix, filter: filter, attributes: %w{dn})
+    filter  = Net::LDAP::Filter.eq("objectClass", "*")
+    entries = ldap_client.search(base: @suffix, filter: filter, attributes: %w{dn})
    entries.sort_by!{ |e| e.dn.length }.reverse!

    entries.each do |e|
@@ -51,18 +45,18 @@ class LdapService < ApplicationService

  def fetch_users(args={})
    if args[:ou]
-      treebase = "ou=#{args[:ou]},cn=users,#{ldap_suffix}"
+      treebase = "ou=#{args[:ou]},cn=users,#{@suffix}"
    else
      treebase = ldap_config["base"]
    end

    attributes = %w[
-      dn cn uid mail displayName admin serviceEnabled
-      mailRoutingAddress mailpassword nostrKey
+      dn cn uid mail displayName admin service
+      mailRoutingAddress mailpassword
    ]
    filter = Net::LDAP::Filter.eq("uid", args[:uid] || "*")

-    entries = client.search(base: treebase, filter: filter, attributes: attributes)
+    entries = ldap_client.search(base: treebase, filter: filter, attributes: attributes)
    entries.sort_by! { |e| e.cn[0] }
    entries = entries.collect do |e|
      {
@@ -70,10 +64,9 @@ class LdapService < ApplicationService
        mail: e.try(:mail) ? e.mail.first : nil,
        display_name: e.try(:displayName) ? e.displayName.first : nil,
        admin: e.try(:admin) ? 'admin' : nil,
-        services_enabled: e.try(:serviceEnabled),
+        service: e.try(:service),
        email_maildrop: e.try(:mailRoutingAddress),
-        email_password: e.try(:mailpassword),
-        nostr_key: e.try(:nostrKey) ? e.nostrKey.first : nil
+        email_password: e.try(:mailpassword)
      }
    end
  end
@@ -82,9 +75,9 @@ class LdapService < ApplicationService
    attributes = %w{dn ou description}
    filter     = Net::LDAP::Filter.eq("objectClass", "organizationalUnit")
    # filter     = Net::LDAP::Filter.eq("objectClass", "*")
-    treebase   = "cn=users,#{ldap_suffix}"
+    treebase   = "cn=users,#{@suffix}"

-    entries = client.search(base: treebase, filter: filter, attributes: attributes)
+    entries = ldap_client.search(base: treebase, filter: filter, attributes: attributes)

    entries.sort_by! { |e| e.ou[0] }

@@ -98,10 +91,10 @@ class LdapService < ApplicationService
  end

  def add_organization(ou, description, interactive=false)
-    dn = "ou=#{ou},cn=users,#{ldap_suffix}"
+    dn = "ou=#{ou},cn=users,#{@suffix}"

    aci = <<-EOS
-(target="ldap:///cn=*,ou=#{ou},cn=users,#{ldap_suffix}")(targetattr="cn || sn || uid || userPassword || mail || mailRoutingAddress || serviceEnabled || nostrKey || nsRole || objectClass") (version 3.0; acl "service-#{ou.gsub(".", "-")}-read-search"; allow (read,search) userdn="ldap:///uid=service,ou=#{ou},cn=applications,#{ldap_suffix}";)
+(target="ldap:///cn=*,ou=#{ou},cn=users,#{@suffix}")(targetattr="cn || sn || uid || mail || userPassword || nsRole || objectClass") (version 3.0; acl "service-#{ou.gsub(".", "-")}-read-search"; allow (read,search) userdn="ldap:///uid=service,ou=#{ou},cn=applications,#{@suffix}";)
    EOS

    attrs = {
@@ -122,22 +115,22 @@ class LdapService < ApplicationService
    delete_all_entries!

    user_read_aci = <<-EOS
-(target="ldap:///#{ldap_suffix}")(targetattr="*") (version 3.0; acl "user-read-search-own-attributes"; allow (read,search) userdn="ldap:///self";)
+(target="ldap:///#{@suffix}")(targetattr="*") (version 3.0; acl "user-read-search-own-attributes"; allow (read,search) userdn="ldap:///self";)
    EOS

-    add_entry ldap_suffix, {
+    add_entry @suffix, {
      dc: "kosmos", objectClass: ["top", "domain"], aci: user_read_aci
    }, true

-    add_entry "cn=users,#{ldap_suffix}", {
+    add_entry "cn=users,#{@suffix}", {
       cn: "users", objectClass: ["top", "organizationalRole"]
    }, true
  end

  private

-  def client
-    client ||= Net::LDAP.new host: ldap_config['host'],
+  def ldap_client
+    ldap_client ||= Net::LDAP.new host: ldap_config['host'],
      port: ldap_config['port'],
      # TODO has to be :simple_tls if TLS is enabled
      # encryption: ldap_config['ssl'],
@@ -151,8 +144,4 @@ class LdapService < ApplicationService
  def ldap_config
    ldap_config ||= YAML.load(ERB.new(File.read("#{Rails.root}/config/ldap.yml")).result)[Rails.env]
  end
-
-  def ldap_suffix
-    @ldap_suffix ||= ENV["LDAP_SUFFIX"] || "dc=kosmos,dc=org"
-  end
 end
--- a/app/services/lndhub_manager/create_user_invoice.rb
+++ b/app/services/lndhub_manager/create_user_invoice.rb
@@ -1,13 +0,0 @@
-module LndhubManager
-  class CreateUserInvoice < LndhubV2
-    def initialize(user:, payload:)
-      @user = user
-      @payload = payload
-    end
-
-    def call
-      authenticate @user
-      create_invoice @payload
-    end
-  end
-end
--- a/app/services/nostr_manager/create_zap_receipt.rb
+++ b/app/services/nostr_manager/create_zap_receipt.rb
@@ -1,25 +0,0 @@
-module NostrManager
-  class CreateZapReceipt < NostrManagerService
-    def initialize(zap:, paid_at:, preimage:)
-      @zap, @paid_at, @preimage = zap, paid_at, preimage
-    end
-
-    def call
-      request_tags = parse_tags(@zap.request_event.tags)
-
-      site_user.create_event(
-        kind: 9735,
-        created_at: @paid_at,
-        content: "",
-        tags: [
-          ["p", request_tags[:p].first],
-          ["e", request_tags[:e]&.first],
-          ["a", request_tags[:a]&.first],
-          ["bolt11", @zap.payment_request],
-          ["preimage", @preimage],
-          ["description", @zap.request_event.to_json]
-        ].reject { |t| t[1].nil? }
-      )
-    end
-  end
-end
--- a/app/services/nostr_manager/publish_event.rb
+++ b/app/services/nostr_manager/publish_event.rb
@@ -1,50 +0,0 @@
-module NostrManager
-  class PublishEvent < NostrManagerService
-    def initialize(event:, relay_url:)
-      relay_name = URI.parse(relay_url).host
-      @relay = Nostr::Relay.new(url: relay_url, name: relay_name)
-
-      if event.is_a?(Nostr::Event)
-        @event = event
-      else
-        @event = Nostr::Event.new(**event.symbolize_keys)
-      end
-
-      @client = Nostr::Client.new
-    end
-
-    def call
-      client, relay, event = @client, @relay, @event
-      log_prefix = "[nostr][#{relay.name}]"
-
-      thread = Thread.new do
-        client.on :connect do
-          puts "#{log_prefix} Publishing #{event.id}..."
-          client.publish event
-        end
-
-        client.on :error do |e|
-          puts "#{log_prefix} Error: #{e}"
-          puts "#{log_prefix} Closing thread..."
-          thread.exit
-        end
-
-        client.on :message do |m|
-          puts "#{log_prefix} Message: #{m}"
-          msg = JSON.parse(m) rescue []
-          if msg[0] == "OK" && msg[1] == event.id && msg[2]
-            puts "#{log_prefix} Event published. Closing thread..."
-          else
-            puts "#{log_prefix} Unexpected message from relay. Closing thread..."
-          end
-          thread.exit
-        end
-
-        puts "#{log_prefix} Connecting to #{relay.url}..."
-        client.connect relay
-      end
-
-      thread.join
-    end
-  end
-end
--- a/app/services/nostr_manager/publish_zap_receipt.rb
+++ b/app/services/nostr_manager/publish_zap_receipt.rb
@@ -1,24 +0,0 @@
-module NostrManager
-  class PublishZapReceipt < NostrManagerService
-    def initialize(zap:, delayed: true)
-      @zap, @delayed = zap, delayed
-    end
-
-    def call
-      tags = parse_tags(@zap.request_event.tags)
-      relays = tags[:relays].take(Setting.nostr_zaps_relay_limit)
-
-      if Setting.nostr_relay_url.present?
-        relays << Setting.nostr_relay_url
-      end
-
-      relays.uniq.each do |relay_url|
-        if @delayed
-          NostrPublishEventJob.perform_later(event: @zap.receipt, relay_url: relay_url)
-        else
-          NostrManager::PublishEvent.call(event: @zap.receipt_event, relay_url: relay_url)
-        end
-      end
-    end
-  end
-end
--- a/app/services/nostr_manager/validate_id.rb
+++ b/app/services/nostr_manager/validate_id.rb
@@ -0,0 +1,11 @@
+module NostrManager
+  class ValidateId < NostrManagerService
+    def initialize(event:)
+      @event = Nostr::Event.new(**event)
+    end
+
+    def call
+      @event.id == Digest::SHA256.hexdigest(JSON.generate(@event.serialize))
+    end
+  end
+end
--- a/app/services/nostr_manager/verify_auth.rb
+++ b/app/services/nostr_manager/verify_auth.rb
@@ -1,18 +0,0 @@
-module NostrManager
-  class VerifyAuth < NostrManagerService
-    def initialize(event:, challenge:)
-      @event = event
-      @challenge_expected = challenge
-      @site_expected = Setting.accounts_domain
-    end
-
-    def call
-      tags            = parse_tags(@event.tags)
-      site_given      = tags[:site].first
-      challenge_given = tags[:challenge].first
-
-      site_given == @site_expected &&
-      challenge_given == @challenge_expected
-    end
-  end
-end
--- a/app/services/nostr_manager/verify_signature.rb
+++ b/app/services/nostr_manager/verify_signature.rb
@@ -0,0 +1,17 @@
+module NostrManager
+  class VerifySignature < NostrManagerService
+    def initialize(event:)
+      @event = Nostr::Event.new(**event)
+    end
+
+    def call
+      Schnorr.check_sig!(
+        [@event.id].pack('H*'),
+        [@event.pubkey].pack('H*'),
+        [@event.sig].pack('H*')
+      )
+    rescue Schnorr::InvalidSignatureError
+      false
+    end
+  end
+end
--- a/app/services/nostr_manager/verify_zap_request.rb
+++ b/app/services/nostr_manager/verify_zap_request.rb
@@ -1,51 +0,0 @@
-module NostrManager
-  class VerifyZapRequest < NostrManagerService
-    def initialize(amount:, event:, lnurl: nil)
-      @amount, @event, @lnurl = amount, event, lnurl
-    end
-
-    # https://github.com/nostr-protocol/nips/blob/27fef638e2460139cc9078427a0aec0ce4470517/57.md#appendix-d-lnurl-server-zap-request-validation
-    def call
-      tags = parse_tags(@event.tags)
-
-      @event.verify_signature &&
-      @event.kind == 9734 &&
-      tags.present? &&
-      valid_p_tag?(tags[:p]) &&
-      valid_e_tag?(tags[:e]) &&
-      valid_a_tag?(tags[:a]) &&
-      valid_amount_tag?(tags[:amount]) &&
-      valid_lnurl_tag?(tags[:lnurl])
-    end
-
-    def valid_p_tag?(tag)
-      return false unless tag.present? && tag.length == 1
-      key = Nostr::PublicKey.new(tag.first) rescue nil
-      key.present?
-    end
-
-    def valid_e_tag?(tag)
-      return true unless tag.present?
-      # TODO validate format of event ID properly
-      tag.length == 1 && tag.first.is_a?(String)
-    end
-
-    def valid_a_tag?(tag)
-      return true unless tag.present?
-      # TODO validate format of event coordinate properly
-      tag.length == 1 && tag.first.is_a?(String)
-    end
-
-    def valid_amount_tag?(tag)
-      return true unless tag.present?
-      amount = tag.first
-      amount.is_a?(String) && amount.to_i == @amount
-    end
-
-    def valid_lnurl_tag?(tag)
-      return true unless tag.present?
-      # TODO validate lnurl matching recipient's lnurlp
-      tag.first.is_a?(String)
-    end
-  end
-end
--- a/app/services/nostr_manager_service.rb
+++ b/app/services/nostr_manager_service.rb
@@ -1,22 +1,4 @@
 require "nostr"

 class NostrManagerService < ApplicationService
-  def parse_tags(tags)
-    out = {}
-    tags.each do |tag|
-      out[tag[0].to_sym] = tag[1, tag.length]
-    end
-    out
-  end
-
-  def site_keypair
-    Nostr::KeyPair.new(
-      private_key: Nostr::PrivateKey.new(Setting.nostr_private_key),
-      public_key: Nostr::PublicKey.new(Setting.nostr_public_key)
-    )
-  end
-
-  def site_user
-    Nostr::User.new(keypair: site_keypair)
-  end
 end
--- a/app/views/admin/donations/index.html.erb
+++ b/app/views/admin/donations/index.html.erb
@@ -35,7 +35,7 @@
      <tbody>
        <% @donations.each do |donation| %>
          <tr>
-            <td><%= link_to donation.user.cn, admin_user_path(donation.user.cn), class: 'ks-text-link' %></td>
+            <td><%= link_to donation.user.address, admin_user_path(donation.user.address), class: 'ks-text-link' %></td>
            <td class="text-right"><% if donation.amount_sats.present? %><%= number_with_delimiter donation.amount_sats %><% end %></td>
            <td class="text-right"><% if donation.fiat_amount.present? %><%= number_to_currency donation.fiat_amount.to_f / 100, unit: "" %> <%= donation.fiat_currency %><% end %></td>
            <td class="pl-2"><%= donation.public_name %></td>
--- a/app/views/admin/donations/show.html.erb
+++ b/app/views/admin/donations/show.html.erb
@@ -6,7 +6,7 @@
      <tbody>
        <tr>
          <th>User</th>
-          <td><%= link_to @donation.user.cn, admin_user_path(@donation.user.cn), class: 'ks-text-link' %></td>
+          <td><%= link_to @donation.user.address, admin_user_path(@donation.user.address), class: 'ks-text-link' %></td>
        </tr>
        <tr>
          <th>Donation Method</th>
--- a/app/views/admin/invitations/index.html.erb
+++ b/app/views/admin/invitations/index.html.erb
@@ -38,8 +38,8 @@
            <tr>
              <td class="overflow-ellipsis font-mono"><%= invitation.token %></td>
              <td><%= invitation.used_at.strftime("%Y-%m-%d (%H:%M UTC)") %></td>
-              <td><%= link_to invitation.user.cn, admin_user_path(invitation.user.cn), class: "ks-text-link" %></td>
-              <td><%= link_to invitation.invitee.cn, admin_user_path(invitation.invitee.cn), class: "ks-text-link" %></td>
+              <td><%= link_to invitation.user.address, admin_user_path(invitation.user.address), class: "ks-text-link" %></td>
+              <td><%= link_to invitation.invitee.address, admin_user_path(invitation.invitee.address), class: "ks-text-link" %></td>
            </tr>
          <% end %>
        </tbody>
--- a/app/views/admin/lightning/index.html.erb
+++ b/app/views/admin/lightning/index.html.erb
@@ -36,7 +36,7 @@
            </td>
            <td>
              <% if user = @users.find{ |u| u[2] == account.login } %>
-                <%= link_to user[0], admin_user_path(user[0]), class: "ks-text-link" %>
+                <%= link_to "#{user[0]}@#{user[1]}", admin_user_path("#{user[0]}@#{user[1]}"), class: "ks-text-link" %>
              <% end %>
            </td>
            <td><%= number_with_delimiter account.balance.to_i.to_s %></td>
--- a/app/views/admin/settings/registrations/index.html.erb
+++ b/app/views/admin/settings/registrations/index.html.erb
@@ -1,7 +1,7 @@
 <%= render HeaderComponent.new(title: "Settings") %>

 <%= render MainWithSidenavComponent.new(sidenav_partial: 'shared/admin_sidenav_settings') do %>
-  <%= form_for(Setting.new, url: admin_settings_registrations_path, method: :put) do |f| %>
+  <%= form_for(Setting.new, url: admin_settings_registrations_path) do |f| %>
    <section>
      <h3>Registrations</h3>

--- a/app/views/admin/settings/services/_nostr.html.erb
+++ b/app/views/admin/settings/services/_nostr.html.erb
@@ -7,32 +7,4 @@
    title: "Enable Nostr integration (experimental)",
    description: "Allow adding nostr pubkeys and resolve user addresses via NIP-05"
  ) %>
-<% if Setting.nostr_enabled? %>
-  <%= render FormElements::FieldsetResettableSettingComponent.new(
-        key: :nostr_private_key,
-        type: :password,
-        title: "Private key",
-        description: "The private key of the accounts service, used when publishing events (e.g. zap receipts)"
-      ) %>
-  <%= render FormElements::FieldsetResettableSettingComponent.new(
-        key: :nostr_public_key,
-        title: "Public key",
-        description: "The corresponding public key of the accounts service"
-      ) %>
-  <%= render FormElements::FieldsetResettableSettingComponent.new(
-        key: :nostr_relay_url,
-        title: "Relay URL",
-        description: "Websockets URL of a relay associated with #{Setting.primary_domain}"
-      ) %>
 </ul>
-</section>
-<section>
-<h3>Zaps</h3>
-<ul role="list">
-  <%= render FormElements::FieldsetResettableSettingComponent.new(
-        key: :nostr_zaps_relay_limit,
-        title: "Relay limit",
-        description: "The maximum number of relays to publish zap receipts to"
-      ) %>
-</ul>
-<% end %>
--- a/app/views/admin/settings/services/index.html.erb
+++ b/app/views/admin/settings/services/index.html.erb
@@ -1,7 +1,9 @@
 <%= render HeaderComponent.new(title: "Settings") %>

 <%= render MainWithSidenavComponent.new(sidenav_partial: 'shared/admin_sidenav_settings') do %>
-  <%= form_for(Setting.new, url: admin_settings_service_path(@service), method: :put) do |f| %>
+  <%= form_for(Setting.new, url: admin_settings_services_path) do |f| %>
+    <%= hidden_field_tag :service, @service %>
+
    <% if @errors && @errors.any? %>
      <section>
        <%= render partial: "admin/settings/errors", locals: { errors: @errors } %>
--- a/app/views/admin/users/show.html.erb
+++ b/app/views/admin/users/show.html.erb
@@ -36,7 +36,7 @@
            <th>Invited by</th>
            <td>
            <% if @user.inviter %>
-              <%= link_to @user.inviter.cn, admin_user_path(@user.inviter.cn), class: 'ks-text-link' %>
+              <%= link_to @user.inviter.address, admin_user_path(@user.inviter.address), class: 'ks-text-link' %>
            <% else %>&mdash;<% end %>
            </td>
          </tr>
@@ -78,7 +78,7 @@
            <% if @user.invitees.length > 0 %>
              <ul class="mb-0">
              <% @user.invitees.order(cn: :asc).each do |invitee| %>
-                <li class="leading-none mb-2 last:mb-0"><%= link_to invitee.cn, admin_user_path(invitee.cn), class: 'ks-text-link' %></li>
+                <li class="leading-none mb-2 last:mb-0"><%= link_to invitee.address, admin_user_path(invitee.address), class: 'ks-text-link' %></li>
              <% end %>
              </ul>
            <% else %>&mdash;<% end %>
@@ -124,19 +124,6 @@
          </td>
        </tr>
        <% end %>
-        <% if Setting.email_enabled %>
-        <tr>
-          <td>E-Mail</td>
-          <td>
-            <%= render FormElements::ToggleComponent.new(
-              enabled: Flipper.enabled?(:email, current_user),
-              input_enabled: false
-            ) %>
-          </td>
-          <td class="text-right">
-          </td>
-        </tr>
-        <% end %>
        <% if Setting.gitea_enabled %>
        <tr>
          <td>Gitea</td>
@@ -195,33 +182,6 @@
          </td>
        </tr>
        <% end %>
-        <% if Setting.nostr_enabled %>
-        <tr>
-          <td>Nostr</td>
-          <td>
-            <%= render FormElements::ToggleComponent.new(
-              enabled: @user.nostr_pubkey.present?,
-              input_enabled: false
-            ) %>
-          </td>
-          <td class="text-right">
-            <%= link_to "Open profile", "https://njump.me/#{@user.nostr_pubkey_bech32}", class: "btn-sm btn-gray" %>
-          </td>
-        </tr>
-        <% end %>
-        <% if Setting.remotestorage_enabled %>
-        <tr>
-          <td>remoteStorage</td>
-          <td>
-            <%= render FormElements::ToggleComponent.new(
-              enabled: Flipper.enabled?(:remotestorage, current_user) && @services_enabled.include?("remotestorage"),
-              input_enabled: false
-            ) %>
-          </td>
-          <td class="text-right">
-          </td>
-        </tr>
-        <% end %>
      </tbody>
    </table>
  </section>
--- a/app/views/contributions/projects/index.html.erb
+++ b/app/views/contributions/projects/index.html.erb
@@ -16,8 +16,8 @@
    <p>
      There's something to do for everyone, especially non-programmers! For
      example, we need more help with graphics, UI/UX design, and
-      content/copywriting. Also, testing any of our software and reporting
-      issues you encounter along the way is very valuable.
+      content/copywriting. We also need moderators for social media. And beta
+      testers for our software. The list doesn't end there.
    </p>
    <p>
      A good way to get started is to join one of our
@@ -43,7 +43,7 @@
    </p>
    <p>
      We have run two 6-month trials so far, with the next trial period
-      starting sometime soon. Watch your email for notifications about it!
+      starting sometime in Q1 2024. Watch your email for notifications about it!
    </p>
  </section>
 <% end %>
--- a/app/views/dashboard/index.html.erb
+++ b/app/views/dashboard/index.html.erb
@@ -5,7 +5,7 @@
    <div class="services grid grid-cols-1 sm:grid-cols-2 gap-4 sm:gap-6">
      <% if Setting.ejabberd_enabled? %>
        <div class="border border-gray-300 rounded-md hover:border-gray-400
-                    bg-[length:86%] bg-[center_top_-40px] bg-no-repeat
+                    bg-cover bg-[center_top_-50px] bg-no-repeat
                    bg-[url(/img/logos/icon_xmpp.svg)]">
          <%= link_to services_chat_path,
                class: "block h-full px-6 py-6 rounded-md" do %>
@@ -18,7 +18,7 @@
      <% end %>
      <% if Setting.mastodon_enabled? %>
        <div class="border border-gray-300 rounded-md hover:border-gray-400
-                    bg-[length:88%] bg-[center_top_-40px] bg-no-repeat
+                    bg-[length:80%] bg-[right_top_-30px] bg-no-repeat
                    bg-[url(/img/logos/icon_mastodon.svg)]">
          <%= link_to services_mastodon_path, class: "block h-full px-6 py-6 rounded-md" do %>
            <h3 class="mb-3.5">Mastodon</h3>
@@ -30,9 +30,7 @@
      <% end %>
      <% if Setting.email_enabled? &&
            Flipper.enabled?(:email, current_user) %>
-        <div class="border border-gray-300 rounded-md hover:border-gray-400
-                    bg-[length:90%] bg-[center_top_-160px] bg-no-repeat
-                    bg-[url(/img/logos/icon_mail.svg)]">
+        <div class="border border-gray-300 rounded-md hover:border-gray-400">
          <%= link_to services_email_path, class: "block h-full px-6 py-6 rounded-md" do %>
            <h3 class="mb-3.5">E-Mail</h3>
            <p class="text-gray-600">
@@ -41,16 +39,15 @@
          <% end %>
        </div>
      <% end %>
-      <% if Setting.remotestorage_enabled? &&
-            Flipper.enabled?(:remotestorage, current_user) %>
+      <% if Setting.discourse_enabled? %>
        <div class="border border-gray-300 rounded-md hover:border-gray-400
-                    bg-[length:80%] bg-[center_top_-156px] bg-no-repeat
-                    bg-[url(/img/logos/icon_remotestorage.svg)]">
-          <%= link_to services_storage_path,
+                    bg-[length:95%] bg-center bg-no-repeat
+                    bg-[url(/img/logos/icon_discourse.svg)]">
+          <%= link_to "#{Setting.discourse_public_url}/session/sso?return_path=/",
                class: "block h-full px-6 py-6 rounded-md" do %>
-            <h3 class="mb-3.5">Storage</h3>
+            <h3 class="mb-3.5">Discourse</h3>
            <p class="text-gray-600">
-              Sync your data between apps and devices
+              Kosmos community forums and user support/help site
            </p>
          <% end %>
        </div>
@@ -68,22 +65,21 @@
          <% end %>
        </div>
      <% end %>
-      <% if Setting.discourse_enabled? %>
-        <div class="border border-gray-300 rounded-md hover:border-gray-400
-                    bg-[length:80%] bg-center bg-no-repeat
-                    bg-[url(/img/logos/icon_discourse.svg)]">
-          <%= link_to "#{Setting.discourse_public_url}/session/sso?return_path=/",
+      <% if Setting.remotestorage_enabled? &&
+            Flipper.enabled?(:remotestorage, current_user) %>
+        <div class="border border-gray-300 rounded-md hover:border-gray-400">
+          <%= link_to services_storage_path,
                class: "block h-full px-6 py-6 rounded-md" do %>
-            <h3 class="mb-3.5">Discourse</h3>
+            <h3 class="mb-3.5">Storage</h3>
            <p class="text-gray-600">
-              Community forums and support/help site
+              Sync your data between apps and devices
            </p>
          <% end %>
        </div>
      <% end %>
      <% if Setting.gitea_enabled? %>
        <div class="border border-gray-300 rounded-md hover:border-gray-400
-                    bg-[length:92%] bg-center bg-no-repeat
+                    bg-cover bg-center bg-no-repeat
                    bg-[url(/img/logos/icon_gitea.png)]">
          <%= link_to Setting.gitea_public_url,
                class: "block h-full px-6 py-6 rounded-md" do %>
@@ -96,7 +92,7 @@
      <% end %>
      <% if Setting.droneci_enabled? %>
        <div class="border border-gray-300 rounded-md hover:border-gray-400
-                    bg-[length:86%] bg-[center_top_-60px] bg-no-repeat
+                    bg-cover bg-[center_top_-70px] bg-no-repeat
                    bg-[url(/img/logos/icon_droneci.svg)]">
          <%= link_to Setting.droneci_public_url,
                class: "block h-full px-6 py-6 rounded-md" do %>
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,7 +1,6 @@
 <%
  # TODO remove when https://github.com/hotwired/turbo/issues/203 is fixed
-  enable_turbo = session[:user_return_to].blank? ||
-    ['/discourse/connect', '/rs/oauth'].none? { |s| session[:user_return_to].match(s) }
+  enable_turbo = !session[:user_return_to] || !session[:user_return_to].match?('/discourse/connect')
 %>

 <%= render HeaderCompactComponent.new(title: "Log in") %>
@@ -55,27 +54,4 @@
      <%= f.submit "Log in", class: 'btn-md btn-blue w-full', tabindex: "4" %>
    </p>
  <% end %>
-
-  <div data-controller="nostr-login"
-       data-nostr-login-target="loginForm"
-       data-nostr-login-site-value="<%= Setting.accounts_domain %>"
-       data-nostr-login-shared-secret-value="<%= session[:shared_secret] %>"
-       class="hidden">
-    <div class="relative my-6">
-      <div class="absolute inset-0 flex items-center" aria-hidden="true">
-        <div class="w-full border-t border-gray-200"></div>
-      </div>
-      <div class="relative flex justify-center">
-        <span class="bg-white px-2 text-sm text-gray-500 italic">or</span>
-      </div>
-    </div>
-    <p>
-      <button disabled tabindex="5"
-              class="w-full btn-md btn-gray text-purple-600"
-              data-nostr-login-target="loginButton"
-              data-action="nostr-login#login">
-        Log in with Nostr
-      </button>
-    </p>
-  </div>
 <% end %>
--- a/app/views/icons/_kebab-menu.html.erb
+++ b/app/views/icons/_kebab-menu.html.erb
--- a/app/views/icons/_nostrich-head.html.erb
+++ b/app/views/icons/_nostrich-head.html.erb
@@ -1,6 +0,0 @@
-<svg width="24" height="24" class="icon-nostrich-head <%= custom_class %>" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M3.03377 4.84648C2.38935 5.60878 1.88639 6.49681 1.5799 7.4713C3.32454 7.07836 5.64286 6.98406 6.95527 6.88189C7.36392 5.20013 8.52701 3.91915 10.476 4.0056C11.3169 4.04489 12.0556 4.58714 12.5664 5.42017C12.9436 5.01937 13.4466 4.75218 14.1146 4.65787C14.1617 4.65787 14.2639 4.65001 14.3425 4.65001C12.9593 3.14114 10.9868 2.18237 8.77849 2.18237C8.3777 2.18237 7.98476 2.22167 7.59183 2.28454C7.51324 2.28454 7.41108 2.30026 7.27748 2.33169C7.26962 2.33169 7.2539 2.33169 7.24604 2.33169C7.23818 2.33169 7.23032 2.33169 7.21461 2.33169C5.69001 2.70105 4.54264 2.40242 3.89037 1.51438C3.81964 1.42008 3.54458 1.00357 3.45814 0.272705C2.97876 0.767805 2.66441 1.58511 2.9316 2.45743C3.14379 3.149 3.54458 3.51836 3.97681 3.73054C3.31668 3.76984 2.76657 3.6441 2.21646 3.22759C1.89425 2.98396 1.68992 2.71677 1.352 2.01734C1.03765 2.51244 1.06909 3.06255 1.13195 3.34547C1.21054 3.72268 1.40701 4.14706 1.65849 4.39068C2.04357 4.76789 2.59368 4.85434 3.04162 4.84648H3.03377Z" fill="currentColor"/>
-  <path d="M10.4837 11.3458C11.4602 11.3458 12.2519 9.99116 12.2519 8.32016C12.2519 6.64917 11.4602 5.29456 10.4837 5.29456C9.50711 5.29456 8.71545 6.64917 8.71545 8.32016C8.71545 9.99116 9.50711 11.3458 10.4837 11.3458Z" fill="currentColor"/>
-  <path d="M14.3737 10.615C15.1376 10.615 15.7569 9.53831 15.7569 8.21019C15.7569 6.88207 15.1376 5.80542 14.3737 5.80542C13.6099 5.80542 12.9906 6.88207 12.9906 8.21019C12.9906 9.53831 13.6099 10.615 14.3737 10.615Z" fill="currentColor"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M7.52542 23.9833C7.53337 23.6314 7.66454 22.5232 8.7864 20.3047C9.2815 19.3381 10.4053 18.0021 11.2462 17.2791C11.6941 16.8862 12.1421 16.5561 12.5822 16.2496C12.8101 16.116 13.0222 15.9745 13.2266 15.8252C16.9076 13.5684 20.157 14.0396 22.8528 14.4306L22.9321 14.4421C22.9321 14.4421 23.5765 12.5246 20.9203 11.5344C19.4743 11 17.7689 10.5677 16.3465 10.2691C16.1422 10.6385 15.8828 10.9528 15.5763 11.1886C15.5721 11.1917 15.5678 11.195 15.5634 11.1983C15.3354 11.3696 14.795 11.7757 13.816 11.6601C13.313 11.5972 12.9279 11.3929 12.6215 11.0943C12.1028 11.9509 11.3562 12.5088 10.4917 12.5874C8.09483 12.7918 6.88458 10.7799 6.806 8.55591C5.00635 8.7288 2.55443 9.83688 1.24988 10.4813L1.25662 22.0396C2.92115 22.6846 5.41819 23.4807 7.52542 23.9833Z" fill="currentColor"/>
-</svg>
--- a/app/views/icons/_nostrich-n.html.erb
+++ b/app/views/icons/_nostrich-n.html.erb
@@ -1,3 +0,0 @@
-<svg width="24" height="24" class="icon-nostrich-n <%= custom_class %>" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M24 10.4604V23.135C24 23.6117 23.6161 23.9985 23.1429 23.9985H12.8578C12.3847 23.9985 12.0008 23.6117 12.0008 23.135V20.7746C12.0476 17.8812 12.3515 15.1096 12.9894 13.8487C13.3718 13.0904 14.0021 12.6777 14.7262 12.4569C16.0942 12.0426 18.4947 12.3259 19.5135 12.2772C19.5135 12.2772 22.5912 12.4005 22.5912 10.6447C22.5912 9.23147 21.2156 9.34264 21.2156 9.34264C19.6994 9.38223 18.5446 9.27868 17.7963 8.98173C16.5432 8.48528 16.5009 7.57462 16.4963 7.27005C16.4343 3.75228 11.2858 3.33046 6.74939 4.20305C1.78976 5.1533 6.80381 12.3152 6.80381 21.8756V23.1518C6.79474 23.6208 6.41834 24 5.94974 24H0.857089C0.383951 24 0 23.6132 0 23.1365V1.21523C0 0.738579 0.383951 0.351777 0.857089 0.351777H5.64439C6.11753 0.351777 6.50148 0.738579 6.50148 1.21523C6.50148 1.92335 7.29206 2.31777 7.86345 1.90508C9.58519 0.662437 11.7952 0 14.2682 0C19.8083 0 23.997 3.25279 23.997 10.4604H24ZM14.8033 7.88832C14.8033 6.86802 13.9825 6.04112 12.9697 6.04112C11.9569 6.04112 11.1361 6.86802 11.1361 7.88832C11.1361 8.90863 11.9569 9.73553 12.9697 9.73553C13.9825 9.73553 14.8033 8.90863 14.8033 7.88832Z" fill="currentColor"/>
-</svg>
--- a/app/views/icons/_nostrich.html.erb
+++ b/app/views/icons/_nostrich.html.erb
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" class="icon-nostrich <%= custom_class %>" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M17.7084 10.1607C18.1683 13.3466 14.8705 14.0207 12.9733 13.9618C12.8515 13.958 12.7366 14.0173 12.6647 14.1157C12.4684 14.384 12.1547 14.7309 11.9125 14.7309C11.6405 14.7309 11.3957 15.254 11.284 15.5795C11.2723 15.6137 11.3059 15.6452 11.3403 15.634C14.345 14.6584 15.5241 14.3238 16.032 14.4178C16.4421 14.4937 17.209 15.8665 17.5413 16.5434C16.7155 16.5909 16.4402 15.8507 16.2503 15.7178C16.0985 15.6116 16.0415 16.0974 16.032 16.3536C15.8517 16.2587 15.6239 16.1259 15.6049 15.7178C15.5859 15.3098 15.3771 15.4142 15.2157 15.4332C15.0544 15.4521 12.5769 16.2493 12.2067 16.3536C11.8366 16.458 11.4094 16.6004 11.0582 16.8471C10.4697 17.1318 10.09 16.9325 9.98561 16.4485C9.90208 16.0614 10.4444 14.8701 10.726 14.3229C10.3779 14.4526 9.65529 14.7158 9.54898 14.7309C9.44588 14.7457 8.13815 15.7552 7.43879 16.3038C7.398 16.3358 7.37174 16.3827 7.36236 16.4336C7.25047 17.0416 6.89335 17.2118 6.27423 17.5303C5.77602 17.7867 4.036 20.4606 3.14127 21.9041C3.0794 22.0039 2.9886 22.0806 2.8911 22.1461C2.32279 22.5276 1.74399 23.4985 1.50923 23.9737C1.17511 23.0095 1.61048 22.1802 1.86993 21.886C1.75602 21.7873 1.49341 21.8449 1.37634 21.886C1.69907 20.7757 2.82862 20.7757 2.79066 20.7757C2.99948 20.5954 5.44842 17.0938 5.50538 16.9325C5.56187 16.7725 5.46892 16.0242 6.69975 15.6139C6.7193 15.6073 6.73868 15.5984 6.75601 15.5873C7.71493 14.971 8.43427 13.9774 8.67571 13.5542C7.39547 13.4662 5.92943 12.7525 5.16289 12.294C4.99765 12.1952 4.8224 12.1092 4.63108 12.0875C3.58154 11.9687 2.53067 12.6401 2.10723 13.0228C1.93258 12.7799 2.12938 12.0739 2.24961 11.7513C1.82437 11.6905 1.19916 12.308 0.939711 12.6243C0.658747 12.184 0.904907 11.397 1.06311 11.0585C0.501179 11.0737 0.120232 11.3306 0 11.4571C0.465109 7.99343 4.02275 9.00076 4.06259 9.04675C3.87275 8.84937 3.88857 8.59126 3.92021 8.48688C6.0749 8.54381 7.08105 8.18321 7.71702 7.81313C12.7288 5.01374 14.8882 6.73133 15.6856 7.1631C16.4829 7.59487 17.9304 7.77042 18.9318 7.37187C20.1278 6.83097 19.9478 5.43673 19.7054 4.90461C19.4397 4.32101 17.9399 3.51438 17.4084 2.49428C16.8768 1.47418 17.34 0.233672 17.9558 0.0607684C18.5425 -0.103972 18.9615 0.0876835 19.2831 0.378128C19.4974 0.571763 20.0994 0.710259 20.3509 0.800409C20.6024 0.890558 21.0201 1.00918 20.9964 1.08035C20.9726 1.15152 20.5699 1.14202 20.5075 1.14202C20.3794 1.14202 20.2275 1.161 20.3794 1.23217C20.5575 1.30439 20.8263 1.40936 20.955 1.47846C20.9717 1.48744 20.9683 1.51084 20.95 1.51577C20.0765 1.75085 19.2966 1.26578 18.7183 1.82526C18.1298 2.39463 19.3827 2.83114 20.0282 3.51438C20.6736 4.19762 21.3381 5.01372 20.8065 6.87365C20.395 8.31355 18.6703 9.53781 17.7795 10.0167C17.7282 10.0442 17.7001 10.1031 17.7084 10.1607Z" fill="currentColor"/>
-</svg>
--- a/app/views/icons/_remotestorage.html.erb
+++ b/app/views/icons/_remotestorage.html.erb
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="24" height="24" class="icon-remotestorage <%= custom_class %>" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 250 249.9" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="24" class="<%= custom_class %>" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 250 249.9" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
 <g transform="translate(-66.822 -.16484)">
  <polygon id="polygon1" fill="currentColor" transform="matrix(.29308 0 0 .29308 83.528 -.028385)" points="228 181 370 100 511 181 652 263 370 425 87 263 87 263 0 213 0 213 0 311 0 378 0 427 0 476 86 525 185 582 370 689 554 582 653 525 653 590 653 592 370 754 0 542 0 640 185 747 370 853 554 747 739 640 739 525 739 476 739 427 739 378 653 427 370 589 86 427 86 361 185 418 370 524 554 418 653 361 739 311 739 213 554 107 370 0 185 107 58 180 144 230"/>
 </g>
--- a/app/views/services/email/show.html.erb
+++ b/app/views/services/email/show.html.erb
@@ -100,14 +100,6 @@
            ["Website", "https://www.thunderbird.net"]
          ]
        ) %>
-        <%= render AppInfoComponent.new(
-          name: "Geary",
-          description: "Built around conversations, for the GNOME desktop",
-          icon_path: "/img/logos/icon_geary.png",
-          links: [
-            ["Website", "https://wiki.gnome.org/Apps/Geary"]
-          ]
-        ) %>
      </div>
      <div id="apps-windows" class="hidden grid grid-cols-1 gap-6"
           data-tabs-target="panel">
--- a/app/views/services/mastodon/show.html.erb
+++ b/app/views/services/mastodon/show.html.erb
@@ -98,17 +98,7 @@
          description: "The official Web app",
          icon_path: "/img/logos/icon_mastodon-2.svg",
          links: [
-            ["Launch", "https://kosmos.social"],
-            ["GitHub", "https://github.com/mastodon/mastodon"]
-          ]
-        ) %>
-        <%= render AppInfoComponent.new(
-          name: "Phanpy",
-          description: " A slick, feature-rich Web app for mobile and desktop",
-          icon_path: "/img/logos/icon_phanpy.svg",
-          links: [
-            ["Launch", "https://phanpy.social"],
-            ["GitHub", "https://github.com/cheeaun/phanpy"]
+            ["Launch", "https://kosmos.social"]
          ]
        ) %>
        <%= render AppInfoComponent.new(
@@ -160,15 +150,6 @@
            ["Google Play", "https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk"]
          ]
        ) %>
-        <%= render AppInfoComponent.new(
-          name: "Phanpy",
-          description: " A slick, feature-rich Web app for mobile and desktop",
-          icon_path: "/img/logos/icon_phanpy.svg",
-          links: [
-            ["Launch", "https://phanpy.social"],
-            ["GitHub", "https://github.com/cheeaun/phanpy"]
-          ]
-        ) %>
      </div>
      <div class="hidden grid grid-cols-1 gap-6" data-tabs-target="panel">
        <%= render AppInfoComponent.new(
@@ -199,15 +180,6 @@
            ["App Store", "https://apps.apple.com/app/mammoth-for-mastodon/id1667573899"]
          ]
        ) %>
-        <%= render AppInfoComponent.new(
-          name: "Phanpy",
-          description: " A slick, feature-rich Web app for mobile and desktop",
-          icon_path: "/img/logos/icon_phanpy.svg",
-          links: [
-            ["Launch", "https://phanpy.social"],
-            ["GitHub", "https://github.com/cheeaun/phanpy"]
-          ]
-        ) %>
      </div>
      <div class="hidden grid grid-cols-1 gap-6" data-tabs-target="panel">
        <%= render AppInfoComponent.new(
--- a/app/views/services/remotestorage/show.html.erb
+++ b/app/views/services/remotestorage/show.html.erb
@@ -2,143 +2,15 @@

 <%= render MainSimpleComponent.new do %>
  <section>
-    <p class="mb-6">
-      Store and synchronize your app data across different devices.
-    </p>
-  </section>
-
-  <%= render partial: "shared/tabnav_remotestorage" %>
-
-  <section>
-    <h3>Your Storage Address</h3>
-    <p class="mb-6">
-      In order to connect an app to your storage account, give it your address:
-    </p>
-    <p data-controller="clipboard" class="flex gap-1 sm:w-2/5">
-      <input type="text" id="user_address" class="grow"
-             value=<%= current_user.address %> disabled="disabled"
-             data-clipboard-target="source" />
-      <button id="copy-user-address" class="btn-md btn-icon btn-outline shrink-0"
-              data-clipboard-target="trigger" data-action="clipboard#copy"
-              title="Copy to clipboard">
-        <span class="content-initial">
-          <%= render partial: "icons/copy", locals: { custom_class: "text-blue-600 h-4 w-4 inline" } %>
-        </span>
-        <span class="content-active hidden">
-          <%= render partial: "icons/check", locals: { custom_class: "text-blue-600 h-4 w-4 inline" } %>
-        </span>
-      </button>
-    </p>
-  </section>
-
-  <section>
-    <h3>Recommended Apps</h3>
-    <div data-controller="tabs"
-         data-tabs-active-tab-class="-mb-px border-gray-200 border-l border-t border-r rounded-t text-indigo-600 hover:text-indigo-600"
-         data-tabs-inactive-tab-class="text-gray-500 hover:text-gray-700"
-         class="mb-12">
-      <select data-action="tabs#change" data-tabs-target="select"
-              class="block w-full mb-8 sm:hidden">
-        <option>Productivity</option>
-        <option>Bookmarks</option>
-        <option>Reading</option>
-        <option>File sharing</option>
-        <option>Learning</option>
-      </select>
-      <ul class="hidden sm:flex list-reset mb-8 border-gray-200 border-b">
-        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
-            Productivity
-          </a>
-        </li>
-        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
-            Bookmarks
-          </a>
-        </li>
-        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
-            Reading
-          </a>
-        </li>
-        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
-            File sharing
-          </a>
-        </li>
-        <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
-            Learning
-          </a>
-        </li>
-      </ul>
-
-      <div class="hidden grid grid-cols-1 gap-6" data-tabs-target="panel">
-        <%= render AppInfoComponent.new(
-          name: "Hyperdraft",
-          description: "Create text notes and (optionally) turn them into a website",
-          icon_path: "/img/app_icons/hyperdraft.png",
-          links: [
-            ["Website", "https://hyperdraft.rosano.ca"],
-          ]
-        ) %>
-        <%= render AppInfoComponent.new(
-          name: "Notes Together",
-          description: "A powerful note-taking app, with support for attaching images and other files",
-          icon_path: "/img/app_icons/notes-together.png",
-          links: [
-            ["Web App", "https://notestogether.hominidsoftware.com"],
-          ]
-        ) %>
-        <%= render AppInfoComponent.new(
-          name: "Papiers",
-          description: "A simple note-taking app",
-          icon_path: "/img/app_icons/papiers.png",
-          links: [
-            ["Web App", "https://papiers.gitlab.io"],
-          ]
-        ) %>
-      </div>
-      <div class="hidden grid grid-cols-1 gap-6" data-tabs-target="panel">
-        <%= render AppInfoComponent.new(
-          name: "Webmarks",
-          description: "Archive your bookmarks in your remote storage",
-          icon_path: "/img/app_icons/webmarks.png",
-          links: [
-            ["Web App", "https://webmarks.5apps.com"],
-          ]
-        ) %>
-      </div>
-      <div class="hidden grid grid-cols-1 gap-6" data-tabs-target="panel">
-        <%= render AppInfoComponent.new(
-          name: "Pétrolette",
-          description: "A news aggregator that syncs with your remote storage",
-          icon_path: "/img/app_icons/petrolette.png",
-          links: [
-            ["Web App", "https://petrolette.space"],
-          ]
-        ) %>
-      </div>
-      <div class="hidden grid grid-cols-1 gap-6" data-tabs-target="panel">
-        <%= render AppInfoComponent.new(
-          name: "Sharesome",
-          description: "Quickly and easily share files from your remote storage",
-          icon_path: "/img/app_icons/sharesome.png",
-          links: [
-            ["Web App", "https://sharesome.5apps.com"],
-          ]
-        ) %>
-      </div>
-      <div class="hidden grid grid-cols-1 gap-6" data-tabs-target="panel">
-        <%= render AppInfoComponent.new(
-          name: "Kommit",
-          description: "Create flashcards and learn them with spaced-repetition",
-          icon_path: "/img/app_icons/kommit.png",
-          links: [
-            ["Website", "https://kommit.rosano.ca"],
-          ]
-        ) %>
-      </div>
+    <h3 class="mb-10">Connected Apps</h3>
+    <% if @rs_auths.any? %>
+    <div class="w-full grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-y-10 gap-x-12">
+    <% @rs_auths.each do |auth| %>
+      <%= render RsAuthComponent.new(auth: auth) %>
+    <% end %>
    </div>
+    <% else %>
+    <p>No apps connected yet.</p>
+    <% end %>
  </section>
 <% end %>
--- a/app/views/services/rs_auths/index.html.erb
+++ b/app/views/services/rs_auths/index.html.erb
@@ -1,33 +0,0 @@
-<%= render HeaderComponent.new(title: "Storage") %>
-
-<%= render MainSimpleComponent.new do %>
-  <section>
-    <p class="mb-6">
-      Store and synchronize your app data across different devices.
-    </p>
-  </section>
-
-  <%= render partial: "shared/tabnav_remotestorage" %>
-
-  <section>
-    <% if @rs_auths.any? %>
-      <div class="w-full grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-y-10 gap-x-12 mt-4">
-      <% @rs_auths.each do |auth| %>
-        <%= render RsAuthComponent.new(auth: auth) %>
-      <% end %>
-    </div>
-    <% else %>
-      <div class="text-center">
-        <p class="mt-4 mb-12 inline-flex align-center items-center">
-          <%= image_tag("/img/illustrations/undraw_friends_r511.svg", class: 'h-48') %>
-        </p>
-        <h3>
-          No apps connected
-        </h3>
-        <p class="text-gray-500">
-          When connected, your apps will show up here.
-        </p>
-      </div>
-    <% end %>
-  </section>
-<% end %>
--- a/app/views/settings/_experiments.html.erb
+++ b/app/views/settings/_experiments.html.erb
@@ -3,7 +3,6 @@
  <h4 class="mb-0">Public Key</h4>
  <div data-controller="settings--nostr-pubkey"
       data-settings--nostr-pubkey-user-address-value="<%= current_user.address %>"
-       data-settings--nostr-pubkey-site-value="<%= Setting.accounts_domain %>"
       data-settings--nostr-pubkey-shared-secret-value="<%= session[:shared_secret] %>"
       data-settings--nostr-pubkey-pubkey-hex-value="<%= current_user.nostr_pubkey %>">

--- a/app/views/settings/_lightning.html.erb
+++ b/app/views/settings/_lightning.html.erb
@@ -5,7 +5,7 @@
    <%= render FormElements::FieldsetComponent.new(
      positioning: :horizontal,
      title: "Sats received",
-      description: "Notify me when sats are sent to my Lightning account"
+      description: "Notify me when sats are sent to my Lightning Address"
    ) do %>
      <% f.fields_for :preferences do |p| %>
        <%= p.select :lightning_notify_sats_received, options_for_select([
@@ -15,38 +15,6 @@
        ], selected: @user.preferences[:lightning_notify_sats_received]) %>
      <% end %>
    <% end %>
-    <% if @user.nostr_pubkey.present? %>
-      <%= render FormElements::FieldsetComponent.new(
-        positioning: :horizontal,
-        title: "Zap received",
-        description: "Notify me when someone zaps me on Nostr"
-      ) do %>
-        <% f.fields_for :preferences do |p| %>
-          <%= p.select :lightning_notify_zap_received, options_for_select([
-            ["off", "disabled"],
-            ["Chat (Jabber)", "xmpp"],
-            ["E-Mail", "email"]
-          ], selected: @user.preferences[:lightning_notify_zap_received]) %>
-        <% end %>
-      <% end %>
-    <% end %>
-    <% if @notifications_enabled %>
-      <%= render FormElements::FieldsetToggleComponent.new(
-        field_name: "user[preferences][lightning_notify_only_with_message]",
-        enabled: @user.preferences[:lightning_notify_only_with_message],
-        title: "Ignore transactions without message",
-        description: "Only send notifications when there is a message attached to the payment"
-      ) %>
-      <%= render FormElements::FieldsetComponent.new(
-        title: "Minimum amount",
-        description: "Only send notifications when amount is higher than this"
-      ) do %>
-        <%= f.number_field :lightning_notify_min_sats,
-          name: "user[preferences][lightning_notify_min_sats]",
-          class: "w-full",
-          value: @user.preferences[:lightning_notify_min_sats].to_i %>
-      <% end %>
-    <% end %>
  </ul>
 </section>
 <section>
--- a/app/views/settings/_profile.html.erb
+++ b/app/views/settings/_profile.html.erb
@@ -31,7 +31,6 @@
      <% end %>
    <% end %>

-    <% if Flipper.enabled?(:avatar_upload, current_user) %>
    <label class="block">
      <p class="font-bold mb-1">
        Avatar
@@ -57,7 +56,6 @@
        </div>
      </div>
    </label>
-    <% end %>

    <p class="mt-8 pt-6 border-t border-gray-200 text-right">
      <%= f.submit 'Save', class: "btn-md btn-blue w-full md:w-auto" %>
--- a/app/views/shared/_admin_sidenav_settings.html.erb
+++ b/app/views/shared/_admin_sidenav_settings.html.erb
@@ -4,9 +4,9 @@
 ) %>
 <%= render SidenavLinkComponent.new(
  name: "Services", path: admin_settings_services_path, icon: "grid",
-  active: controller_name == "services"
+  active: current_page?(admin_settings_services_path)
 ) %>
-<% if controller_name == "services" %>
+<% if current_page?(admin_settings_services_path) %>
  <%= render partial: "shared/admin_sidenav_settings_services"  %>
 <% end %>
 <%= render SidenavLinkComponent.new(
--- a/app/views/shared/_admin_sidenav_settings_services.html.erb
+++ b/app/views/shared/_admin_sidenav_settings_services.html.erb
@@ -1,77 +1,77 @@
 <%= render SidenavLinkComponent.new(
  level: 2,
  name: "BTCPay",
-  path: admin_settings_service_path("btcpay"),
+  path: admin_settings_services_path(params: { s: "btcpay" }),
  text_icon: Setting.btcpay_enabled? ? "◉" : "○",
-  active: current_page?(admin_settings_service_path("btcpay")),
+  active: current_page?(admin_settings_services_path(params: { s: "btcpay" })),
 ) %>
 <%= render SidenavLinkComponent.new(
  level: 2,
  name: "Discourse",
-  path: admin_settings_service_path("discourse"),
+  path: admin_settings_services_path(params: { s: "discourse" }),
  text_icon: Setting.discourse_enabled? ? "◉" : "○",
-  active: current_page?(admin_settings_service_path("discourse")),
+  active: current_page?(admin_settings_services_path(params: { s: "discourse" })),
 ) %>
 <%= render SidenavLinkComponent.new(
  level: 2,
  name: "Drone CI",
-  path: admin_settings_service_path("droneci"),
+  path: admin_settings_services_path(params: { s: "droneci" }),
  text_icon: Setting.droneci_enabled? ? "◉" : "○",
-  active: current_page?(admin_settings_service_path("droneci")),
+  active: current_page?(admin_settings_services_path(params: { s: "droneci" })),
 ) %>
 <%= render SidenavLinkComponent.new(
  level: 2,
  name: "E-Mail",
-  path: admin_settings_service_path("email"),
+  path: admin_settings_services_path(params: { s: "email" }),
  text_icon: Setting.email_enabled? ? "◉" : "○",
  active: current_page?(admin_settings_services_path(params: { s: "email" })),
 ) %>
 <%= render SidenavLinkComponent.new(
  level: 2,
  name: "ejabberd",
-  path: admin_settings_service_path("ejabberd"),
+  path: admin_settings_services_path(params: { s: "ejabberd" }),
  text_icon: Setting.ejabberd_enabled? ? "◉" : "○",
-  active: current_page?(admin_settings_service_path("ejabberd")),
+  active: current_page?(admin_settings_services_path(params: { s: "ejabberd" })),
 ) %>
 <%= render SidenavLinkComponent.new(
  level: 2,
  name: "Gitea",
-  path: admin_settings_service_path("gitea"),
+  path: admin_settings_services_path(params: { s: "gitea" }),
  text_icon: Setting.gitea_enabled? ? "◉" : "○",
-  active: current_page?(admin_settings_service_path("gitea")),
+  active: current_page?(admin_settings_services_path(params: { s: "gitea" })),
 ) %>
 <%= render SidenavLinkComponent.new(
  level: 2,
  name: "LNDHub",
-  path: admin_settings_service_path("lndhub"),
+  path: admin_settings_services_path(params: { s: "lndhub" }),
  text_icon: Setting.lndhub_enabled? ? "◉" : "○",
-  active: current_page?(admin_settings_service_path("lndhub")),
+  active: current_page?(admin_settings_services_path(params: { s: "lndhub" })),
 ) %>
 <%= render SidenavLinkComponent.new(
  level: 2,
  name: "Mastodon",
-  path: admin_settings_service_path("mastodon"),
+  path: admin_settings_services_path(params: { s: "mastodon" }),
  text_icon: Setting.mastodon_enabled? ? "◉" : "○",
-  active: current_page?(admin_settings_service_path("mastodon")),
+  active: current_page?(admin_settings_services_path(params: { s: "mastodon" })),
 ) %>
 <%= render SidenavLinkComponent.new(
  level: 2,
  name: "MediaWiki",
-  path: admin_settings_service_path("mediawiki"),
+  path: admin_settings_services_path(params: { s: "mediawiki" }),
  text_icon: Setting.mediawiki_enabled? ? "◉" : "○",
-  active: current_page?(admin_settings_service_path("mediawiki")),
+  active: current_page?(admin_settings_services_path(params: { s: "mediawiki" })),
 ) %>
 <%= render SidenavLinkComponent.new(
  level: 2,
  name: "Nostr",
-  path: admin_settings_service_path("nostr"),
+  path: admin_settings_services_path(params: { s: "nostr" }),
  text_icon: Setting.nostr_enabled? ? "◉" : "○",
-  active: current_page?(admin_settings_service_path("nostr")),
+  active: current_page?(admin_settings_services_path(params: { s: "nostr" })),
 ) %>
 <%= render SidenavLinkComponent.new(
  level: 2,
  name: "RemoteStorage",
-  path: admin_settings_service_path("remotestorage"),
+  path: admin_settings_services_path(params: { s: "remotestorage" }),
  text_icon: Setting.remotestorage_enabled? ? "◉" : "○",
-  active: current_page?(admin_settings_service_path("remotestorage")),
+  active: current_page?(admin_settings_services_path(params: { s: "remotestorage" })),
 ) %>
--- a/app/views/shared/_sidenav_settings.html.erb
+++ b/app/views/shared/_sidenav_settings.html.erb
@@ -34,7 +34,7 @@
 <% end %>
 <% if Setting.nostr_enabled %>
 <%= render SidenavLinkComponent.new(
-  name: "Nostr", path: setting_path(:nostr), icon: "nostrich-head",
-  active: @settings_section.to_s == "nostr"
+  name: "Experiments", path: setting_path(:experiments), icon: "science",
+  active: @settings_section.to_s == "experiments"
 ) %>
 <% end %>
--- a/app/views/shared/_tabnav_remotestorage.html.erb
+++ b/app/views/shared/_tabnav_remotestorage.html.erb
@@ -1,14 +0,0 @@
-<section>
-  <div class="border-b border-gray-200">
-    <nav class="-mb-px flex" aria-label="Tabs">
-      <%= render TabnavLinkComponent.new(
-        name: "Info", path: services_storage_path,
-        active: current_page?(services_storage_path)
-      ) %>
-      <%= render TabnavLinkComponent.new(
-        name: "Connected Apps", path: apps_services_storage_path,
-        active: current_page?(apps_services_storage_path)
-      ) %>
-    </nav>
-  </div>
-</section>
--- a/config/default_preferences.yml
+++ b/config/default_preferences.yml
@@ -1,6 +1,3 @@
-lightning_notify_sats_received: email
-lightning_notify_zap_received: disabled
-lightning_notify_min_sats: 0
-lightning_notify_only_with_message: false
-remotestorage_notify_auth_created: email
+lightning_notify_sats_received: disabled # or xmpp, email
+remotestorage_notify_auth_created: email # or xmpp, email
 xmpp_exchange_contacts_with_invitees: true
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -71,7 +71,7 @@ Rails.application.configure do
  # Allow requests from any IP
  config.web_console.permissions = '0.0.0.0/0'

-  if ENV["S3_ENABLED"] && ENV["S3_ENABLED"].to_s != "false"
+  if ENV["S3_ENABLED"]
    config.active_storage.service = :s3
  else
    config.active_storage.service = :local
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -110,7 +110,7 @@ Rails.application.configure do
  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
  config.action_mailer.raise_delivery_errors = true

-  if ENV["S3_ENABLED"] && ENV["S3_ENABLED"].to_s != "false"
+  if ENV["S3_ENABLED"]
    config.active_storage.service = :s3
  else
    config.active_storage.service = :local
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -52,9 +52,10 @@ Rails.application.configure do

  config.active_job.queue_adapter = :test

-  if ENV["S3_ENABLED"] && ENV["S3_ENABLED"].to_s != "false"
+  if ENV["S3_ENABLED"]
    config.active_storage.service = :s3
  else
-    config.active_storage.service = :local
+    # Store attachments on the local disk (in ./tmp)
+    config.active_storage.service = :test
  end
 end
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -27,6 +27,7 @@ Devise.setup do |config|
  config.ldap_auth_password_builder = Proc.new() { |new_password|
    salt      = SecureRandom.hex(32)
    hashed_pw = Base64.strict_encode64(Digest::SHA512.digest(new_password + salt) + salt)
+    puts '{SSHA512}' + hashed_pw
    '{SSHA512}' + hashed_pw
  }

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,14 +1,7 @@
 require 'sidekiq/web'

 Rails.application.routes.draw do
-  devise_for :users, controllers: {
-    confirmations: 'users/confirmations',
-    sessions: 'users/sessions'
-  }
-
-  devise_scope :user do
-    post 'users/nostr_login', to: 'users/sessions#nostr_login'
-  end
+  devise_for :users, controllers: { confirmations: 'users/confirmations' }

  get 'welcome', to: 'welcome#index'
  get 'check_your_email', to: 'welcome#check_your_email'
@@ -48,8 +41,7 @@ Rails.application.routes.draw do
    end

    resource :storage, controller: 'remotestorage', only: [:show] do
-      get :apps, to: "rs_auths#index"
-      resources :rs_auths, only: [:index, :destroy] do
+      resources :rs_auths, only: [:destroy] do
        member do
          get :revoke, to: 'rs_auths#destroy'
          get :launch_app
@@ -105,8 +97,8 @@ Rails.application.routes.draw do
    end

    namespace :settings do
-      resource 'registrations', only: ['show', 'update']
-      resources 'services', param: 'service', only: ['index', 'show', 'update']
+      resources 'registrations', only: ['index', 'create']
+      resources 'services', only: ['index', 'create']
    end
  end

--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -2,5 +2,3 @@
 :queues:
  - default
  - mailers
-  - remotestorage
-  - nostr
--- a/config/storage.yml
+++ b/config/storage.yml
@@ -1,12 +1,12 @@
 local:
  service: Disk
-  root: <%= ENV["ACTIVE_STORAGE_PATH"] || Rails.root.join("storage") %>
+  root: <%= Rails.root.join("storage") %>

 test:
  service: Disk
  root: <%= Rails.root.join("tmp/storage") %>

-<% if ENV["S3_ENABLED"] && ENV["S3_ENABLED"].to_s != "false" %>
+<% if ENV["S3_ENABLED"] %>
 s3:
  service: S3
  endpoint: <%= ENV["S3_ENDPOINT"] %>
--- a/db/migrate/20240316153558_remove_nostr_pubkey_from_users.rb
+++ b/db/migrate/20240316153558_remove_nostr_pubkey_from_users.rb
@@ -1,5 +0,0 @@
-class RemoveNostrPubkeyFromUsers < ActiveRecord::Migration[7.1]
-  def change
-    remove_column :users, :nostr_pubkey, :string
-  end
-end
--- a/db/migrate/20240422171653_create_zaps.rb
+++ b/db/migrate/20240422171653_create_zaps.rb
@@ -1,13 +0,0 @@
-class CreateZaps < ActiveRecord::Migration[7.1]
-  def change
-    create_table :zaps do |t|
-      t.references :user, null: false, foreign_key: true
-      t.json :request
-      t.json :receipt, default: nil
-      t.text :payment_request
-      t.bigint :amount
-
-      t.timestamps
-    end
-  end
-end
--- a/db/migrate/20240607123654_add_settled_at_to_zaps.rb
+++ b/db/migrate/20240607123654_add_settled_at_to_zaps.rb
@@ -1,9 +0,0 @@
-class AddSettledAtToZaps < ActiveRecord::Migration[7.1]
-  def change
-    add_column :zaps, :settled_at, :datetime, default: nil
-
-    Zap.where.not(receipt: nil).each do |zap|
-      zap.update! settled_at: Time.at(zap.receipt_event.created_at).to_datetime
-    end
-  end
-end
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,12 +10,12 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema[7.1].define(version: 2024_06_07_123654) do
+ActiveRecord::Schema[7.1].define(version: 2024_02_16_124640) do
  create_table "active_storage_attachments", force: :cascade do |t|
    t.string "name", null: false
    t.string "record_type", null: false
-    t.bigint "record_id", null: false
-    t.bigint "blob_id", null: false
+    t.integer "record_id", null: false
+    t.integer "blob_id", null: false
    t.datetime "created_at", null: false
    t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
    t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
@@ -34,7 +34,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_06_07_123654) do
  end

  create_table "active_storage_variant_records", force: :cascade do |t|
-    t.bigint "blob_id", null: false
+    t.integer "blob_id", null: false
    t.string "variation_digest", null: false
    t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
  end
@@ -60,7 +60,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_06_07_123654) do
    t.string "payment_method"
    t.string "btcpay_invoice_id"
    t.string "payment_status"
-    t.index ["payment_status"], name: "index_donations_on_payment_status"
    t.index ["user_id"], name: "index_donations_on_user_id"
  end

@@ -129,6 +128,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_06_07_123654) do
    t.string "unconfirmed_email"
    t.text "ln_password_ciphertext"
    t.string "ln_account"
+    t.string "nostr_pubkey"
    t.datetime "remember_created_at"
    t.string "remember_token"
    t.text "preferences"
@@ -136,21 +136,8 @@ ActiveRecord::Schema[7.1].define(version: 2024_06_07_123654) do
    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
  end

-  create_table "zaps", force: :cascade do |t|
-    t.integer "user_id", null: false
-    t.json "request"
-    t.json "receipt"
-    t.text "payment_request"
-    t.bigint "amount"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.datetime "settled_at"
-    t.index ["user_id"], name: "index_zaps_on_user_id"
-  end
-
  add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
  add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
  add_foreign_key "remote_storage_authorizations", "app_catalog_web_apps", column: "web_app_id"
  add_foreign_key "remote_storage_authorizations", "users"
-  add_foreign_key "zaps", "users"
 end
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -3,10 +3,6 @@ require 'sidekiq/testing'
 ldap = LdapService.new

 Sidekiq::Testing.inline! do
-  ldap.delete_all_users!
-
-  puts "Create user: admin"
-
  CreateAccount.call(account: {
    username: "admin", domain: "kosmos.org", email: "admin@example.com",
    password: "admin is admin", confirmed: true
@@ -14,7 +10,6 @@ Sidekiq::Testing.inline! do

  ldap.add_attribute "cn=admin,ou=kosmos.org,cn=users,dc=kosmos,dc=org", :admin, "true"

-  puts "Create 35 random users"
  35.times do |n|
    username = Faker::Name.unique.first_name.downcase
    email = Faker::Internet.unique.email
--- a/doc/integrations/strfry.md
+++ b/doc/integrations/strfry.md
@@ -1,29 +0,0 @@
-# strfry (nostr relay)
-
-## LDAP policy
-
-...
-
-## Useful scripts
-
-### Syncing events for all local nostr users from a remote relay
-
-You can sync all events of all local users with a pubkey stored in LDAP from a
-specified remote relay to the local relay with the `strfry-sync.ts` script:
-
-    deno run -A /opt/strfry-sync.ts wss://relay.example.com
-
-Doing the same with Docker Compose (great for seeding data to your local relay
-in development):
-
-    docker compose run strfry deno run -A /opt/strfry-sync.ts wss://relay.example.com
-
-## Docker image
-
-In order to use the LDAP policy with Docker, you will need
-[Deno](https://deno.com/) installed in your strfry container. We provide a
-custom Docker image for strfry with Deno included (which we use in
-development):
-
-* Registry: https://gitea.kosmos.org/kosmos/-/packages/container/strfry-deno/1.1.1
-* Source: https://github.com/raucao/strfry/blob/docker_deno/ubuntu.Dockerfile
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ services:
  ldap:
    image: 4teamwork/389ds:latest
    volumes:
-      - 389ds-data:/data
+      - ./tmp/389ds:/data
    networks:
      - external_network
      - internal_network
@@ -16,12 +16,11 @@ services:
    restart: always
    image: redis:7-alpine
    networks:
-      - external_network
      - internal_network
    healthcheck:
      test: ['CMD', 'redis-cli', 'ping']
    volumes:
-      - redis-data:/data
+      - ./tmp/redis:/data

  web:
    build: .
@@ -43,13 +42,8 @@ services:
      LDAP_ADMIN_PASSWORD: passthebutter
      LDAP_USE_TLS: "false"
      REDIS_URL: redis://redis:6379/0
-      ACTIVE_STORAGE_PATH: "/akkounts/tmp/attachments"
      RS_REDIS_URL: redis://redis:6379/1
      RS_STORAGE_URL: "http://localhost:4567"
-      S3_ENABLED: false
-      NOSTR_PUBLIC_KEY: bdd76ce2934b2f591f9fad2ebe9da18f20d2921de527494ba00eeaa0a0efadcf
-      NOSTR_PRIVATE_KEY: 7c3ef7e448505f0615137af38569d01807d3b05b5005d5ecf8aaafcd40323cea
-      NOSTR_RELAY_URL: "ws://strfry:7777"
    depends_on:
      - ldap
      - redis
@@ -73,7 +67,6 @@ services:
      REDIS_URL: redis://redis:6379/0
      RS_REDIS_URL: redis://redis:6379/1
      RS_STORAGE_URL: "http://localhost:4567"
-      S3_ENABLED: false
    depends_on:
      - ldap
      - redis
@@ -88,10 +81,10 @@ services:
      - "9000:9000"
      - "9001:9001"
    volumes:
-      - minio-data:/data
+      - ./tmp/minio:/data

  liquor-cabinet:
-    image: gitea.kosmos.org/5apps/liquor-cabinet:2.0.0-rc.1
+    image: gitea.kosmos.org/5apps/liquor-cabinet:2.0.0-beta.2
    networks:
      - external_network
      - internal_network
@@ -110,24 +103,6 @@ services:
      - minio
      - redis

-  strfry:
-    image: gitea.kosmos.org/kosmos/strfry-deno:1.1.1
-    volumes:
-      - ./docker/strfry/strfry.conf:/etc/strfry.conf
-      - ./extras/strfry:/opt/strfry
-      - strfry-data:/var/lib/strfry
-    networks:
-      - external_network
-      - internal_network
-    ports:
-      - "4777:7777"
-    environment:
-      LDAP_URL: 'ldap://ldap:3389'
-      LDAP_BIND_DN: 'cn=Directory Manager'
-      LDAP_PASSWORD: passthebutter
-      LDAP_SEARCH_DN: 'ou=kosmos.org,cn=users,dc=kosmos,dc=org'
-      WHITELIST_PUBKEYS: 'bdd76ce2934b2f591f9fad2ebe9da18f20d2921de527494ba00eeaa0a0efadcf'
-
  # phpldapadmin:
  #   image: osixia/phpldapadmin:0.9.0
  #   ports:
@@ -141,13 +116,3 @@ networks:
  external_network:
  internal_network:
    internal: true
-
-volumes:
-  389ds-data:
-    driver: local
-  minio-data:
-    driver: local
-  redis-data:
-    driver: local
-  strfry-data:
-    driver: local
--- a/docker/strfry/strfry.conf
+++ b/docker/strfry/strfry.conf
@@ -1,138 +0,0 @@
-##
-## Default strfry config
-##
-
-# Directory that contains the strfry LMDB database (restart required)
-db = "/var/lib/strfry/"
-
-dbParams {
-    # Maximum number of threads/processes that can simultaneously have LMDB transactions open (restart required)
-    maxreaders = 256
-
-    # Size of mmap() to use when loading LMDB (default is 10TB, does *not* correspond to disk-space used) (restart required)
-    mapsize = 10995116277760
-
-    # Disables read-ahead when accessing the LMDB mapping. Reduces IO activity when DB size is larger than RAM. (restart required)
-    noReadAhead = false
-}
-
-events {
-    # Maximum size of normalised JSON, in bytes
-    maxEventSize = 65536
-
-    # Events newer than this will be rejected
-    rejectEventsNewerThanSeconds = 900
-
-    # Events older than this will be rejected
-    rejectEventsOlderThanSeconds = 94608000
-
-    # Ephemeral events older than this will be rejected
-    rejectEphemeralEventsOlderThanSeconds = 60
-
-    # Ephemeral events will be deleted from the DB when older than this
-    ephemeralEventsLifetimeSeconds = 300
-
-    # Maximum number of tags allowed
-    maxNumTags = 2000
-
-    # Maximum size for tag values, in bytes
-    maxTagValSize = 1024
-}
-
-relay {
-    # Interface to listen on. Use 0.0.0.0 to listen on all interfaces (restart required)
-    bind = "0.0.0.0"
-
-    # Port to open for the nostr websocket protocol (restart required)
-    port = 7777
-
-    # Set OS-limit on maximum number of open files/sockets (if 0, don't attempt to set) (restart required)
-    nofiles = 200000
-
-    # HTTP header that contains the client's real IP, before reverse proxying (ie x-real-ip) (MUST be all lower-case)
-    realIpHeader = ""
-
-    info {
-        # NIP-11: Name of this server. Short/descriptive (< 30 characters)
-        name = "Akkounts Nostr Relay"
-
-        # NIP-11: Detailed information about relay, free-form
-        description = "Local strfry instance for akkounts development"
-
-        # NIP-11: Administrative nostr pubkey, for contact purposes
-        pubkey = ""
-
-        # NIP-11: Alternative administrative contact (email, website, etc)
-        contact = ""
-    }
-
-    # Maximum accepted incoming websocket frame size (should be larger than max event) (restart required)
-    maxWebsocketPayloadSize = 131072
-
-    # Websocket-level PING message frequency (should be less than any reverse proxy idle timeouts) (restart required)
-    autoPingSeconds = 55
-
-    # If TCP keep-alive should be enabled (detect dropped connections to upstream reverse proxy)
-    enableTcpKeepalive = false
-
-    # How much uninterrupted CPU time a REQ query should get during its DB scan
-    queryTimesliceBudgetMicroseconds = 10000
-
-    # Maximum records that can be returned per filter
-    maxFilterLimit = 500
-
-    # Maximum number of subscriptions (concurrent REQs) a connection can have open at any time
-    maxSubsPerConnection = 20
-
-    writePolicy {
-        # If non-empty, path to an executable script that implements the writePolicy plugin logic
-        plugin = "/opt/strfry/strfry-policy.ts"
-    }
-
-    compression {
-        # Use permessage-deflate compression if supported by client. Reduces bandwidth, but slight increase in CPU (restart required)
-        enabled = true
-
-        # Maintain a sliding window buffer for each connection. Improves compression, but uses more memory (restart required)
-        slidingWindow = true
-    }
-
-    logging {
-        # Dump all incoming messages
-        dumpInAll = true
-
-        # Dump all incoming EVENT messages
-        dumpInEvents = false
-
-        # Dump all incoming REQ/CLOSE messages
-        dumpInReqs = false
-
-        # Log performance metrics for initial REQ database scans
-        dbScanPerf = true
-
-        # Log reason for invalid event rejection? Can be disabled to silence excessive logging
-        invalidEvents = true
-    }
-
-    numThreads {
-        # Ingester threads: route incoming requests, validate events/sigs (restart required)
-        ingester = 3
-
-        # reqWorker threads: Handle initial DB scan for events (restart required)
-        reqWorker = 3
-
-        # reqMonitor threads: Handle filtering of new events (restart required)
-        reqMonitor = 3
-
-        # negentropy threads: Handle negentropy protocol messages (restart required)
-        negentropy = 2
-    }
-
-    negentropy {
-        # Support negentropy protocol messages
-        enabled = true
-
-        # Maximum records that sync will process before returning an error
-        maxSyncEvents = 1000000
-    }
-}
--- a/extras/strfry/deno.json
+++ b/extras/strfry/deno.json
@@ -1,5 +0,0 @@
-{
-  "imports": {
-    "@nostr/tools": "jsr:@nostr/tools@^2.3.1"
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Râu Cao	f57fff0087	Send email confirmation when BTC payment is confirmed All checks were successful continuous-integration/drone/push Build is passing Details	2024-02-22 15:20:17 +01:00
Râu Cao	18ff3d3f0d	Implement bitcoin donations via BTCPay	2024-02-22 15:19:27 +01:00
Râu Cao	1b3ac90ddd	Allow other controllers to access lndhub user balance	2024-02-22 15:19:27 +01:00
Râu Cao	5db0ee6658	DRY up btcpay and lndhub services Removing initialize methods from the main/manager class also allows for different iniitalizers in specific task services	2024-02-22 15:19:27 +01:00
Râu Cao	da31a027c5	Move past donations to partial	2024-02-22 15:19:27 +01:00