WIP Add service accounts and ACIs

2024-03-28 10:57:12 +04:00
260 changed files with 1631 additions and 6651 deletions
--- a/.env.example
+++ b/.env.example
@@ -1,23 +1,6 @@
 # PRIMARY_DOMAIN=kosmos.org
 # AKKOUNTS_DOMAIN=accounts.example.com

-# Generate this using `rails secret`
-# SECRET_KEY_BASE=
-
-# Generate these using `rails db:encryption:init`
-# (Optional, needed for LndHub integration)
-# ENCRYPTION_PRIMARY_KEY=
-# ENCRYPTION_KEY_DERIVATION_SALT=
-
-# The default backend is SQLite
-# DB_ADAPTER=postgresql
-# PG_HOST=localhost
-# PG_PORT=5432
-# PG_DATABASE=akkounts
-# PG_DATABASE_QUEUE=akkounts_queue
-# PG_USERNAME=akkounts
-# PG_PASSWORD=
-
 # SMTP_SERVER=smtp.example.com
 # SMTP_PORT=587
 # SMTP_LOGIN=accounts
@@ -37,12 +20,8 @@

 # LDAP_HOST=localhost
 # LDAP_PORT=389
-# LDAP_USE_TLS=false
-# LDAP_UID_ATTR=cn
-# LDAP_BASE="ou=kosmos.org,cn=users,dc=kosmos,dc=org"
-# LDAP_ADMIN_USER="cn=Directory Manager"
 # LDAP_ADMIN_PASSWORD=passthebutter
-# LDAP_SUFFIX="dc=kosmos,dc=org"
+# LDAP_SUFFIX='dc=kosmos,dc=org'

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

@@ -50,7 +29,6 @@

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

 # BTCPAY_PUBLIC_URL='https://btcpay.example.com'
@@ -84,9 +62,5 @@

 # 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'
--- a/.env.test
+++ b/.env.test
@@ -1,8 +1,4 @@
 PRIMARY_DOMAIN=kosmos.org
-AKKOUNTS_DOMAIN=accounts.kosmos.org
-
-ENCRYPTION_PRIMARY_KEY=YhNLBgCFMAzw5dV3gISxnGrhNDMQwRdn
-ENCRYPTION_KEY_DERIVATION_SALT=h28g16MRZ1sghF2jTCos1DiLZXUswinR

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

@@ -15,17 +11,11 @@ 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_REDIS_URL='redis://localhost:6379/1'
 RS_STORAGE_URL='https://storage.kosmos.org'
-RS_AKKOUNTS_DOMAIN=localhost
+RS_REDIS_URL='redis://localhost:6379/1'

 WEBHOOKS_ALLOWED_IPS='10.1.1.23'
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,6 @@
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
-bun.lock

 # Ignore local dotenv config file
 .env
@@ -48,6 +47,3 @@ dump.rdb

 /app/assets/builds/*
 !/app/assets/builds/.keep
-
-# Ignore generated ctags
-*.tags
--- a/13
+++ b/13
@@ -1,11 +1,18 @@
 # syntax=docker/dockerfile:1
-FROM ruby:3.3.4
+FROM debian:bullseye-slim as base

 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

-RUN apt-get update -qq && apt-get install -y --no-install-recommends curl \
-      ldap-utils tini libvips
+# TODO Remove when upstream Ruby works properly on Apple silicon
+RUN apt update && apt install -y build-essential wget autoconf libpq-dev pkg-config
+RUN wget https://github.com/postmodern/ruby-install/releases/download/v0.9.3/ruby-install-0.9.3.tar.gz \
+  && tar -xzvf ruby-install-0.9.3.tar.gz \
+  && cd ruby-install-0.9.3/ \
+  && make install
+RUN ruby-install -p https://github.com/ruby/ruby/pull/9371.diff ruby 3.3.0
+ENV PATH="/opt/rubies/ruby-3.3.0/bin:${PATH}"

+RUN apt-get install -y --no-install-recommends curl ldap-utils tini libvips
 RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
 RUN apt-get update && apt-get install -y nodejs

--- a/26
+++ b/26
@@ -2,13 +2,13 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }

 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 8.0'
+gem 'rails', '~> 7.1'
 # Use Puma as the app server
-gem 'puma', '~> 6.6'
+gem 'puma', '~> 4.1'
 # View components
 gem "view_component"
-# Asset bundler
-gem 'propshaft'
+# Separate dependency since Rails 7.0
+gem 'sprockets-rails'
 # Allows custom JS build tasks to integrate with the asset pipeline
 gem 'cssbundling-rails'
 # Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
@@ -19,12 +19,17 @@ gem "turbo-rails"
 gem "stimulus-rails"
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.7'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 4.0'
 # Use Active Model has_secure_password
 gem 'bcrypt', '~> 3.1'

 # Configuration
 gem 'dotenv-rails'

+# Security
+gem 'lockbox'
+
 # Authentication
 gem 'warden'
 gem 'devise', '~> 4.9.0'
@@ -39,8 +44,6 @@ gem 'pagy', '~> 6.0', '>= 6.0.2'
 gem 'flipper'
 gem 'flipper-active_record'
 gem 'flipper-ui'
-gem 'gpgme', '~> 2.0.24'
-gem 'zbase32', '~> 0.1.1'

 # HTTP requests
 gem 'faraday'
@@ -48,8 +51,8 @@ gem 'down'
 gem 'aws-sdk-s3', require: false

 # Background/scheduled jobs
-gem 'solid_queue'
-gem "mission_control-jobs"
+gem 'sidekiq', '< 7'
+gem 'sidekiq-scheduler'

 # Monitoring
 gem "sentry-ruby"
@@ -58,13 +61,12 @@ gem "sentry-rails"
 # Services
 gem 'discourse_api'
 gem "lnurl"
-gem 'manifique', '~> 1.1.0'
-gem 'nostr', '~> 0.6.0'
-gem "redis", "~> 5.4"
+gem 'manifique'
+gem 'nostr'

 group :development, :test do
  # Use sqlite3 as the database for Active Record
-  gem 'sqlite3', '>= 2.1'
+  gem 'sqlite3', '~> 1.7.2'
  gem 'rspec-rails'
  gem 'rails-controller-testing'
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,109 +1,110 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (8.0.2)
-      actionpack (= 8.0.2)
-      activesupport (= 8.0.2)
+    actioncable (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (8.0.2)
-      actionpack (= 8.0.2)
-      activejob (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
-      mail (>= 2.8.0)
-    actionmailer (8.0.2)
-      actionpack (= 8.0.2)
-      actionview (= 8.0.2)
-      activejob (= 8.0.2)
-      activesupport (= 8.0.2)
-      mail (>= 2.8.0)
+    actionmailbox (7.1.3)
+      actionpack (= 7.1.3)
+      activejob (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.3)
+      actionpack (= 7.1.3)
+      actionview (= 7.1.3)
+      activejob (= 7.1.3)
+      activesupport (= 7.1.3)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
      rails-dom-testing (~> 2.2)
-    actionpack (8.0.2)
-      actionview (= 8.0.2)
-      activesupport (= 8.0.2)
+    actionpack (7.1.3)
+      actionview (= 7.1.3)
+      activesupport (= 7.1.3)
      nokogiri (>= 1.8.5)
+      racc
      rack (>= 2.2.4)
      rack-session (>= 1.0.1)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actiontext (8.0.2)
-      actionpack (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
+    actiontext (7.1.3)
+      actionpack (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (8.0.2)
-      activesupport (= 8.0.2)
+    actionview (7.1.3)
+      activesupport (= 7.1.3)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    activejob (8.0.2)
-      activesupport (= 8.0.2)
+    activejob (7.1.3)
+      activesupport (= 7.1.3)
      globalid (>= 0.3.6)
-    activemodel (8.0.2)
-      activesupport (= 8.0.2)
-    activerecord (8.0.2)
-      activemodel (= 8.0.2)
-      activesupport (= 8.0.2)
+    activemodel (7.1.3)
+      activesupport (= 7.1.3)
+    activerecord (7.1.3)
+      activemodel (= 7.1.3)
+      activesupport (= 7.1.3)
      timeout (>= 0.4.0)
-    activestorage (8.0.2)
-      actionpack (= 8.0.2)
-      activejob (= 8.0.2)
-      activerecord (= 8.0.2)
-      activesupport (= 8.0.2)
+    activestorage (7.1.3)
+      actionpack (= 7.1.3)
+      activejob (= 7.1.3)
+      activerecord (= 7.1.3)
+      activesupport (= 7.1.3)
      marcel (~> 1.0)
-    activesupport (8.0.2)
+    activesupport (7.1.3)
      base64
-      benchmark (>= 0.3)
      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
      connection_pool (>= 2.2.5)
      drb
      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.3)
-    aws-eventstream (1.3.2)
-    aws-partitions (1.1092.0)
-    aws-sdk-core (3.222.2)
+      mutex_m
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.886.0)
+    aws-sdk-core (3.191.0)
      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.992.0)
-      aws-sigv4 (~> 1.9)
-      base64
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
      jmespath (~> 1, >= 1.6.1)
-      logger
-    aws-sdk-kms (1.99.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.183.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-kms (1.77.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.143.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
      aws-eventstream (~> 1, >= 1.0.2)
    backport (1.2.0)
    base64 (0.2.0)
    bcrypt (3.1.20)
-    bech32 (1.5.0)
+    bech32 (1.4.2)
      thor (>= 1.1.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    benchmark (0.3.0)
+    bigdecimal (3.1.6)
    bindex (0.8.1)
    bip-schnorr (0.7.0)
      ecdsa_ext (~> 0.5.0)
-    builder (3.3.0)
+    builder (3.2.4)
    capybara (3.40.0)
      addressable
      matrix
@@ -113,25 +114,23 @@ GEM
      rack-test (>= 0.6.3)
      regexp_parser (>= 1.5, < 3.0)
      xpath (~> 3.2)
-    childprocess (5.1.0)
-      logger (~> 1.5)
    chunky_png (1.4.0)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.5.2)
-    crack (1.0.0)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    crack (0.4.6)
      bigdecimal
      rexml
    crass (1.0.6)
-    cssbundling-rails (1.4.3)
+    cssbundling-rails (1.4.0)
      railties (>= 6.0.0)
-    database_cleaner (2.1.0)
+    database_cleaner (2.0.2)
      database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.2.0)
+    database_cleaner-active_record (2.1.0)
      activerecord (>= 5.a)
      database_cleaner-core (~> 2.0.0)
    database_cleaner-core (2.0.1)
-    date (3.4.1)
-    devise (4.9.4)
+    date (3.3.4)
+    devise (4.9.3)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0)
@@ -140,112 +139,105 @@ GEM
    devise_ldap_authenticatable (0.8.7)
      devise (>= 3.4.1)
      net-ldap (>= 0.16.0)
-    diff-lcs (1.6.1)
+    diff-lcs (1.5.1)
    discourse_api (2.0.1)
      faraday (~> 2.7)
      faraday-follow_redirects
      faraday-multipart
      rack (>= 1.6)
-    dotenv (3.1.8)
-    dotenv-rails (3.1.8)
-      dotenv (= 3.1.8)
-      railties (>= 6.1)
-    down (5.4.2)
+    dotenv (2.8.1)
+    dotenv-rails (2.8.1)
+      dotenv (= 2.8.1)
+      railties (>= 3.2)
+    down (5.4.1)
      addressable (~> 2.8)
-    drb (2.2.1)
+    drb (2.2.0)
+      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.13.1)
-    et-orbi (1.2.11)
+    erubi (1.12.0)
+    et-orbi (1.2.7)
      tzinfo
    event_emitter (0.2.6)
    eventmachine (1.2.7)
-    factory_bot (6.5.1)
-      activesupport (>= 6.1.0)
-    factory_bot_rails (6.4.4)
-      factory_bot (~> 6.5)
+    factory_bot (6.4.6)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.4.3)
+      factory_bot (~> 6.4)
      railties (>= 5.0.0)
-    faker (3.5.1)
+    faker (3.2.3)
      i18n (>= 1.8.11, < 2)
-    faraday (2.9.2)
+    faraday (2.9.0)
      faraday-net_http (>= 2.0, < 3.2)
    faraday-follow_redirects (0.3.0)
      faraday (>= 1, < 3)
-    faraday-multipart (1.1.0)
-      multipart-post (~> 2.0)
-    faraday-net_http (3.1.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (3.1.0)
      net-http
    faye-websocket (0.11.3)
      eventmachine (>= 0.12.0)
      websocket-driver (>= 0.5.1)
-    ffi (1.17.2)
-    ffi (1.17.2-arm64-darwin)
-    ffi (1.17.2-x86_64-linux-gnu)
-    flipper (1.3.4)
+    ffi (1.16.3)
+    flipper (1.2.2)
      concurrent-ruby (< 2)
-    flipper-active_record (1.3.4)
-      activerecord (>= 4.2, < 9)
-      flipper (~> 1.3.4)
-    flipper-ui (1.3.4)
+    flipper-active_record (1.2.2)
+      activerecord (>= 4.2, < 8)
+      flipper (~> 1.2.2)
+    flipper-ui (1.2.2)
      erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 1.3.4)
+      flipper (~> 1.2.2)
      rack (>= 1.4, < 4)
-      rack-protection (>= 1.5.3, < 5.0.0)
-      rack-session (>= 1.0.2, < 3.0.0)
-      sanitize (< 8)
-    fugit (1.11.1)
-      et-orbi (~> 1, >= 1.2.11)
+      rack-protection (>= 1.5.3, <= 4.0.0)
+      sanitize (< 7)
+    fugit (1.9.0)
+      et-orbi (~> 1, >= 1.2.7)
      raabro (~> 1.4)
    globalid (1.2.1)
      activesupport (>= 6.1)
-    gpgme (2.0.24)
-      mini_portile2 (~> 2.7)
-    hashdiff (1.1.2)
-    i18n (1.14.7)
+    hashdiff (1.1.0)
+    i18n (1.14.1)
      concurrent-ruby (~> 1.0)
    image_processing (1.12.2)
      mini_magick (>= 4.9.5, < 5)
      ruby-vips (>= 2.0.17, < 3)
-    importmap-rails (2.1.0)
+    importmap-rails (2.0.1)
      actionpack (>= 6.0.0)
      activesupport (>= 6.0.0)
      railties (>= 6.0.0)
-    io-console (0.8.0)
-    irb (1.15.2)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
+    io-console (0.7.2)
+    irb (1.11.1)
+      rdoc
      reline (>= 0.4.2)
-    jaro_winkler (1.6.0)
-    jbuilder (2.13.0)
+    jaro_winkler (1.5.6)
+    jbuilder (2.11.5)
      actionview (>= 5.0.0)
      activesupport (>= 5.0.0)
    jmespath (1.6.2)
-    json (2.11.3)
-    kramdown (2.5.1)
-      rexml (>= 3.3.9)
+    json (2.7.1)
+    kramdown (2.4.0)
+      rexml
    kramdown-parser-gfm (1.1.0)
      kramdown (~> 2.0)
-    language_server-protocol (3.17.0.4)
-    launchy (3.1.1)
+    language_server-protocol (3.17.0.3)
+    launchy (2.5.2)
      addressable (~> 2.8)
-      childprocess (~> 5.0)
-      logger (~> 1.6)
-    letter_opener (1.10.0)
-      launchy (>= 2.2, < 4)
-    letter_opener_web (3.0.0)
-      actionmailer (>= 6.1)
-      letter_opener (~> 1.9)
-      railties (>= 6.1)
+    letter_opener (1.8.1)
+      launchy (>= 2.2, < 3)
+    letter_opener_web (2.0.0)
+      actionmailer (>= 5.2)
+      letter_opener (~> 1.7)
+      railties (>= 5.2)
      rexml
-    lint_roller (1.1.0)
-    listen (3.9.0)
+    listen (3.8.0)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
-    lnurl (1.1.1)
+    lnurl (1.1.0)
      bech32 (~> 1.1)
-    logger (1.7.0)
-    loofah (2.24.0)
+    lockbox (1.3.2)
+    loofah (2.22.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    mail (2.8.1)
@@ -253,31 +245,22 @@ 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)
-    marcel (1.0.4)
+    marcel (1.0.2)
    matrix (0.4.2)
-    method_source (1.1.0)
-    mini_magick (4.13.2)
+    method_source (1.0.0)
+    mini_magick (4.12.0)
    mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
-    minitest (5.25.5)
-    mission_control-jobs (1.0.2)
-      actioncable (>= 7.1)
-      actionpack (>= 7.1)
-      activejob (>= 7.1)
-      activerecord (>= 7.1)
-      importmap-rails (>= 1.2.1)
-      irb (~> 1.13)
-      railties (>= 7.1)
-      stimulus-rails
-      turbo-rails
-    multipart-post (2.4.1)
-    net-http (0.6.0)
+    mini_portile2 (2.8.5)
+    minitest (5.21.2)
+    multipart-post (2.3.0)
+    mutex_m (0.2.0)
+    net-http (0.4.1)
      uri
-    net-imap (0.5.7)
+    net-imap (0.4.9.1)
      date
      net-protocol
    net-ldap (0.19.0)
@@ -285,74 +268,62 @@ GEM
      net-protocol
    net-protocol (0.2.2)
      timeout
-    net-smtp (0.5.1)
+    net-smtp (0.4.0.1)
      net-protocol
-    nio4r (2.7.4)
-    nokogiri (1.16.8)
+    nio4r (2.7.0)
+    nokogiri (1.16.0)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.16.8-arm64-darwin)
+    nokogiri (1.16.0-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.8-x86_64-linux)
+    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)
      json (~> 2.6)
-    observer (0.1.2)
    orm_adapter (0.5.0)
-    ostruct (0.6.1)
-    pagy (6.5.0)
-    parallel (1.27.0)
-    parser (3.3.8.0)
+    pagy (6.4.3)
+    parallel (1.24.0)
+    parser (3.3.0.5)
      ast (~> 2.4.1)
      racc
-    pg (1.5.9)
-    pp (0.6.2)
-      prettyprint
-    prettyprint (0.2.0)
-    prism (1.4.0)
-    propshaft (1.1.0)
-      actionpack (>= 7.0.0)
-      activesupport (>= 7.0.0)
-      rack
-      railties (>= 7.0.0)
-    psych (5.2.3)
-      date
+    pg (1.5.4)
+    psych (5.1.2)
      stringio
-    public_suffix (6.0.1)
-    puma (6.6.0)
+    public_suffix (5.0.4)
+    puma (4.3.12)
      nio4r (~> 2.0)
    raabro (1.4.0)
-    racc (1.8.1)
-    rack (2.2.13)
+    racc (1.7.3)
+    rack (2.2.8)
    rack-protection (3.2.0)
      base64 (>= 0.1.0)
      rack (~> 2.2, >= 2.2.4)
    rack-session (1.0.2)
      rack (< 3)
-    rack-test (2.2.0)
+    rack-test (2.1.0)
      rack (>= 1.3)
-    rackup (1.0.1)
+    rackup (1.0.0)
      rack (< 3)
      webrick
-    rails (8.0.2)
-      actioncable (= 8.0.2)
-      actionmailbox (= 8.0.2)
-      actionmailer (= 8.0.2)
-      actionpack (= 8.0.2)
-      actiontext (= 8.0.2)
-      actionview (= 8.0.2)
-      activejob (= 8.0.2)
-      activemodel (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
+    rails (7.1.3)
+      actioncable (= 7.1.3)
+      actionmailbox (= 7.1.3)
+      actionmailer (= 7.1.3)
+      actionpack (= 7.1.3)
+      actiontext (= 7.1.3)
+      actionview (= 7.1.3)
+      activejob (= 7.1.3)
+      activemodel (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
      bundler (>= 1.15.0)
-      railties (= 8.0.2)
+      railties (= 7.1.3)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
@@ -361,140 +332,138 @@ GEM
      activesupport (>= 5.0.0)
      minitest
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
+    rails-html-sanitizer (1.6.0)
      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+      nokogiri (~> 1.14)
    rails-settings-cached (2.8.3)
      activerecord (>= 5.0.0)
      railties (>= 5.0.0)
-    railties (8.0.2)
-      actionpack (= 8.0.2)
-      activesupport (= 8.0.2)
-      irb (~> 1.13)
+    railties (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
+      irb
      rackup (>= 1.0.0)
      rake (>= 12.2)
      thor (~> 1.0, >= 1.2.2)
      zeitwerk (~> 2.6)
    rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.1.0)
    rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
+    rb-inotify (0.10.1)
      ffi (~> 1.0)
-    rbs (3.9.2)
-      logger
-    rdoc (6.13.1)
+    rbs (2.8.4)
+    rdoc (6.6.2)
      psych (>= 4.0.0)
-    redis (5.4.0)
-      redis-client (>= 0.22.0)
-    redis-client (0.24.0)
-      connection_pool
-    regexp_parser (2.10.0)
-    reline (0.6.1)
+    redis (4.8.1)
+    regexp_parser (2.9.0)
+    reline (0.4.2)
      io-console (~> 0.5)
    responders (3.1.1)
      actionpack (>= 5.2)
      railties (>= 5.2)
-    reverse_markdown (3.0.0)
+    reverse_markdown (2.1.1)
      nokogiri
-    rexml (3.4.1)
+    rexml (3.2.6)
    rqrcode (2.2.0)
      chunky_png (~> 1.0)
      rqrcode_core (~> 1.0)
    rqrcode_core (1.2.0)
-    rspec-core (3.13.3)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-rails (7.1.1)
-      actionpack (>= 7.0)
-      activesupport (>= 7.0)
-      railties (>= 7.0)
-      rspec-core (~> 3.13)
-      rspec-expectations (~> 3.13)
-      rspec-mocks (~> 3.13)
-      rspec-support (~> 3.13)
-    rspec-support (3.13.2)
-    rubocop (1.75.3)
+      rspec-support (~> 3.12.0)
+    rspec-rails (6.1.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
+    rspec-support (3.12.1)
+    rubocop (1.60.2)
      json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
+      language_server-protocol (>= 3.17.0)
      parallel (~> 1.10)
      parser (>= 3.3.0.2)
      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
-      parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
    ruby-progressbar (1.13.0)
-    ruby-vips (2.2.3)
+    ruby-vips (2.2.0)
      ffi (~> 1.12)
-      logger
-    sanitize (7.0.0)
+    ruby2_keywords (0.0.5)
+    rufus-scheduler (3.9.1)
+      fugit (~> 1.1, >= 1.1.6)
+    sanitize (6.1.0)
      crass (~> 1.0.2)
-      nokogiri (>= 1.16.8)
-    securerandom (0.4.1)
-    sentry-rails (5.23.0)
+      nokogiri (>= 1.12.0)
+    sentry-rails (5.16.1)
      railties (>= 5.0)
-      sentry-ruby (~> 5.23.0)
-    sentry-ruby (5.23.0)
-      bigdecimal
+      sentry-ruby (~> 5.16.1)
+    sentry-ruby (5.16.1)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-    solargraph (0.54.2)
+    sidekiq (6.5.12)
+      connection_pool (>= 2.2.5, < 3)
+      rack (~> 2.0)
+      redis (>= 4.5.0, < 5)
+    sidekiq-scheduler (5.0.3)
+      rufus-scheduler (~> 3.2)
+      sidekiq (>= 6, < 8)
+      tilt (>= 1.4.0)
+    solargraph (0.50.0)
      backport (~> 1.2)
-      benchmark (~> 0.4)
+      benchmark
      bundler (~> 2.0)
      diff-lcs (~> 1.4)
-      jaro_winkler (~> 1.6)
+      e2mmap
+      jaro_winkler (~> 1.5)
      kramdown (~> 2.3)
      kramdown-parser-gfm (~> 1.1)
-      logger (~> 1.6)
-      observer (~> 0.1)
-      ostruct (~> 0.6)
      parser (~> 3.0)
-      rbs (~> 3.3)
-      reverse_markdown (~> 3.0)
+      rbs (~> 2.0)
+      reverse_markdown (~> 2.0)
      rubocop (~> 1.38)
      thor (~> 1.0)
      tilt (~> 2.0)
      yard (~> 0.9, >= 0.9.24)
-      yard-solargraph (~> 0.1)
-    solid_queue (1.1.5)
-      activejob (>= 7.1)
-      activerecord (>= 7.1)
-      concurrent-ruby (>= 1.3.1)
-      fugit (~> 1.11.0)
-      railties (>= 7.1)
-      thor (~> 1.3.1)
-    sqlite3 (2.6.0)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.7.2)
      mini_portile2 (~> 2.8.0)
-    sqlite3 (2.6.0-arm64-darwin)
-    sqlite3 (2.6.0-x86_64-linux-gnu)
-    stimulus-rails (1.3.4)
+    sqlite3 (1.7.2-arm64-darwin)
+    sqlite3 (1.7.2-x86_64-linux)
+    stimulus-rails (1.3.3)
+      railties (>= 6.0.0)
+    stringio (3.1.0)
+    thor (1.3.0)
+    tilt (2.3.0)
+    timeout (0.4.1)
+    turbo-rails (1.5.0)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
      railties (>= 6.0.0)
-    stringio (3.1.7)
-    thor (1.3.2)
-    tilt (2.6.0)
-    timeout (0.4.3)
-    turbo-rails (2.0.13)
-      actionpack (>= 7.1.0)
-      railties (>= 7.1.0)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
-    useragent (0.16.11)
-    view_component (3.22.0)
-      activesupport (>= 5.2.0, < 8.1)
-      concurrent-ruby (= 1.3.4)
+    unicode-display_width (2.5.0)
+    uri (0.13.0)
+    view_component (3.10.0)
+      activesupport (>= 5.2.0, < 8.0)
+      concurrent-ruby (~> 1.0)
      method_source (~> 1.0)
    warden (1.2.9)
      rack (>= 2.0.9)
@@ -503,22 +472,18 @@ GEM
      activemodel (>= 6.0.0)
      bindex (>= 0.4.0)
      railties (>= 6.0.0)
-    webmock (3.25.1)
+    webmock (3.19.1)
      addressable (>= 2.8.0)
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.1)
-    websocket-driver (0.7.7)
-      base64
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    yard (0.9.37)
-    yard-solargraph (0.1.0)
-      yard (~> 0.9)
-    zbase32 (0.1.1)
-    zeitwerk (2.7.2)
+    yard (0.9.34)
+    zeitwerk (2.6.12)

 PLATFORMS
  arm64-darwin-22
@@ -542,7 +507,6 @@ DEPENDENCIES
  flipper
  flipper-active_record
  flipper-ui
-  gpgme (~> 2.0.24)
  image_processing (~> 1.12.2)
  importmap-rails
  jbuilder (~> 2.7)
@@ -550,25 +514,25 @@ DEPENDENCIES
  letter_opener_web
  listen (~> 3.2)
  lnurl
-  manifique (~> 1.1.0)
-  mission_control-jobs
+  lockbox
+  manifique
  net-ldap
-  nostr (~> 0.6.0)
+  nostr
  pagy (~> 6.0, >= 6.0.2)
  pg (~> 1.5)
-  propshaft
-  puma (~> 6.6)
-  rails (~> 8.0)
+  puma (~> 4.1)
+  rails (~> 7.1)
  rails-controller-testing
  rails-settings-cached (~> 2.8.3)
-  redis (~> 5.4)
  rqrcode (~> 2.0)
  rspec-rails
  sentry-rails
  sentry-ruby
+  sidekiq (< 7)
+  sidekiq-scheduler
  solargraph
-  solid_queue
-  sqlite3 (>= 2.1)
+  sprockets-rails
+  sqlite3 (~> 1.7.2)
  stimulus-rails
  turbo-rails
  tzinfo-data
@@ -576,7 +540,6 @@ DEPENDENCIES
  warden
  web-console (~> 4.2)
  webmock
-  zbase32 (~> 0.1.1)

 BUNDLED WITH
   2.5.5
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ Running the test suite:
 Running the test suite with Docker Compose requires overriding the Rails
 environment:

-    docker-compose exec -e "RAILS_ENV=test" web rspec
+    docker-compose run -e "RAILS_ENV=test" web rspec

 ### Docker Compose

--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -0,0 +1,4 @@
+//= link_tree ../images
+//= link_tree ../../javascript .js
+//= link_tree ../builds
+//= link_tree ../../../vendor/javascript .js
--- 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.rb
+++ b/app/components/app_catalog/web_app_icon_component.rb
@@ -2,8 +2,6 @@

 module AppCatalog
  class WebAppIconComponent < ViewComponent::Base
-    include ApplicationHelper
-
    def initialize(web_app:)
      if web_app&.icon&.attached?
        @image_url = image_url_for(web_app.icon)
@@ -11,5 +9,13 @@ module AppCatalog
        @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/dropdown_link_component.html.erb
+++ b/app/components/dropdown_link_component.html.erb
@@ -1,4 +1,4 @@
-<%= link_to @href, class: @class, target: @target, data: {
+<%= link_to @href, class: @class, data: {
      'dropdown-target': "menuItem",
      'action': "keydown.up->dropdown#previousItem:prevent keydown.down->dropdown#nextItem:prevent"
    } do %>
--- a/app/components/dropdown_link_component.rb
+++ b/app/components/dropdown_link_component.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true

 class DropdownLinkComponent < ViewComponent::Base
-  def initialize(href:, open_in_new_tab: false, separator: false, add_class: nil)
+  def initialize(href:, separator: false, add_class: nil)
    @href = href
-    @target = open_in_new_tab ? "_blank" : nil
    @class = class_str(separator, add_class)
  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
@@ -12,8 +12,7 @@
  </div>
  <%= render DropdownComponent.new do %>
    <%= render DropdownLinkComponent.new(
-          href: launch_app_services_storage_rs_auth_url(@auth),
-          open_in_new_tab: true
+          href: launch_app_services_storage_rs_auth_url(@auth)
        ) do %>
      Launch app
    <% end %>
--- a/app/components/sidenav_link_component.rb
+++ b/app/components/sidenav_link_component.rb
@@ -29,7 +29,7 @@ class SidenavLinkComponent < ViewComponent::Base

  def class_names_icon(path)
    if @active
-      "text-teal-600 group-hover:text-teal-600 flex-shrink-0 -ml-1 mr-3 h-6 w-6"
+      "text-teal-500 group-hover:text-teal-500 flex-shrink-0 -ml-1 mr-3 h-6 w-6"
    elsif @disabled
      "text-gray-300 group-hover:text-gray-300 flex-shrink-0 -ml-1 mr-3 h-6 w-6"
    else
--- a/app/controllers/admin/lightning_controller.rb
+++ b/app/controllers/admin/lightning_controller.rb
@@ -4,7 +4,7 @@ class Admin::LightningController < Admin::BaseController
  def index
    @current_section = :lightning

-    @users = User.pluck(:cn, :ou, :lndhub_username)
+    @users = User.pluck(:cn, :ou, :ln_account)
    @accounts = LndhubAccount.with_balances.order(balance: :desc).to_a

    @ln = {}
--- a/app/controllers/admin/settings/membership_controller.rb
+++ b/app/controllers/admin/settings/membership_controller.rb
@@ -1,23 +0,0 @@
-class Admin::Settings::MembershipController < Admin::SettingsController
-  def show
-  end
-
-  def update
-    update_settings
-
-    redirect_to admin_settings_membership_path, flash: {
-      success: "Settings saved"
-    }
-  end
-
-  private
-
-    def setting_params
-      params.require(:setting).permit([
-        :member_status_contributor,
-        :member_status_sustainer,
-        :user_index_show_contributors,
-        :user_index_show_sustainers
-      ])
-    end
-end
--- a/app/controllers/admin/settings/registrations_controller.rb
+++ b/app/controllers/admin/settings/registrations_controller.rb
@@ -9,12 +9,4 @@ class Admin::Settings::RegistrationsController < Admin::SettingsController
      success: "Settings saved"
    }
  end
-
-  private
-
-    def setting_params
-      params.require(:setting).permit([
-        :reserved_usernames, default_services: []
-      ])
-    end
 end
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -9,12 +9,11 @@ class Admin::SettingsController < Admin::BaseController
    changed_keys = []

    setting_params.keys.each do |key|
-      next if clean_param(key).nil? ||
-        (Setting.send(key).to_s == clean_param(key))
-
+      next if setting_params[key].nil? ||
+              (Setting.send(key).to_s == setting_params[key].strip)
      changed_keys.push(key)
      setting = Setting.new(var: key)
-      setting.value = clean_param(key)
+      setting.value = setting_params[key].strip
      unless setting.valid?
        @errors.merge!(setting.errors)
      end
@@ -25,7 +24,7 @@ class Admin::SettingsController < Admin::BaseController
    end

    changed_keys.each do |key|
-      Setting.send("#{key}=", clean_param(key))
+      Setting.send("#{key}=", setting_params[key].strip)
    end
  end

@@ -38,12 +37,4 @@ class Admin::SettingsController < Admin::BaseController
    def setting_params
      params.require(:setting).permit(Setting.editable_keys.map(&:to_sym))
    end
-
-    def clean_param(key)
-      if Setting.get_field(key)[:type] == :string
-        setting_params[key].strip
-      else
-        setting_params[key]
-      end
-    end
 end
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -4,22 +4,14 @@ class Admin::UsersController < Admin::BaseController

  # GET /admin/users
  def index
-    ldap = LdapService.new
-    ou   = Setting.primary_domain
-    @show_contributors = Setting.user_index_show_contributors
-    @show_sustainers = Setting.user_index_show_sustainers
-
-    @contributors = ldap.search_users(:memberStatus, :contributor, :cn) if @show_contributors
-    @sustainers   = ldap.search_users(:memberStatus, :sustainer, :cn) if @show_sustainers
-    @admins       = ldap.search_users(:admin, true, :cn)
-    @pagy, @users = pagy(User.where(ou: ou).order(cn: :asc))
+    ldap   = LdapService.new
+    @ou    = Setting.primary_domain
+    @pagy, @users = pagy(User.where(ou: @ou).order(cn: :asc))

    @stats = {
-      users_confirmed: User.where(ou: ou).confirmed.count,
-      users_pending: User.where(ou: ou).pending.count
+      users_confirmed: User.where(ou: @ou).confirmed.count,
+      users_pending: User.where(ou: @ou).pending.count
    }
-    @stats[:users_contributing] = @contributors.size if @show_contributors
-    @stats[:users_paying] = @sustainers.size if @show_sustainers
  end

  # GET /admin/users/:username
@@ -30,7 +22,7 @@ class Admin::UsersController < Admin::BaseController

    @services_enabled = @user.services_enabled

-    @ldap_avatar = LdapManager::FetchAvatar.call(cn: @user.cn)
+    @avatar = LdapManager::FetchAvatar.call(cn: @user.cn)
  end

  # POST /admin/users/:username/invitations
@@ -38,7 +30,7 @@ class Admin::UsersController < Admin::BaseController
    amount = params[:amount].to_i
    notify_user = ActiveRecord::Type::Boolean.new.cast(params[:notify_user])

-    UserManager::CreateInvitations.call(user: @user, amount: amount, notify: notify_user)
+    CreateInvitations.call(user: @user, amount: amount, notify: notify_user)

    redirect_to admin_user_path(@user.cn), flash: {
      success: "Added #{amount} invitations to #{@user.cn}'s account"
--- 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/avatars_controller.rb
+++ b/app/controllers/avatars_controller.rb
@@ -1,27 +0,0 @@
-class AvatarsController < ApplicationController
-  def show
-    if user = User.find_by(cn: params[:username])
-      http_status :not_found and return unless user.avatar.attached?
-
-      sha256_hash = params[:hash]
-      format = params[:format]&.to_sym || :png
-      # size = params[:size]&.to_sym || :original
-
-      unless user.avatar.filename.to_s == "#{sha256_hash}.#{format}"
-        http_status :not_found and return
-      end
-
-      # TODO See note for avatar_variant in user model
-      # blob = if size == :original
-      #          user.avatar.blob
-      #        else
-      #          user.avatar_variant(size: size)&.blob
-      #        end
-
-      data = user.avatar.blob.download
-      send_data data, type: "image/#{format}", disposition: "inline"
-    else
-      http_status :not_found
-    end
-  end
-end
--- a/app/controllers/discourse/sso_controller.rb
+++ b/app/controllers/discourse/sso_controller.rb
@@ -8,9 +8,6 @@ class Discourse::SsoController < ApplicationController
    sso.email = current_user.email
    sso.username = current_user.cn
    sso.name = current_user.display_name
-    if current_user.avatar.attached?
-      sso.avatar_url = helpers.image_url_for(current_user.avatar)
-    end
    sso.admin = current_user.is_admin?
    sso.sso_secret = secret

--- 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

  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?

@@ -37,14 +27,13 @@ class LnurlpayController < ApplicationController
      pubkey: Setting.lndhub_public_key,
      customData: [{
        customKey: "696969",
-        customValue: @user.lndhub_username
+        customValue: @user.ln_account
      }]
    }
  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?(:ejabberd)
+    @service_enabled = current_user.services_enabled.include?(:xmpp)
  end

  private
--- a/app/controllers/services/lightning_controller.rb
+++ b/app/controllers/services/lightning_controller.rb
@@ -9,7 +9,7 @@ class Services::LightningController < ApplicationController
  before_action :lndhub_fetch_balance

  def index
-    @wallet_setup_url = "lndhub://#{current_user.lndhub_username}:#{current_user.lndhub_password}@#{ENV['LNDHUB_PUBLIC_URL']}"
+    @wallet_setup_url = "lndhub://#{current_user.ln_account}:#{current_user.ln_password}@#{ENV['LNDHUB_PUBLIC_URL']}"
  end

  def transactions
--- 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
@@ -23,11 +18,7 @@ class Services::RsAuthsController < Services::BaseController
  end

  def launch_app
-    user_address = Rails.env.development? ?
-      "#{current_user.cn}@localhost:3000" :
-      current_user.address
-
-    launch_url = "#{@auth.launch_url}#remotestorage=#{user_address}"
+    launch_url = "#{@auth.launch_url}#remotestorage=#{current_user.address}&access_token=#{@auth.token}"

    redirect_to launch_url, allow_other_host: true
  end
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -12,21 +12,15 @@ 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 == "nostr"
      session[:shared_secret] ||= SecureRandom.base64(12)
    end
  end

-  # PUT /settings/:section
  def update
    @user.preferences.merge!(user_params[:preferences] || {})
    @user.display_name = user_params[:display_name]
-    @user.avatar_new   = user_params[:avatar_new]
-    @user.pgp_pubkey   = user_params[:pgp_pubkey]
+    @user.avatar_new = user_params[:avatar]

    if @user.save
      if @user.display_name && (@user.display_name != @user.ldap_entry[:display_name])
@@ -34,16 +28,7 @@ class SettingsController < ApplicationController
      end

      if @user.avatar_new.present?
-        if store_user_avatar
-          UserManager::UpdateAvatar.call(user: @user)
-        else
-          @validation_errors = @user.errors
-          render :show, status: :unprocessable_entity and return
-        end
-      end
-
-      if @user.pgp_pubkey && (@user.pgp_pubkey != @user.ldap_entry[:pgp_key])
-        UserManager::UpdatePgpKey.call(user: @user)
+        LdapManager::UpdateAvatar.call(dn: @user.dn, file: @user.avatar_new)
      end

      redirect_to setting_path(@settings_section), flash: {
@@ -55,7 +40,6 @@ class SettingsController < ApplicationController
    end
  end

-  # POST /settings/update_email
  def update_email
    if @user.valid_ldap_authentication?(security_params[:current_password])
      if @user.update email: email_params[:email]
@@ -73,7 +57,6 @@ class SettingsController < ApplicationController
    end
  end

-  # POST /settings/reset_email_password
  def reset_email_password
    @user.current_password = security_params[:current_password]

@@ -96,7 +79,6 @@ class SettingsController < ApplicationController
    end
  end

-  # POST /settings/reset_password
  def reset_password
    current_user.send_reset_password_instructions
    sign_out current_user
@@ -104,29 +86,26 @@ class SettingsController < ApplicationController
    redirect_to check_your_email_path, notice: msg
  end

-  # POST /settings/set_nostr_pubkey
  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_sig  = signed_event.verify_signature
-    is_valid_auth = NostrManager::VerifyAuth.call(
-      event: signed_event,
-      challenge: session[:shared_secret]
-    )
+    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]})"

-    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)
+    user_with_pubkey = LdapManager::FetchUserByNostrKey.call(pubkey: signed_event[:pubkey])

    if user_with_pubkey.present? && (user_with_pubkey != current_user)
      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)
+    LdapManager::UpdateNostrKey.call(dn: current_user.dn, pubkey: signed_event[:pubkey])
    session[:shared_secret] = nil

    flash[:success] = "Public key verification successful"
@@ -166,10 +145,11 @@ class SettingsController < ApplicationController
    end

    def user_params
-      params.require(:user).permit(
-        :display_name, :avatar_new, :pgp_pubkey,
-        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
@@ -180,6 +160,12 @@ class SettingsController < ApplicationController
      params.require(:user).permit(:current_password)
    end

+    def nostr_event_params
+      params.permit(signed_event: [
+        :id, :pubkey, :created_at, :kind, :content, :sig, tags: []
+      ])
+    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
@@ -189,30 +175,4 @@ class SettingsController < ApplicationController
      salt = BCrypt::Engine.generate_salt
      BCrypt::Engine.hash_secret(password, salt)
    end
-
-    def store_user_avatar
-      io = @user.avatar_new.tempfile
-      img_data = UserManager::ProcessAvatar.call(io: io)
-      if img_data.blank?
-        @user.errors.add(:avatar, "failed to process file")
-        false
-      end
-      tempfile = Tempfile.create
-      tempfile.binmode
-      tempfile.write(img_data)
-      tempfile.rewind
-
-      hash = Digest::SHA256.hexdigest(img_data)
-      ext = @user.avatar_new.content_type == "image/png" ? "png" : "jpg"
-      filename = "#{hash}.#{ext}"
-
-      if filename == @user.avatar.filename.to_s
-        @user.errors.add(:avatar, "must be a new file/picture")
-        false
-      else
-        key = "users/#{@user.cn}/avatars/#{filename}"
-        @user.avatar.attach io: tempfile, key: key, filename: filename
-        @user.save
-      end
-    end
 end
--- a/app/controllers/signup_controller.rb
+++ b/app/controllers/signup_controller.rb
@@ -96,7 +96,7 @@ class SignupController < ApplicationController
    session[:new_user] = nil
    session[:validation_error] = nil

-    UserManager::CreateAccount.call(account: {
+    CreateAccount.call(account: {
      username: @user.cn,
      domain: Setting.primary_domain,
      email: @user.email,
--- 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/web_key_directory_controller.rb
+++ b/app/controllers/web_key_directory_controller.rb
@@ -1,43 +0,0 @@
-class WebKeyDirectoryController < WellKnownController
-  before_action :allow_cross_origin_requests
-
-  # /.well-known/openpgpkey/hu/:hashed_username(.txt)?l=username
-  def show
-    if params[:l].blank?
-      # TODO store hashed username in db if existing implementations trigger
-      # this a lot
-      msg = "WKD request with \"l\" param omitted for hu: #{params[:hashed_username]}"
-      Sentry.capture_message(msg) if Setting.sentry_enabled?
-      http_status :bad_request and return
-    end
-
-    @user = User.find_by(cn: params[:l].downcase)
-
-    if @user.nil? ||
-       @user.pgp_pubkey.blank? ||
-       !@user.pgp_pubkey_contains_user_address?
-      http_status :not_found and return
-    end
-
-    if params[:hashed_username] != @user.wkd_hash
-      http_status :unprocessable_entity and return
-    end
-
-    respond_to do |format|
-      format.text do
-        response.headers['Content-Type'] = 'text/plain'
-        render plain: @user.pgp_pubkey
-      end
-
-      format.any do
-        key = @user.gnupg_key.export
-        send_data key, filename: "#{@user.wkd_hash}.pem",
-                       type: "application/octet-stream"
-      end
-    end
-  end
-
-  def policy
-    head :ok
-  end
-end
--- a/app/controllers/webfinger_controller.rb
+++ b/app/controllers/webfinger_controller.rb
@@ -1,19 +1,20 @@
-class WebfingerController < WellKnownController
+class WebfingerController < ApplicationController
  before_action :allow_cross_origin_requests, only: [:show]

+  layout false
+
  def show
    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

@@ -27,74 +28,22 @@ class WebfingerController < WellKnownController
  private

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

-    if @user.avatar.attached?
-      jrd[:links] += avatar_link
-    end
+    # TODO check if storage service is enabled for user, not just globally
+    links << remotestorage_link if Setting.remotestorage_enabled

-    if Setting.mastodon_enabled && @user.service_enabled?(:mastodon)
-      # https://docs.joinmastodon.org/spec/webfinger/
-      jrd[:aliases] += mastodon_aliases
-      jrd[:links] += mastodon_links
-    end
-
-    if Setting.remotestorage_enabled && @user.service_enabled?(:remotestorage)
-      # https://datatracker.ietf.org/doc/draft-dejong-remotestorage/
-      jrd[:links] << remotestorage_link
-    end
-
-    jrd
-  end
-
-  def avatar_link
-    [
-      {
-        rel: "http://webfinger.net/rel/avatar",
-        type: @user.avatar.content_type,
-        href: helpers.image_url_for(@user.avatar)
-      }
-    ]
-  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
-    auth_url = new_rs_oauth_url(@username, host: Setting.rs_accounts_domain)
+    auth_url = new_rs_oauth_url(@username)
    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
@@ -103,4 +52,10 @@ class WebfingerController < WellKnownController
      }
    }
  end
+
+  def allow_cross_origin_requests
+    return unless Rails.env.development?
+    headers['Access-Control-Allow-Origin'] = "*"
+    headers['Access-Control-Allow-Methods'] = "GET"
+  end
 end
--- 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!(lndhub_username: @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,47 +1,16 @@
 class WellKnownController < ApplicationController
-  before_action :require_nostr_enabled, only: [ :nostr ]
-  before_action :allow_cross_origin_requests, only: [ :nostr ]
-
-  layout false
-
  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] == "_"
-      if domain == Setting.primary_domain
-        # pubkey for the primary domain without a username (e.g. kosmos.org)
-        res = { names: { "_": Setting.nostr_public_key_primary_domain.presence || Setting.nostr_public_key } }
-      else
-        # pubkey for the akkounts domain without a username (e.g. accounts.kosmos.org)
-        res = { names: { "_": Setting.nostr_public_key } }
-      end
-
-      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
-
-    def allow_cross_origin_requests
-      headers['Access-Control-Allow-Origin'] = "*"
-      headers['Access-Control-Allow-Methods'] = "GET"
-    end
 end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -14,19 +14,4 @@ module ApplicationHelper
  def badge(text, color)
    tag.span text, class: "inline-flex items-center rounded-full bg-#{color}-100 px-2.5 py-0.5 text-xs font-medium text-#{color}-800"
  end
-
-  def image_url_for(attachment)
-    return s3_image_url(attachment) if Setting.s3_enabled?
-
-    if attachment.record.is_a?(User) && attachment.name == "avatar"
-      hash, format = attachment.blob.filename.to_s.split(".", 2)
-      user_avatar_url(
-        username: attachment.record.cn,
-        hash: hash,
-        format: format
-      )
-    else
-      Rails.application.routes.url_helpers.rails_blob_path(attachment, only_path: true)
-    end
-  end
 end
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -0,0 +1,2 @@
+module DashboardHelper
+end
--- a/app/helpers/donations_helper.rb
+++ b/app/helpers/donations_helper.rb
@@ -0,0 +1,2 @@
+module DonationsHelper
+end
--- a/app/helpers/invitations_helper.rb
+++ b/app/helpers/invitations_helper.rb
@@ -0,0 +1,2 @@
+module InvitationsHelper
+end
--- a/app/helpers/lnurlpay_helper.rb
+++ b/app/helpers/lnurlpay_helper.rb
@@ -0,0 +1,2 @@
+module LnurlpayHelper
+end
--- a/app/helpers/services_helper.rb
+++ b/app/helpers/services_helper.rb
@@ -1,12 +0,0 @@
-module ServicesHelper
-
-  def service_human_name(key, category = :external)
-    SERVICES[category][key][:name] || key.to_s
-  end
-
-  def service_display_name(key, category = :external)
-    SERVICES[category][key][:display_name] ||
-    service_human_name(key, category)
-  end
-
-end
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -0,0 +1,2 @@
+module SettingsHelper
+end
--- a/app/helpers/signup_helper.rb
+++ b/app/helpers/signup_helper.rb
@@ -0,0 +1,2 @@
+module SignupHelper
+end
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -0,0 +1,2 @@
+module UsersHelper
+end
--- a/app/helpers/wallet_helper.rb
+++ b/app/helpers/wallet_helper.rb
@@ -0,0 +1,2 @@
+module WalletHelper
+end
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -0,0 +1,2 @@
+module WelcomeHelper
+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,10 +1,10 @@
 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", "inetOrgPerson", "extensibleObject"],
+      objectclass: ["top", "account", "person", "extensibleObject"],
      cn: username,
      sn: username,
      uid: username,
@@ -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/create_lndhub_account_job.rb
+++ b/app/jobs/create_lndhub_account_job.rb
@@ -2,12 +2,12 @@ class CreateLndhubAccountJob < ApplicationJob
  queue_as :default

  def perform(user)
-    return if user.lndhub_username.present? && user.lndhub_password.present?
+    return if user.ln_account.present? && user.ln_password.present?

    lndhub = LndhubV2.new
    credentials = lndhub.create_account

-    user.update! lndhub_username: credentials["login"],
-                 lndhub_password: credentials["password"]
+    user.update! ln_account: credentials["login"],
+                 ln_password: credentials["password"]
  end
 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/remote_storage_expire_authorization_job.rb
+++ b/app/jobs/remote_storage_expire_authorization_job.rb
@@ -3,6 +3,8 @@ class RemoteStorageExpireAuthorizationJob < ApplicationJob

  def perform(rs_auth_id)
    rs_auth = RemoteStorageAuthorization.find rs_auth_id
+    return unless rs_auth.expire_at.nil? || rs_auth.expire_at <= DateTime.now
+
    rs_auth.destroy!
  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?(:ejabberd) &&
-                  invitee.service_enabled?(:ejabberd) &&
+    return unless inviter.services_enabled.include?("xmpp") &&
+                  invitee.services_enabled.include?("xmpp") &&
                  inviter.preferences[:xmpp_exchange_contacts_with_invitees]

    ejabberd = EjabberdApiClient.new
--- a/app/jobs/xmpp_set_avatar_job.rb
+++ b/app/jobs/xmpp_set_avatar_job.rb
@@ -1,97 +0,0 @@
-require 'digest'
-require "image_processing/vips"
-
-class XmppSetAvatarJob < ApplicationJob
-  queue_as :default
-
-  def perform(user:, overwrite: false)
-    return if Rails.env.development?
-    @user = user
-
-    unless overwrite
-      current_avatar = get_current_avatar
-      Rails.logger.info { "User #{user.cn} already has an avatar set" }
-      return if current_avatar.present?
-    end
-
-    Rails.logger.debug { "Setting XMPP avatar for user #{user.cn}" }
-
-    stanzas = build_xep0084_stanzas
-
-    stanzas.each do |stanza|
-      payload = { from: @user.address, to: @user.address, stanza: stanza }
-      res = ejabberd.send_stanza payload
-      raise res.inspect if res.status != 200
-    end
-  end
-
-  private
-
-    def ejabberd
-      @ejabberd ||= EjabberdApiClient.new
-    end
-
-    def get_current_avatar
-      res = ejabberd.get_vcard2 @user, "PHOTO", "BINVAL"
-
-      if res.status == 200
-        # VCARD PHOTO/BINVAL prop exists
-        res.body
-      elsif res.status == 400
-        # VCARD or PHOTO/BINVAL prop does not exist
-        nil
-      else
-        # Unexpected error, let job fail
-        raise res.inspect
-      end
-    end
-
-    def process_avatar
-      @user.avatar.blob.open do |file|
-        processed = ImageProcessing::Vips
-          .source(file)
-          .resize_to_fill(256, 256)
-          .convert("png")
-          .call
-        processed.read
-      end
-    end
-
-    # See https://xmpp.org/extensions/xep-0084.html
-    def build_xep0084_stanzas
-      img_data    = process_avatar
-      sha1_hash   = Digest::SHA1.hexdigest(img_data)
-      base64_data = Base64.strict_encode64(img_data)
-
-      [
-        """
-<iq type='set' from='#{@user.address}' id='avatar-data-#{rand(101)}'>
-  <pubsub xmlns='http://jabber.org/protocol/pubsub'>
-    <publish node='urn:xmpp:avatar:data'>
-      <item id='#{sha1_hash}'>
-        <data xmlns='urn:xmpp:avatar:data'>#{base64_data}</data>
-      </item>
-    </publish>
-  </pubsub>
-</iq>
-        """.strip,
-        """
-<iq type='set' from='#{@user.address}' id='avatar-metadata-#{rand(101)}'>
-  <pubsub xmlns='http://jabber.org/protocol/pubsub'>
-    <publish node='urn:xmpp:avatar:metadata'>
-      <item id='#{sha1_hash}'>
-        <metadata xmlns='urn:xmpp:avatar:metadata'>
-          <info bytes='#{img_data.size}'
-                id='#{sha1_hash}'
-                height='256'
-                type='image/png'
-                width='256'/>
-        </metadata>
-      </item>
-    </publish>
-  </pubsub>
-</iq>
-        """.strip,
-      ]
-    end
-end
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,90 +1,3 @@
 class ApplicationMailer < ActionMailer::Base
-  default Rails.application.config.action_mailer.default_options
  layout 'mailer'
-
-  private
-
-    def send_mail
-      @template ||= "#{self.class.name.underscore}/#{caller[0][/`([^']*)'/, 1]}"
-      headers['Message-ID'] = message_id
-
-      if @user.pgp_pubkey.present?
-        mail(to: @user.email, subject: "...", content_type: pgp_content_type) do |format|
-          format.text { render plain: pgp_content }
-        end
-      else
-        mail(to: @user.email, subject: @subject) do |format|
-          format.text { render @template }
-        end
-      end
-    end
-
-    def from_address
-      self.class.default[:from]
-    end
-
-    def from_domain
-      Mail::Address.new(from_address).domain
-    end
-
-    def message_id
-      @message_id ||= "#{SecureRandom.uuid}@#{from_domain}"
-    end
-
-    def boundary
-      @boundary ||= SecureRandom.hex(8)
-    end
-
-    def pgp_content_type
-      "multipart/encrypted; protocol=\"application/pgp-encrypted\"; boundary=\"------------#{boundary}\""
-    end
-
-    def pgp_nested_content
-      message_content = render_to_string(template: @template)
-      message_content_base64 = Base64.encode64(message_content)
-      nested_boundary = SecureRandom.hex(8)
-
-      <<~NESTED_CONTENT
-        Content-Type: multipart/mixed; boundary="------------#{nested_boundary}"; protected-headers="v1"
-        Subject: #{@subject}
-        From: <#{from_address}>
-        To: #{@user.display_name || @user.cn} <#{@user.email}>
-        Message-ID: <#{message_id}>
-
-        --------------#{nested_boundary}
-        Content-Type: text/plain; charset=UTF-8; format=flowed
-        Content-Transfer-Encoding: base64
-
-        #{message_content_base64}
-
-        --------------#{nested_boundary}--
-      NESTED_CONTENT
-    end
-
-    def pgp_content
-      encrypted_content = UserManager::PgpEncrypt.call(user: @user, text: pgp_nested_content)
-      encrypted_base64 = Base64.encode64(encrypted_content.to_s)
-
-      <<~EMAIL_CONTENT
-        This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
-        --------------#{boundary}
-        Content-Type: application/pgp-encrypted
-        Content-Description: PGP/MIME version identification
-
-        Version: 1
-
-        --------------#{boundary}
-        Content-Type: application/octet-stream; name="encrypted.asc"
-        Content-Description: OpenPGP encrypted message
-        Content-Disposition: inline; filename="encrypted.asc"
-
-        -----BEGIN PGP MESSAGE-----
-
-        #{encrypted_base64}
-
-        -----END PGP MESSAGE-----
-
-        --------------#{boundary}--
-      EMAIL_CONTENT
-    end
 end
--- a/app/mailers/custom_mailer.rb
+++ b/app/mailers/custom_mailer.rb
@@ -18,6 +18,6 @@ class CustomMailer < ApplicationMailer
    @user = params[:user]
    @subject = params[:subject]
    @body = params[:body]
-    send_mail
+    mail(to: @user.email, subject: @subject)
  end
 end
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -3,7 +3,7 @@ class NotificationMailer < ApplicationMailer
    @user = params[:user]
    @amount_sats = params[:amount_sats]
    @subject = "Sats received"
-    send_mail
+    mail to: @user.email, subject: @subject
  end

  def remotestorage_auth_created
@@ -15,19 +15,19 @@ class NotificationMailer < ApplicationMailer
      "#{access} #{directory}"
    end
    @subject = "New app connected to your storage"
-    send_mail
+    mail to: @user.email, subject: @subject
  end

  def new_invitations_available
    @user = params[:user]
    @subject = "New invitations added to your account"
-    send_mail
+    mail to: @user.email, subject: @subject
  end

  def bitcoin_donation_confirmed
    @user = params[:user]
    @donation = params[:donation]
    @subject = "Donation confirmed"
-    send_mail
+    mail to: @user.email, subject: @subject
  end
 end
--- a/app/models/concerns/settings/btcpay_settings.rb
+++ b/app/models/concerns/settings/btcpay_settings.rb
@@ -1,24 +0,0 @@
-module Settings
-  module BtcpaySettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :btcpay_api_url, type: :string,
-        default: ENV["BTCPAY_API_URL"].presence
-
-      field :btcpay_enabled, type: :boolean,
-        default: ENV["BTCPAY_API_URL"].present?
-
-      field :btcpay_public_url, type: :string,
-        default: ENV["BTCPAY_PUBLIC_URL"].presence
-
-      field :btcpay_store_id, type: :string,
-        default: ENV["BTCPAY_STORE_ID"].presence
-
-      field :btcpay_auth_token, type: :string,
-        default: ENV["BTCPAY_AUTH_TOKEN"].presence
-
-      field :btcpay_publish_wallet_balances, type: :boolean, default: true
-    end
-  end
-end
--- a/app/models/concerns/settings/discourse_settings.rb
+++ b/app/models/concerns/settings/discourse_settings.rb
@@ -1,16 +0,0 @@
-module Settings
-  module DiscourseSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :discourse_public_url, type: :string,
-        default: ENV["DISCOURSE_PUBLIC_URL"].presence
-
-      field :discourse_enabled, type: :boolean,
-        default: ENV["DISCOURSE_PUBLIC_URL"].present?
-
-      field :discourse_connect_secret, type: :string,
-        default: ENV["DISCOURSE_CONNECT_SECRET"].presence
-    end
-  end
-end
--- a/app/models/concerns/settings/drone_ci_settings.rb
+++ b/app/models/concerns/settings/drone_ci_settings.rb
@@ -1,13 +0,0 @@
-module Settings
-  module DroneCiSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :droneci_public_url, type: :string,
-        default: ENV["DRONECI_PUBLIC_URL"].presence
-
-      field :droneci_enabled, type: :boolean,
-        default: ENV["DRONECI_PUBLIC_URL"].present?
-    end
-  end
-end
--- a/app/models/concerns/settings/ejabberd_settings.rb
+++ b/app/models/concerns/settings/ejabberd_settings.rb
@@ -1,19 +0,0 @@
-module Settings
-  module EjabberdSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :ejabberd_enabled, type: :boolean,
-        default: ENV["EJABBERD_API_URL"].present?
-
-      field :ejabberd_api_url, type: :string,
-        default: ENV["EJABBERD_API_URL"].presence
-
-      field :ejabberd_admin_url, type: :string,
-        default: ENV["EJABBERD_ADMIN_URL"].presence
-
-      field :ejabberd_buddy_roster, type: :string,
-        default: "Buddies"
-    end
-  end
-end
--- a/app/models/concerns/settings/email_settings.rb
+++ b/app/models/concerns/settings/email_settings.rb
@@ -1,28 +0,0 @@
-module Settings
-  module EmailSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :email_enabled, type: :boolean,
-        default: ENV["EMAIL_SMTP_HOST"].present?
-
-      # field :email_smtp_host, type: :string,
-      #   default: ENV["EMAIL_SMTP_HOST"].presence
-      #
-      # field :email_smtp_port, type: :string,
-      #   default: ENV["EMAIL_SMTP_PORT"].presence || 587
-      #
-      # field :email_smtp_enable_starttls, type: :string,
-      #   default: ENV["EMAIL_SMTP_PORT"].presence || true
-      #
-      # field :email_auth_method, type: :string,
-      #   default: ENV["EMAIL_AUTH_METHOD"].presence || "plain"
-      #
-      # field :email_imap_host, type: :string,
-      #   default: ENV["EMAIL_IMAP_HOST"].presence
-      #
-      # field :email_imap_port, type: :string,
-      #   default: ENV["EMAIL_IMAP_PORT"].presence || 993
-    end
-  end
-end
--- a/app/models/concerns/settings/general_settings.rb
+++ b/app/models/concerns/settings/general_settings.rb
@@ -1,34 +0,0 @@
-module Settings
-  module GeneralSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :primary_domain, type: :string,
-        default: ENV["PRIMARY_DOMAIN"].presence
-
-      field :accounts_domain, type: :string,
-        default: ENV["AKKOUNTS_DOMAIN"].presence
-
-      #
-      # Internal services
-      #
-
-      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"
-
-      field :sentry_enabled, type: :boolean, readonly: true,
-        default: ENV["SENTRY_DSN"].present?
-
-      #
-      # Registrations
-      #
-
-      field :reserved_usernames, type: :array, default: %w[
-        account accounts donations mail webmaster support
-      ]
-    end
-  end
-end
--- a/app/models/concerns/settings/gitea_settings.rb
+++ b/app/models/concerns/settings/gitea_settings.rb
@@ -1,13 +0,0 @@
-module Settings
-  module GiteaSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :gitea_public_url, type: :string,
-        default: ENV["GITEA_PUBLIC_URL"].presence
-
-      field :gitea_enabled, type: :boolean,
-        default: ENV["GITEA_PUBLIC_URL"].present?
-    end
-  end
-end
--- a/app/models/concerns/settings/lightning_network_settings.rb
+++ b/app/models/concerns/settings/lightning_network_settings.rb
@@ -1,25 +0,0 @@
-module Settings
-  module LightningNetworkSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :lndhub_api_url, type: :string,
-        default: ENV["LNDHUB_API_URL"].presence
-
-      field :lndhub_enabled, type: :boolean,
-        default: ENV["LNDHUB_API_URL"].present?
-
-      field :lndhub_admin_token, type: :string,
-        default: ENV["LNDHUB_ADMIN_TOKEN"].presence
-
-      field :lndhub_admin_enabled, type: :boolean,
-        default: ENV["LNDHUB_ADMIN_UI"] || false
-
-      field :lndhub_public_key, type: :string,
-        default: (ENV["LNDHUB_PUBLIC_KEY"] || "")
-
-      field :lndhub_keysend_enabled, type: :boolean,
-        default: -> { self.lndhub_public_key.present? }
-    end
-  end
-end
--- a/app/models/concerns/settings/mastodon_settings.rb
+++ b/app/models/concerns/settings/mastodon_settings.rb
@@ -1,19 +0,0 @@
-module Settings
-  module MastodonSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :mastodon_public_url, type: :string,
-        default: ENV["MASTODON_PUBLIC_URL"].presence
-
-      field :mastodon_enabled, type: :boolean,
-        default: ENV["MASTODON_PUBLIC_URL"].present?
-
-      field :mastodon_address_domain, type: :string,
-        default: ENV["MASTODON_ADDRESS_DOMAIN"].presence || self.primary_domain
-
-      field :mastodon_auth_token, type: :string,
-        default: ENV["MASTODON_AUTH_TOKEN"].presence
-    end
-  end
-end
--- a/app/models/concerns/settings/media_wiki_settings.rb
+++ b/app/models/concerns/settings/media_wiki_settings.rb
@@ -1,13 +0,0 @@
-module Settings
-  module MediaWikiSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :mediawiki_public_url, type: :string,
-        default: ENV["MEDIAWIKI_PUBLIC_URL"].presence
-
-      field :mediawiki_enabled, type: :boolean,
-        default: ENV["MEDIAWIKI_PUBLIC_URL"].present?
-    end
-  end
-end
--- a/app/models/concerns/settings/membership_settings.rb
+++ b/app/models/concerns/settings/membership_settings.rb
@@ -1,18 +0,0 @@
-module Settings
-  module MembershipSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :member_status_contributor, type: :string,
-        default: "Contributor"
-      field :member_status_sustainer, type: :string,
-        default: "Sustainer"
-
-      # Admin panel
-      field :user_index_show_contributors, type: :boolean,
-        default: false
-      field :user_index_show_sustainers, type: :boolean,
-        default: false
-    end
-  end
-end
--- a/app/models/concerns/settings/nostr_settings.rb
+++ b/app/models/concerns/settings/nostr_settings.rb
@@ -1,25 +0,0 @@
-module Settings
-  module NostrSettings
-    extend ActiveSupport::Concern
-
-    included do
-      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_public_key_primary_domain, type: :string,
-        default: ENV["NOSTR_PUBLIC_KEY_PRIMARY_DOMAIN"].presence
-
-      field :nostr_relay_url, type: :string,
-        default: ENV["NOSTR_RELAY_URL"].presence
-
-      field :nostr_zaps_relay_limit, type: :integer,
-        default: 12
-    end
-  end
-end
--- a/app/models/concerns/settings/open_collective_settings.rb
+++ b/app/models/concerns/settings/open_collective_settings.rb
@@ -1,9 +0,0 @@
-module Settings
-  module OpenCollectiveSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :opencollective_enabled, type: :boolean, default: true
-    end
-  end
-end
--- a/app/models/concerns/settings/remote_storage_settings.rb
+++ b/app/models/concerns/settings/remote_storage_settings.rb
@@ -1,19 +0,0 @@
-module Settings
-  module RemoteStorageSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :remotestorage_enabled, type: :boolean,
-        default: ENV["RS_STORAGE_URL"].present?
-
-      field :rs_accounts_domain, type: :string,
-        default: ENV["RS_AKKOUNTS_DOMAIN"] || ENV["AKKOUNTS_DOMAIN"]
-
-      field :rs_storage_url, type: :string,
-        default: ENV["RS_STORAGE_URL"].presence
-
-      field :rs_redis_url, type: :string,
-        default: ENV["RS_REDIS_URL"] || "redis://localhost:6379/1"
-    end
-  end
-end
--- a/app/models/concerns/settings/xmpp_settings.rb
+++ b/app/models/concerns/settings/xmpp_settings.rb
@@ -1,11 +0,0 @@
-module Settings
-  module XmppSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :xmpp_default_rooms, type: :array, default: []
-      field :xmpp_autojoin_default_rooms, type: :boolean, default: false
-      field :xmpp_notifications_from_address, type: :string, default: primary_domain
-    end
-  end
-end
--- a/app/models/lndhub_user.rb
+++ b/app/models/lndhub_user.rb
@@ -6,7 +6,7 @@ class LndhubUser < LndhubBase
                      foreign_key: "user_id"

  belongs_to :user, class_name: "User",
-                    primary_key: "lndhub_username",
+                    primary_key: "ln_account",
                    foreign_key: "login"

  def balance
--- a/app/models/remote_storage_authorization.rb
+++ b/app/models/remote_storage_authorization.rb
@@ -2,7 +2,7 @@ class RemoteStorageAuthorization < ApplicationRecord
  belongs_to :user
  belongs_to :web_app, class_name: "AppCatalog::WebApp", optional: true

-  serialize :permissions, coder: YAML unless Rails.env.production?
+  serialize :permissions unless Rails.env.production?

  validates_presence_of :permissions
  validates_presence_of :client_id
@@ -69,19 +69,11 @@ class RemoteStorageAuthorization < ApplicationRecord
    end

    def remove_token_expiry_job
-      job_class = RemoteStorageExpireAuthorizationJob
-      job_args = [id]
-
-      query = SolidQueue::Job.where(class_name: job_class.to_s)
-
-      case ActiveRecord::Base.connection.adapter_name.downcase
-      when /sqlite/
-        query.where("json_extract(arguments, '$.arguments') = ?", job_args.to_json)
-      when /postgres/
-        query.where("CAST(arguments AS jsonb)->>'arguments' = ?", job_args.to_json)
-      else
-        raise "Unsupported database adapter"
-      end.destroy_all
+      queue = Sidekiq::Queue.new(RemoteStorageExpireAuthorizationJob.queue_name)
+      queue.each do |job|
+        next unless job.display_class == "RemoteStorageExpireAuthorizationJob"
+        job.delete if job.display_args == [id]
+      end
    end

    def find_or_create_web_app
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -2,31 +2,208 @@
 class Setting < RailsSettings::Base
  cache_prefix { "v1" }

-  Dir[Rails.root.join('app', 'models', 'concerns', 'settings', '*.rb')].each do |file|
-    require file
-  end
+  field :primary_domain, type: :string,
+    default: ENV["PRIMARY_DOMAIN"].presence

-  include Settings::GeneralSettings
-  include Settings::BtcpaySettings
-  include Settings::DiscourseSettings
-  include Settings::DroneCiSettings
-  include Settings::EjabberdSettings
-  include Settings::EmailSettings
-  include Settings::GiteaSettings
-  include Settings::LightningNetworkSettings
-  include Settings::MastodonSettings
-  include Settings::MediaWikiSettings
-  include Settings::MembershipSettings
-  include Settings::NostrSettings
-  include Settings::OpenCollectiveSettings
-  include Settings::RemoteStorageSettings
-  include Settings::XmppSettings
+  field :accounts_domain, type: :string,
+    default: ENV["AKKOUNTS_DOMAIN"].presence

-  def self.available_services
-    known_services = SERVICES[:external].keys
-    known_services.select {|s| Setting.send "#{s}_enabled?" }
-  end
+  #
+  # Internal services
+  #

-  field :default_services, type: :array,
-    default: self.available_services
+  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
+  #
+
+  field :reserved_usernames, type: :array, default: %w[
+    account accounts donations mail webmaster support
+  ]
+
+  #
+  # XMPP
+  #
+
+  field :xmpp_default_rooms, type: :array, default: []
+  field :xmpp_autojoin_default_rooms, type: :boolean, default: false
+  field :xmpp_notifications_from_address, type: :string, default: primary_domain
+
+  #
+  # Sentry
+  #
+
+  field :sentry_enabled, type: :boolean, readonly: true,
+    default: ENV["SENTRY_DSN"].present?
+
+  #
+  # BTCPay Server
+  #
+
+  field :btcpay_api_url, type: :string,
+    default: ENV["BTCPAY_API_URL"].presence
+
+  field :btcpay_enabled, type: :boolean,
+    default: ENV["BTCPAY_API_URL"].present?
+
+  field :btcpay_public_url, type: :string,
+    default: ENV["BTCPAY_PUBLIC_URL"].presence
+
+  field :btcpay_store_id, type: :string,
+    default: ENV["BTCPAY_STORE_ID"].presence
+
+  field :btcpay_auth_token, type: :string,
+    default: ENV["BTCPAY_AUTH_TOKEN"].presence
+
+  field :btcpay_publish_wallet_balances, type: :boolean, default: true
+
+  #
+  # Discourse
+  #
+
+  field :discourse_public_url, type: :string,
+    default: ENV["DISCOURSE_PUBLIC_URL"].presence
+
+  field :discourse_enabled, type: :boolean,
+    default: ENV["DISCOURSE_PUBLIC_URL"].present?
+
+  field :discourse_connect_secret, type: :string,
+    default: ENV["DISCOURSE_CONNECT_SECRET"].presence
+
+  #
+  # Drone CI
+  #
+
+  field :droneci_public_url, type: :string,
+    default: ENV["DRONECI_PUBLIC_URL"].presence
+
+  field :droneci_enabled, type: :boolean,
+    default: ENV["DRONECI_PUBLIC_URL"].present?
+
+  #
+  # ejabberd
+  #
+
+  field :ejabberd_enabled, type: :boolean,
+    default: ENV["EJABBERD_API_URL"].present?
+
+  field :ejabberd_api_url, type: :string,
+    default: ENV["EJABBERD_API_URL"].presence
+
+  field :ejabberd_admin_url, type: :string,
+    default: ENV["EJABBERD_ADMIN_URL"].presence
+
+  field :ejabberd_buddy_roster, type: :string,
+    default: "Buddies"
+
+  #
+  # Gitea
+  #
+
+  field :gitea_public_url, type: :string,
+    default: ENV["GITEA_PUBLIC_URL"].presence
+
+  field :gitea_enabled, type: :boolean,
+    default: ENV["GITEA_PUBLIC_URL"].present?
+
+  #
+  # Lightning Network
+  #
+
+  field :lndhub_api_url, type: :string,
+    default: ENV["LNDHUB_API_URL"].presence
+
+  field :lndhub_enabled, type: :boolean,
+    default: ENV["LNDHUB_API_URL"].present?
+
+  field :lndhub_admin_token, type: :string,
+    default: ENV["LNDHUB_ADMIN_TOKEN"].presence
+
+  field :lndhub_admin_enabled, type: :boolean,
+    default: ENV["LNDHUB_ADMIN_UI"] || false
+
+  field :lndhub_public_key, type: :string,
+    default: (ENV["LNDHUB_PUBLIC_KEY"] || "")
+
+  field :lndhub_keysend_enabled, type: :boolean,
+    default: -> { self.lndhub_public_key.present? }
+
+  #
+  # Mastodon
+  #
+
+  field :mastodon_public_url, type: :string,
+    default: ENV["MASTODON_PUBLIC_URL"].presence
+
+  field :mastodon_enabled, type: :boolean,
+    default: ENV["MASTODON_PUBLIC_URL"].present?
+
+  field :mastodon_address_domain, type: :string,
+    default: ENV["MASTODON_ADDRESS_DOMAIN"].presence || self.primary_domain
+
+  #
+  # MediaWiki
+  #
+
+  field :mediawiki_public_url, type: :string,
+    default: ENV["MEDIAWIKI_PUBLIC_URL"].presence
+
+  field :mediawiki_enabled, type: :boolean,
+    default: ENV["MEDIAWIKI_PUBLIC_URL"].present?
+
+  #
+  # Nostr
+  #
+
+  field :nostr_enabled, type: :boolean, default: false
+
+  #
+  # OpenCollective
+  #
+
+  field :opencollective_enabled, type: :boolean, default: true
+
+  #
+  # RemoteStorage
+  #
+
+  field :remotestorage_enabled, type: :boolean,
+    default: ENV["RS_STORAGE_URL"].present?
+
+  field :rs_storage_url, type: :string,
+    default: ENV["RS_STORAGE_URL"].presence
+
+  field :rs_redis_url, type: :string,
+    default: ENV["RS_REDIS_URL"] || "redis://localhost:6379/1"
+
+
+  #
+  # E-Mail Service
+  #
+
+  field :email_enabled, type: :boolean,
+    default: ENV["EMAIL_SMTP_HOST"].present?
+
+  # field :email_smtp_host, type: :string,
+  #   default: ENV["EMAIL_SMTP_HOST"].presence
+  #
+  # field :email_smtp_port, type: :string,
+  #   default: ENV["EMAIL_SMTP_PORT"].presence || 587
+  #
+  # field :email_smtp_enable_starttls, type: :string,
+  #   default: ENV["EMAIL_SMTP_PORT"].presence || true
+  #
+  # field :email_auth_method, type: :string,
+  #   default: ENV["EMAIL_AUTH_METHOD"].presence || "plain"
+  #
+  # field :email_imap_host, type: :string,
+  #   default: ENV["EMAIL_IMAP_HOST"].presence
+  #
+  # field :email_imap_port, type: :string,
+  #   default: ENV["EMAIL_IMAP_PORT"].presence || 993
 end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,10 +3,9 @@ require 'nostr'
 class User < ApplicationRecord
  include EmailValidatable

-  attr_accessor :current_password
  attr_accessor :display_name
  attr_accessor :avatar_new
-  attr_accessor :pgp_pubkey
+  attr_accessor :current_password

  serialize :preferences, coder: UserPreferences

@@ -18,20 +17,15 @@ 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: "lndhub_username", foreign_key: "login"
+                         primary_key: "ln_account", foreign_key: "login"

  has_many :accounts, through: :lndhub_user

-  #
-  # Attachments
-  #
-
-  has_one_attached :avatar
+  has_many :remote_storage_authorizations

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

-
  validate :acceptable_avatar

-  validate :acceptable_pgp_key_format, if: -> { defined?(@pgp_pubkey) && @pgp_pubkey.present? }
-
  #
  # Scopes
  #
@@ -73,7 +64,7 @@ class User < ApplicationRecord
  # Encrypted database columns
  #

-  encrypts :lndhub_password
+  has_encrypted :ln_login, :ln_password

  # Include default devise modules. Others available are:
  # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
@@ -84,10 +75,6 @@ class User < ApplicationRecord
         :timeoutable,
         :rememberable

-  #
-  # Methods
-  #
-
  def ldap_before_save
    self.email = Devise::LDAP::Adapter.get_ldap_param(self.cn, "mail").first
    self.ou    = dn.split(',')
@@ -106,7 +93,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?
@@ -144,7 +133,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)
@@ -152,8 +141,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
@@ -163,41 +154,13 @@ class User < ApplicationRecord

  def ldap_entry(reload: false)
    return @ldap_entry if defined?(@ldap_entry) && !reload
-    @ldap_entry = ldap.fetch_users(cn: self.cn).first
-  end
-
-  def add_to_ldap_array(attr_key, ldap_attr, value)
-    current_entries = ldap_entry[attr_key.to_sym] || []
-    new_entries = Array(value).map(&:to_s)
-    entries = (current_entries + new_entries).uniq.sort
-    ldap.replace_attribute(dn, ldap_attr.to_sym, entries)
-  end
-
-  def remove_from_ldap_array(attr_key, ldap_attr, value)
-    current_entries = ldap_entry[attr_key.to_sym] || []
-    entries_to_remove = Array(value).map(&:to_s)
-    entries = (current_entries - entries_to_remove).uniq.sort
-    ldap.replace_attribute(dn, ldap_attr.to_sym, entries)
+    @ldap_entry = ldap.fetch_users(uid: self.cn, ou: self.ou).first
  end

  def display_name
    @display_name ||= ldap_entry[:display_name]
  end

-  # TODO Variant keys are currently broken for some reason
-  # (They use the same key as the main blob, when it should be
-  # "/variants/#{key)"
-  # def avatar_variant(size: :medium)
-  #   dimensions = case size
-  #                when :large  then [400, 400]
-  #                when :medium then [256, 256]
-  #                when :small  then [64, 64]
-  #                else [256, 256]
-  #                end
-  #   format = avatar.content_type == "image/png" ? :png : :jpeg
-  #   avatar.variant(resize_to_fill: dimensions, format: format)
-  # end
-
  def nostr_pubkey
    @nostr_pubkey ||= ldap_entry[:nostr_key]
  end
@@ -207,66 +170,30 @@ class User < ApplicationRecord
    Nostr::PublicKey.new(nostr_pubkey).to_bech32
  end

-  def pgp_pubkey
-    @pgp_pubkey ||= ldap_entry[:pgp_key]
-  end
-
-  def gnupg_key
-    return nil unless pgp_pubkey.present?
-    GPGME::Key.import(pgp_pubkey)
-    GPGME::Key.get(pgp_fpr)
-  end
-
-  def pgp_pubkey_contains_user_address?
-    gnupg_key.uids.map(&:email).include?(address)
-  end
-
-  def wkd_hash
-    ZBase32.encode(Digest::SHA1.digest(cn))
+  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)
-  end
-
  def enable_service(service)
-    add_to_ldap_array :services_enabled, :serviceEnabled, service
-    ldap_entry(reload: true)[:services_enabled]
+    current_services = services_enabled
+    new_services = Array(service).map(&:to_s)
+    services = (current_services + new_services).uniq
+    ldap.replace_attribute(dn, :serviceEnabled, services)
  end

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

  def disable_all_services
-    ldap.delete_attribute(dn, :serviceEnabled)
-  end
-
-  def member_status
-    ldap_entry[:member_status] || []
-  end
-
-  def add_member_status(status)
-    add_to_ldap_array :member_status, :memberStatus, status
-    ldap_entry(reload: true)[:member_status]
-  end
-
-  def remove_member_status(status)
-    remove_from_ldap_array :member_status, :memberStatus, status
-    ldap_entry(reload: true)[:member_status]
-  end
-
-  def is_contributing_member?
-    member_status.map(&:to_sym).include?(:contributor)
-  end
-
-  def is_paying_member?
-    member_status.map(&:to_sym).include?(:sustainer)
+    ldap.delete_attribute(dn,:service)
  end

  private
@@ -280,7 +207,7 @@ class User < ApplicationRecord
      return unless avatar_new.present?

      if avatar_new.size > 1.megabyte
-        errors.add(:avatar, "must be less than 1MB file size")
+        errors.add(:avatar, "file size is too large")
      end

      acceptable_types = ["image/jpeg", "image/png"]
@@ -288,10 +215,4 @@ class User < ApplicationRecord
        errors.add(:avatar, "must be a JPEG or PNG file")
      end
    end
-
-    def acceptable_pgp_key_format
-      unless GPGME::Key.valid?(pgp_pubkey)
-        errors.add(:pgp_pubkey, 'is not a valid armored PGP public key block')
-      end
-    end
 end
--- 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/btcpay_manager_service.rb
+++ b/app/services/btcpay_manager_service.rb
@@ -1,22 +1,36 @@
 #
 # API Docs: https://docs.btcpayserver.org/API/Greenfield/v1/
 #
-class BtcpayManagerService < RestApiService
+class BtcpayManagerService < ApplicationService
  private

-  def base_url
-    @base_url ||= "#{Setting.btcpay_api_url}/stores/#{Setting.btcpay_store_id}"
-  end
+    def base_url
+      @base_url ||= "#{Setting.btcpay_api_url}/stores/#{Setting.btcpay_store_id}"
+    end

-  def auth_token
-    @auth_token ||= Setting.btcpay_auth_token
-  end
+    def auth_token
+      @auth_token ||= Setting.btcpay_auth_token
+    end

-  def headers
-    {
-      "Content-Type" => "application/json",
-      "Accept" => "application/json",
-      "Authorization" => "token #{auth_token}"
-    }
-  end
+    def headers
+      {
+        "Content-Type" => "application/json",
+        "Accept" => "application/json",
+        "Authorization" => "token #{auth_token}"
+      }
+    end
+
+    def endpoint_url(path)
+      "#{base_url}/#{path.gsub(/^\//, '')}"
+    end
+
+    def get(path, params = {})
+      res = Faraday.get endpoint_url(path), params, headers
+      JSON.parse(res.body)
+    end
+
+    def post(path, payload)
+      res = Faraday.post endpoint_url(path), payload.to_json, headers
+      JSON.parse(res.body)
+    end
 end
--- a/app/services/create_account.rb
+++ b/app/services/create_account.rb
@@ -0,0 +1,50 @@
+class CreateAccount < ApplicationService
+  def initialize(account:)
+    @username   = account[:username]
+    @domain     = account[:ou] || Setting.primary_domain
+    @email      = account[:email]
+    @password   = account[:password]
+    @invitation = account[:invitation]
+    @confirmed  = account[:confirmed]
+  end
+
+  def call
+    user = create_user_in_database
+    add_ldap_document
+    create_lndhub_account(user) if Setting.lndhub_enabled
+
+    if @invitation.present?
+      update_invitation(user.id)
+    end
+  end
+
+  private
+
+  def create_user_in_database
+    User.create!(
+      cn: @username,
+      ou: @domain,
+      email: @email,
+      password: @password,
+      password_confirmation: @password,
+      confirmed_at: @confirmed ? DateTime.now : nil
+    )
+  end
+
+  def update_invitation(user_id)
+    @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, @domain, @email, hashed_pw)
+  end
+
+  def create_lndhub_account(user)
+    #TODO enable in development when we have a local lndhub (mock?) API
+    return if Rails.env.development?
+    CreateLndhubAccountJob.perform_later(user)
+  end
+end
--- a/app/services/create_invitations.rb
+++ b/app/services/create_invitations.rb
@@ -0,0 +1,17 @@
+class CreateInvitations < ApplicationService
+  def initialize(user:, amount:, notify: true)
+    @user = user
+    @amount = amount
+    @notify = notify
+  end
+
+  def call
+    @amount.times do
+      Invitation.create(user: @user)
+    end
+
+    if @notify
+      NotificationMailer.with(user: @user).new_invitations_available.deliver_later
+    end
+  end
+end
--- a/app/services/ejabberd_api_client.rb
+++ b/app/services/ejabberd_api_client.rb
@@ -4,13 +4,15 @@ class EjabberdApiClient
  end

  def post(endpoint, payload)
-    Faraday.post "#{@base_url}/#{endpoint}", payload.to_json,
-                 "Content-Type" => "application/json"
-  end
+    res = Faraday.post("#{@base_url}/#{endpoint}", payload.to_json,
+                       "Content-Type" => "application/json")

-  #
-  # API endpoints
-  #
+    if res.status != 200
+      Rails.logger.error "[ejabberd] API request failed:"
+      Rails.logger.error res.body
+      #TODO Send custom event to Sentry
+    end
+  end

  def add_rosteritem(payload)
    post "add_rosteritem", payload
@@ -20,31 +22,8 @@ class EjabberdApiClient
    post "send_message", payload
  end

-  def send_stanza(payload)
-    post "send_stanza", payload
-  end
-
-  def get_vcard2(user, name, subname)
-    payload = {
-      user: user.cn, host: user.ou,
-      name: name, subname: subname
-    }
-    post "get_vcard2", payload
-  end
-
-  def private_get(user, element_name, namespace)
-    payload = {
-      user: user.cn, host: user.ou,
-      element: element_name, ns: namespace
-    }
-    post "private_get", payload
-  end
-
  def private_set(user, content)
-    payload = {
-      user: user.cn, host: user.ou,
-      element: content
-    }
+    payload = { user: user.cn, host: user.ou, element: content }
    post "private_set", payload
  end
 end
--- a/app/services/ldap_manager/fetch_avatar.rb
+++ b/app/services/ldap_manager/fetch_avatar.rb
@@ -5,12 +5,12 @@ module LdapManager
    end

    def call
-      treebase = ldap_config["base"]
+      treebase   = ldap_config["base"]
      attributes = %w{ jpegPhoto }
-      filter = Net::LDAP::Filter.eq("cn", @cn)
+      filter     = Net::LDAP::Filter.eq("cn", @cn)

      entry = client.search(base: treebase, filter: filter, attributes: attributes).first
-      entry[:jpegPhoto].present? ? entry.jpegPhoto.first : nil
+      entry.try(:jpegPhoto) ? entry.jpegPhoto.first : nil
    end
  end
 end
--- a/app/services/ldap_manager/update_avatar.rb
+++ b/app/services/ldap_manager/update_avatar.rb
@@ -2,41 +2,26 @@ require "image_processing/vips"

 module LdapManager
  class UpdateAvatar < LdapManagerService
-    def initialize(user:)
-      @user = user
-      @dn = user.dn
+    def initialize(dn:, file:)
+      @dn = dn
+      @img_data = process(file)
    end

    def call
-      unless @user.avatar.attached?
-        Rails.logger.error { "Cannot store empty jpegPhoto for user #{@user.cn}" }
-        return false
-      end
-
-      img_data = @user.avatar.blob.download
-      jpg_data = process_avatar
-
-      Rails.logger.debug { "Storing new jpegPhoto for user #{@user.cn} in LDAP" }
-      result = replace_attribute(@dn, :jpegPhoto, jpg_data)
-      result == 0
+      replace_attribute @dn, :jpegPhoto, @img_data
    end

    private

-    def process_avatar
-      @user.avatar.blob.open do |file|
-        processed = ImageProcessing::Vips
-          .source(file)
-          .resize_to_fill(256, 256)
-          .convert("jpeg")
-          .saver(strip: true)
-          .call
-        processed.read
-      end
-    rescue Vips::Error => e
-      Sentry.capture_exception(e) if Setting.sentry_enabled?
-      Rails.logger.error { "Image processing failed for LDAP avatar: #{e.message}" }
-      nil
+    def process(file)
+      processed = ImageProcessing::Vips
+        .resize_to_fill(512, 512)
+        .source(file)
+        .convert("jpeg")
+        .saver(strip: true)
+        .call
+
+      Base64.strict_encode64 processed.read
    end
  end
 end
--- a/app/services/ldap_manager/update_display_name.rb
+++ b/app/services/ldap_manager/update_display_name.rb
@@ -6,11 +6,7 @@ module LdapManager
    end

    def call
-      if @display_name.present?
-        replace_attribute @dn, :displayName, @display_name
-      else
-        delete_attribute @dn, :displayName
-      end
+      replace_attribute @dn, :displayName, @display_name
    end
  end
 end
--- a/app/services/ldap_manager/update_pgp_key.rb
+++ b/app/services/ldap_manager/update_pgp_key.rb
@@ -1,16 +0,0 @@
-module LdapManager
-  class UpdatePgpKey < LdapManagerService
-    def initialize(dn:, pubkey:)
-      @dn = dn
-      @pubkey = pubkey
-    end
-
-    def call
-      if @pubkey.present?
-        replace_attribute @dn, :pgpKey, @pubkey
-      else
-        delete_attribute @dn, :pgpKey
-      end
-    end
-  end
-end
--- a/app/services/ldap_service.rb
+++ b/app/services/ldap_service.rb
@@ -50,17 +50,19 @@ class LdapService < ApplicationService
  end

  def fetch_users(args={})
-    attributes = %w[
-      dn cn uid mail displayName admin serviceEnabled memberStatus
-      mailRoutingAddress mailpassword nostrKey pgpKey
-    ]
-    filter = Net::LDAP::Filter.eq('objectClass', 'person') &
-             Net::LDAP::Filter.eq("cn", args[:cn] || "*")
+    if args[:ou]
+      treebase = "ou=#{args[:ou]},cn=users,#{ldap_suffix}"
+    else
+      treebase = ldap_config["base"]
+    end

-    entries = client.search(
-      base: ldap_config["base"], filter: filter,
-      attributes: attributes
-    )
+    attributes = %w[
+      dn cn uid mail displayName admin serviceEnabled
+      mailRoutingAddress mailpassword nostrKey
+    ]
+    filter = Net::LDAP::Filter.eq("uid", args[:uid] || "*")
+
+    entries = client.search(base: treebase, filter: filter, attributes: attributes)
    entries.sort_by! { |e| e.cn[0] }
    entries = entries.collect do |e|
      {
@@ -69,29 +71,17 @@ class LdapService < ApplicationService
        display_name: e.try(:displayName) ? e.displayName.first : nil,
        admin: e.try(:admin) ? 'admin' : nil,
        services_enabled: e.try(:serviceEnabled),
-        member_status: e.try(:memberStatus),
        email_maildrop: e.try(:mailRoutingAddress),
        email_password: e.try(:mailpassword),
-        nostr_key: e.try(:nostrKey) ? e.nostrKey.first : nil,
-        pgp_key: e.try(:pgpKey) ? e.pgpKey.first : nil
+        nostr_key: e.try(:nostrKey) ? e.nostrKey.first : nil
      }
    end
  end

-  def search_users(search_attr, value, return_attr)
-    filter = Net::LDAP::Filter.eq('objectClass', 'person') &
-             Net::LDAP::Filter.eq(search_attr.to_s, value.to_s) &
-             Net::LDAP::Filter.present('cn')
-    entries = client.search(
-      base: ldap_config["base"], filter: filter,
-      attributes: [return_attr]
-    )
-    entries.map { |entry| entry[return_attr].first }.compact
-  end
-
  def fetch_organizations
    attributes = %w{dn ou description}
    filter     = Net::LDAP::Filter.eq("objectClass", "organizationalUnit")
+    # filter     = Net::LDAP::Filter.eq("objectClass", "*")
    treebase   = "cn=users,#{ldap_suffix}"

    entries = client.search(base: treebase, filter: filter, attributes: attributes)
@@ -111,7 +101,7 @@ class LdapService < ApplicationService
    dn = "ou=#{ou},cn=users,#{ldap_suffix}"

    aci = <<-EOS
-(target="ldap:///cn=*,ou=#{ou},cn=users,#{ldap_suffix}")(targetattr="cn || sn || uid || userPassword || mail || mailRoutingAddress || serviceEnabled || nostrKey || pgpKey || 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,#{ldap_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,#{ldap_suffix}";)
    EOS

    attrs = {
--- a/app/services/lndhub.rb
+++ b/app/services/lndhub.rb
@@ -33,10 +33,7 @@ class Lndhub < ApplicationService
  end

  def authenticate(user)
-    credentials = post "auth?type=auth", {
-      login: user.lndhub_username,
-      password: user.lndhub_password
-    }
+    credentials = post "auth?type=auth", { login: user.ln_account, password: user.ln_password }
    self.auth_token = credentials["access_token"]
    self.auth_token
  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/mastodon_manager/fetch_user.rb
+++ b/app/services/mastodon_manager/fetch_user.rb
@@ -1,12 +0,0 @@
-module MastodonManager
-  class FetchUser < MastodonManagerService
-    def initialize(mastodon_id:)
-      @mastodon_id = mastodon_id
-    end
-
-    def call
-      user = get "v1/admin/accounts/#{@mastodon_id}"
-      user.with_indifferent_access
-    end
-  end
-end
--- a/app/services/mastodon_manager/find_user.rb
+++ b/app/services/mastodon_manager/find_user.rb
@@ -1,14 +0,0 @@
-module MastodonManager
-  class FindUser < MastodonManagerService
-    def initialize(username:)
-      @username = username
-    end
-
-    def call
-      users = get "v2/admin/accounts?username=#{@username}&origin=local"
-      users = users.map { |u| u.with_indifferent_access }
-      # Results may contain partial matches
-      users.find { |u| u.dig(:username).downcase == @username.downcase }
-    end
-  end
-end
--- a/app/services/mastodon_manager/sync_account_profiles.rb
+++ b/app/services/mastodon_manager/sync_account_profiles.rb
@@ -1,64 +0,0 @@
-module MastodonManager
-  class SyncAccountProfiles < MastodonManagerService
-    def initialize(direction: "down", overwrite: false, user: nil)
-      @direction = direction
-      @overwrite = overwrite
-      @user = user
-
-      if @direction != "down"
-        raise NotImplementedError
-      end
-    end
-
-    def call
-      if @user
-        Rails.logger.debug { "Syncing account profile for user #{@user.cn} (direction: #{@direction}, overwrite: #{@overwrite})"}
-        users = User.where(cn: @user.cn)
-      else
-        Rails.logger.debug { "Syncing account profiles (direction: #{@direction}, overwrite: #{@overwrite})"}
-        users = User
-      end
-
-      users.find_each do |user|
-        if user.mastodon_id.blank?
-          mastodon_user = MastodonManager::FindUser.call username: user.cn
-          if mastodon_user
-            Rails.logger.debug { "Setting mastodon_id for user #{user.cn}" }
-            user.update! mastodon_id: mastodon_user.dig(:account, :id).to_i
-          else
-            Rails.logger.debug { "No Mastodon user found for username #{user.cn}" }
-            next
-          end
-        end
-
-        next if user.avatar.attached? && user.display_name.present?
-
-        unless mastodon_user
-          Rails.logger.debug { "Fetching Mastodon account with ID #{user.mastodon_id} for #{user.cn}" }
-          mastodon_user = MastodonManager::FetchUser.call mastodon_id: user.mastodon_id
-        end
-
-        if user.display_name.blank?
-          if mastodon_display_name = mastodon_user.dig(:account, :display_name)
-            Rails.logger.debug { "Setting display name for user #{user.cn} from Mastodon" }
-            LdapManager::UpdateDisplayName.call(
-              dn: user.dn, display_name: mastodon_display_name
-            )
-          end
-        end
-
-        if !user.avatar.attached?
-          if avatar_url = mastodon_user.dig(:account, :avatar_static)
-            Rails.logger.debug { "Importing Mastodon avatar for user #{user.cn}" }
-            UserManager::ImportRemoteAvatar.call(
-              user: user, avatar_url: avatar_url
-            )
-          end
-        end
-      rescue => e
-        Sentry.capture_exception(e) if Setting.sentry_enabled?
-        Rails.logger.error e
-      end
-    end
-  end
-end
--- a/app/services/mastodon_manager_service.rb
+++ b/app/services/mastodon_manager_service.rb
@@ -1,22 +0,0 @@
-#
-# API Docs: https://docs.joinmastodon.org/methods/
-#
-class MastodonManagerService < RestApiService
-  private
-
-  def base_url
-    @base_url ||= "#{Setting.mastodon_public_url}/api"
-  end
-
-  def auth_token
-    @auth_token ||= Setting.mastodon_auth_token
-  end
-
-  def headers
-    {
-      "Content-Type" => "application/json",
-      "Accept" => "application/json",
-      "Authorization" => "Bearer #{auth_token}"
-    }
-  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/Show More
+++ b/Show More