WIP: Import deno modules for use with import maps

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

.env.test

@@ -1,9 +1,6 @@
 PRIMARY_DOMAIN=kosmos.org
 AKKOUNTS_DOMAIN=accounts.kosmos.org
 
-ENCRYPTION_PRIMARY_KEY=YhNLBgCFMAzw5dV3gISxnGrhNDMQwRdn
-ENCRYPTION_KEY_DERIVATION_SALT=h28g16MRZ1sghF2jTCos1DiLZXUswinR
-
 REDIS_URL='redis://localhost:6379/0'
 
 BTCPAY_PUBLIC_URL='https://btcpay.example.com'
@@ -24,8 +21,7 @@ LNDHUB_PUBLIC_KEY='024cd3be18617f39cf645851e3ba63f51fc13f0bb09e3bb25e6fd4de55648
 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'

.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

.npmrc

@@ -0,0 +1 @@
+@jsr:registry=https://npm.jsr.io

Dockerfile

@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y nodejs
 
 WORKDIR /akkounts
 
-COPY ["Gemfile", "Gemfile.lock", "package.json", "./"]
+COPY ["Gemfile", "Gemfile.lock", "package.json", "yarn.lock", "./"]
 
 RUN bundle install
 RUN gem install foreman

Gemfile

@@ -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
+# Separate dependency since Rails 7.0
-gem 'propshaft'
+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'
@@ -32,7 +37,6 @@ gem 'devise_ldap_authenticatable'
 gem 'net-ldap'
 
 # Utilities
-gem 'aasm'
 gem "image_processing", "~> 1.12.2"
 gem "rqrcode", "~> 2.0"
 gem 'rails-settings-cached', '~> 2.8.3'
@@ -40,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'
@@ -49,8 +51,8 @@ gem 'down'
 gem 'aws-sdk-s3', require: false
 
 # Background/scheduled jobs
-gem 'solid_queue'
+gem 'sidekiq', '< 7'
-gem "mission_control-jobs"
+gem 'sidekiq-scheduler'
 
 # Monitoring
 gem "sentry-ruby"
@@ -61,11 +63,10 @@ gem 'discourse_api'
 gem "lnurl"
 gem 'manifique', '~> 1.1.0'
 gem 'nostr', '~> 0.6.0'
-gem "redis", "~> 5.4"
 
 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

Gemfile.lock

@@ -1,111 +1,110 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    aasm (5.5.0)
+    actioncable (7.1.3)
-      concurrent-ruby (~> 1.0)
+      actionpack (= 7.1.3)
-    actioncable (8.0.2)
+      activesupport (= 7.1.3)
-      actionpack (= 8.0.2)
-      activesupport (= 8.0.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.0.2)
+    actionmailbox (7.1.3)
-      actionpack (= 8.0.2)
+      actionpack (= 7.1.3)
-      activejob (= 8.0.2)
+      activejob (= 7.1.3)
-      activerecord (= 8.0.2)
+      activerecord (= 7.1.3)
-      activestorage (= 8.0.2)
+      activestorage (= 7.1.3)
-      activesupport (= 8.0.2)
+      activesupport (= 7.1.3)
-      mail (>= 2.8.0)
+      mail (>= 2.7.1)
-    actionmailer (8.0.2)
+      net-imap
-      actionpack (= 8.0.2)
+      net-pop
-      actionview (= 8.0.2)
+      net-smtp
-      activejob (= 8.0.2)
+    actionmailer (7.1.3)
-      activesupport (= 8.0.2)
+      actionpack (= 7.1.3)
-      mail (>= 2.8.0)
+      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)
+    actionpack (7.1.3)
-      actionview (= 8.0.2)
+      actionview (= 7.1.3)
-      activesupport (= 8.0.2)
+      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 (7.1.3)
-    actiontext (8.0.2)
+      actionpack (= 7.1.3)
-      actionpack (= 8.0.2)
+      activerecord (= 7.1.3)
-      activerecord (= 8.0.2)
+      activestorage (= 7.1.3)
-      activestorage (= 8.0.2)
+      activesupport (= 7.1.3)
-      activesupport (= 8.0.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.0.2)
+    actionview (7.1.3)
-      activesupport (= 8.0.2)
+      activesupport (= 7.1.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (8.0.2)
+    activejob (7.1.3)
-      activesupport (= 8.0.2)
+      activesupport (= 7.1.3)
       globalid (>= 0.3.6)
-    activemodel (8.0.2)
+    activemodel (7.1.3)
-      activesupport (= 8.0.2)
+      activesupport (= 7.1.3)
-    activerecord (8.0.2)
+    activerecord (7.1.3)
-      activemodel (= 8.0.2)
+      activemodel (= 7.1.3)
-      activesupport (= 8.0.2)
+      activesupport (= 7.1.3)
       timeout (>= 0.4.0)
-    activestorage (8.0.2)
+    activestorage (7.1.3)
-      actionpack (= 8.0.2)
+      actionpack (= 7.1.3)
-      activejob (= 8.0.2)
+      activejob (= 7.1.3)
-      activerecord (= 8.0.2)
+      activerecord (= 7.1.3)
-      activesupport (= 8.0.2)
+      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)
+      mutex_m
-      tzinfo (~> 2.0, >= 2.0.5)
+      tzinfo (~> 2.0)
-      uri (>= 0.13.1)
+    addressable (2.8.6)
-    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 6.0)
-      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.2)
-    ast (2.4.3)
+    aws-eventstream (1.3.0)
-    aws-eventstream (1.3.2)
+    aws-partitions (1.886.0)
-    aws-partitions (1.1092.0)
+    aws-sdk-core (3.191.0)
-    aws-sdk-core (3.222.2)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.992.0)
+      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.9)
+      aws-sigv4 (~> 1.8)
-      base64
       jmespath (~> 1, >= 1.6.1)
-      logger
+    aws-sdk-kms (1.77.0)
-    aws-sdk-kms (1.99.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.1)
-      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.143.0)
-    aws-sdk-s3 (1.183.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.11.0)
+    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)
+    benchmark (0.3.0)
-    bigdecimal (3.1.9)
+    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
@@ -115,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)
+    concurrent-ruby (1.2.3)
-    connection_pool (2.5.2)
+    connection_pool (2.4.1)
-    crack (1.0.0)
+    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)
+    date (3.3.4)
-    devise (4.9.4)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -142,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 (2.8.1)
-    dotenv-rails (3.1.8)
+    dotenv-rails (2.8.1)
-      dotenv (= 3.1.8)
+      dotenv (= 2.8.1)
-      railties (>= 6.1)
+      railties (>= 3.2)
-    down (5.4.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 (~> 1.2.0)
-    erubi (1.13.1)
+    erubi (1.12.0)
-    et-orbi (1.2.11)
+    et-orbi (1.2.7)
       tzinfo
     event_emitter (0.2.6)
     eventmachine (1.2.7)
-    factory_bot (6.5.1)
+    factory_bot (6.4.6)
-      activesupport (>= 6.1.0)
+      activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.4)
+    factory_bot_rails (6.4.3)
-      factory_bot (~> 6.5)
+      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)
+    faraday-multipart (1.0.4)
-      multipart-post (~> 2.0)
+      multipart-post (~> 2)
-    faraday-net_http (3.1.1)
+    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.16.3)
-    ffi (1.17.2-arm64-darwin)
+    flipper (1.2.2)
-    ffi (1.17.2-x86_64-linux-gnu)
-    flipper (1.3.4)
       concurrent-ruby (< 2)
-    flipper-active_record (1.3.4)
+    flipper-active_record (1.2.2)
-      activerecord (>= 4.2, < 9)
+      activerecord (>= 4.2, < 8)
-      flipper (~> 1.3.4)
+      flipper (~> 1.2.2)
-    flipper-ui (1.3.4)
+    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-protection (>= 1.5.3, <= 4.0.0)
-      rack-session (>= 1.0.2, < 3.0.0)
+      sanitize (< 7)
-      sanitize (< 8)
+    fugit (1.9.0)
-    fugit (1.11.1)
+      et-orbi (~> 1, >= 1.2.7)
-      et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    gpgme (2.0.24)
+    hashdiff (1.1.0)
-      mini_portile2 (~> 2.7)
+    i18n (1.14.1)
-    hashdiff (1.1.2)
-    i18n (1.14.7)
       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)
+    io-console (0.7.2)
-    irb (1.15.2)
+    irb (1.11.1)
-      pp (>= 0.6.0)
+      rdoc
-      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    jaro_winkler (1.6.0)
+    jaro_winkler (1.5.6)
-    jbuilder (2.13.0)
+    jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    json (2.11.3)
+    json (2.7.1)
-    kramdown (2.5.1)
+    kramdown (2.4.0)
-      rexml (>= 3.3.9)
+      rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    language_server-protocol (3.17.0.4)
+    language_server-protocol (3.17.0.3)
-    launchy (3.1.1)
+    launchy (2.5.2)
       addressable (~> 2.8)
-      childprocess (~> 5.0)
+    letter_opener (1.8.1)
-      logger (~> 1.6)
+      launchy (>= 2.2, < 3)
-    letter_opener (1.10.0)
+    letter_opener_web (2.0.0)
-      launchy (>= 2.2, < 4)
+      actionmailer (>= 5.2)
-    letter_opener_web (3.0.0)
+      letter_opener (~> 1.7)
-      actionmailer (>= 6.1)
+      railties (>= 5.2)
-      letter_opener (~> 1.9)
-      railties (>= 6.1)
       rexml
-    lint_roller (1.1.0)
+    listen (3.8.0)
-    listen (3.9.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)
+    lockbox (1.3.2)
-    loofah (2.24.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -259,27 +249,18 @@ GEM
       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)
+    method_source (1.0.0)
-    mini_magick (4.13.2)
+    mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.5)
-    minitest (5.25.5)
+    minitest (5.21.2)
-    mission_control-jobs (1.0.2)
+    multipart-post (2.3.0)
-      actioncable (>= 7.1)
+    mutex_m (0.2.0)
-      actionpack (>= 7.1)
+    net-http (0.4.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)
       uri
-    net-imap (0.5.7)
+    net-imap (0.4.9.1)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -287,15 +268,15 @@ 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)
+    nio4r (2.7.0)
-    nokogiri (1.16.8)
+    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)
       bech32 (~> 1.4)
@@ -304,57 +285,45 @@ GEM
       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.4.3)
-    pagy (6.5.0)
+    parallel (1.24.0)
-    parallel (1.27.0)
+    parser (3.3.0.5)
-    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.9)
+    pg (1.5.4)
-    pp (0.6.2)
+    psych (5.1.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
       stringio
-    public_suffix (6.0.1)
+    public_suffix (5.0.4)
-    puma (6.6.0)
+    puma (4.3.12)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.8.1)
+    racc (1.7.3)
-    rack (2.2.13)
+    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)
+    rails (7.1.3)
-      actioncable (= 8.0.2)
+      actioncable (= 7.1.3)
-      actionmailbox (= 8.0.2)
+      actionmailbox (= 7.1.3)
-      actionmailer (= 8.0.2)
+      actionmailer (= 7.1.3)
-      actionpack (= 8.0.2)
+      actionpack (= 7.1.3)
-      actiontext (= 8.0.2)
+      actiontext (= 7.1.3)
-      actionview (= 8.0.2)
+      actionview (= 7.1.3)
-      activejob (= 8.0.2)
+      activejob (= 7.1.3)
-      activemodel (= 8.0.2)
+      activemodel (= 7.1.3)
-      activerecord (= 8.0.2)
+      activerecord (= 7.1.3)
-      activestorage (= 8.0.2)
+      activestorage (= 7.1.3)
-      activesupport (= 8.0.2)
+      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)
@@ -363,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)
+    railties (7.1.3)
-      actionpack (= 8.0.2)
+      actionpack (= 7.1.3)
-      activesupport (= 8.0.2)
+      activesupport (= 7.1.3)
-      irb (~> 1.13)
+      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)
+    rbs (2.8.4)
-      logger
+    rdoc (6.6.2)
-    rdoc (6.13.1)
       psych (>= 4.0.0)
-    redis (5.4.0)
+    redis (4.8.1)
-      redis-client (>= 0.22.0)
+    regexp_parser (2.9.0)
-    redis-client (0.24.0)
+    reline (0.4.2)
-      connection_pool
-    regexp_parser (2.10.0)
-    reline (0.6.1)
       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-core (3.12.2)
-      rspec-support (~> 3.13.0)
+      rspec-support (~> 3.12.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
+      rspec-support (~> 3.12.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
+      rspec-support (~> 3.12.0)
-    rspec-rails (7.1.1)
+    rspec-rails (6.1.1)
-      actionpack (>= 7.0)
+      actionpack (>= 6.1)
-      activesupport (>= 7.0)
+      activesupport (>= 6.1)
-      railties (>= 7.0)
+      railties (>= 6.1)
-      rspec-core (~> 3.13)
+      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.13)
+      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.13)
+      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.13)
+      rspec-support (~> 3.12)
-    rspec-support (3.13.2)
+    rspec-support (3.12.1)
-    rubocop (1.75.3)
+    rubocop (1.60.2)
       json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
+      language_server-protocol (>= 3.17.0)
-      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
+      regexp_parser (>= 1.8, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.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)
+      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.30.0)
-      parser (>= 3.3.7.2)
+      parser (>= 3.2.1.0)
-      prism (~> 1.4)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.3)
+    ruby-vips (2.2.0)
       ffi (~> 1.12)
-      logger
+    ruby2_keywords (0.0.5)
-    sanitize (7.0.0)
+    rufus-scheduler (3.9.1)
+      fugit (~> 1.1, >= 1.1.6)
+    sanitize (6.1.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.16.8)
+      nokogiri (>= 1.12.0)
-    securerandom (0.4.1)
+    sentry-rails (5.16.1)
-    sentry-rails (5.23.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.23.0)
+      sentry-ruby (~> 5.16.1)
-    sentry-ruby (5.23.0)
+    sentry-ruby (5.16.1)
-      bigdecimal
       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)
+      rbs (~> 2.0)
-      reverse_markdown (~> 3.0)
+      reverse_markdown (~> 2.0)
       rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-      yard-solargraph (~> 0.1)
+    sprockets (4.2.1)
-    solid_queue (1.1.5)
+      concurrent-ruby (~> 1.0)
-      activejob (>= 7.1)
+      rack (>= 2.2.4, < 4)
-      activerecord (>= 7.1)
+    sprockets-rails (3.4.2)
-      concurrent-ruby (>= 1.3.1)
+      actionpack (>= 5.2)
-      fugit (~> 1.11.0)
+      activesupport (>= 5.2)
-      railties (>= 7.1)
+      sprockets (>= 3.0.0)
-      thor (~> 1.3.1)
+    sqlite3 (1.7.2)
-    sqlite3 (2.6.0)
       mini_portile2 (~> 2.8.0)
-    sqlite3 (2.6.0-arm64-darwin)
+    sqlite3 (1.7.2-arm64-darwin)
-    sqlite3 (2.6.0-x86_64-linux-gnu)
+    sqlite3 (1.7.2-x86_64-linux)
-    stimulus-rails (1.3.4)
+    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-display_width (2.5.0)
-      unicode-emoji (~> 4.0, >= 4.0.4)
+    uri (0.13.0)
-    unicode-emoji (4.0.4)
+    view_component (3.10.0)
-    uri (1.0.3)
+      activesupport (>= 5.2.0, < 8.0)
-    useragent (0.16.11)
+      concurrent-ruby (~> 1.0)
-    view_component (3.22.0)
-      activesupport (>= 5.2.0, < 8.1)
-      concurrent-ruby (= 1.3.4)
       method_source (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -505,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)
+    webrick (1.8.1)
-    websocket-driver (0.7.7)
+    websocket-driver (0.7.6)
-      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.37)
+    yard (0.9.34)
-    yard-solargraph (0.1.0)
+    zeitwerk (2.6.12)
-      yard (~> 0.9)
-    zbase32 (0.1.1)
-    zeitwerk (2.7.2)
 
 PLATFORMS
   arm64-darwin-22
@@ -528,7 +491,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  aasm
   aws-sdk-s3
   bcrypt (~> 3.1)
   capybara
@@ -545,7 +507,6 @@ DEPENDENCIES
   flipper
   flipper-active_record
   flipper-ui
-  gpgme (~> 2.0.24)
   image_processing (~> 1.12.2)
   importmap-rails
   jbuilder (~> 2.7)
@@ -553,25 +514,25 @@ DEPENDENCIES
   letter_opener_web
   listen (~> 3.2)
   lnurl
+  lockbox
   manifique (~> 1.1.0)
-  mission_control-jobs
   net-ldap
   nostr (~> 0.6.0)
   pagy (~> 6.0, >= 6.0.2)
   pg (~> 1.5)
-  propshaft
+  puma (~> 4.1)
-  puma (~> 6.6)
+  rails (~> 7.1)
-  rails (~> 8.0)
   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
+  sprockets-rails
-  sqlite3 (>= 2.1)
+  sqlite3 (~> 1.7.2)
   stimulus-rails
   turbo-rails
   tzinfo-data
@@ -579,7 +540,6 @@ DEPENDENCIES
   warden
   web-console (~> 4.2)
   webmock
-  zbase32 (~> 0.1.1)
 
 BUNDLED WITH
-   2.5.5
+   2.5.11

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
 
@@ -128,7 +128,6 @@ command:
 
 ### Front-end
 
-* [Icons](https://feathericons.com)
 * [Tailwind CSS](https://tailwindcss.com/)
 * [Sass](https://sass-lang.com/documentation)
 * [Stimulus](https://stimulus.hotwired.dev/handbook/)

app/assets/config/manifest.js

@@ -0,0 +1,4 @@
+//= link_tree ../images
+//= link_tree ../../javascript .js
+//= link_tree ../builds
+//= link_tree ../../../vendor/javascript .js

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

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

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
 

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),
+          href: launch_app_services_storage_rs_auth_url(@auth)
-          open_in_new_tab: true
         ) do %>
       Launch app
     <% end %>

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

app/controllers/admin/donations_controller.rb

@@ -4,22 +4,11 @@ class Admin::DonationsController < Admin::BaseController
 
   # GET /donations
   def index
-    @username = params[:username].presence
+    @pagy, @donations = pagy(Donation.completed.order('paid_at desc'))
-
-    pending_scope   = Donation.incomplete.joins(:user).order('paid_at desc')
-    completed_scope = Donation.completed.joins(:user).order('paid_at desc')
-
-    if @username
-      pending_scope   = pending_scope.where(users: { cn: @username })
-      completed_scope = completed_scope.where(users: { cn: @username })
-    end
-
-    @pending_donations = pending_scope
-    @pagy, @donations  = pagy(completed_scope)
 
     @stats = {
-      overall_sats: completed_scope.sum("amount_sats"),
+      overall_sats: @donations.sum("amount_sats"),
-      donor_count: completed_scope.distinct.count(:user_id)
+      donor_count: Donation.completed.count(:user_id)
     }
   end
 

app/controllers/admin/invitations_controller.rb

@@ -1,28 +1,12 @@
 class Admin::InvitationsController < Admin::BaseController
-  before_action :set_current_section
-
   def index
-    @username = params[:username].presence
+    @current_section = :invitations
-    accepted_scope = Invitation.used.order('used_at desc')
+    @pagy, @invitations_used = pagy(Invitation.used.order('used_at desc'))
-    unused_scope = Invitation.unused
-
-    if @username
-      accepted_scope = accepted_scope.joins(:user).where(users: { cn: @username })
-      unused_scope = unused_scope.joins(:user).where(users: { cn: @username })
-    end
-
-    @pagy, @invitations_used = pagy(accepted_scope)
 
     @stats = {
-      available: unused_scope.count,
+      available: Invitation.unused.count,
-      accepted: accepted_scope.count,
+      accepted: @invitations_used.length,
-      users_with_referrals: accepted_scope.distinct.count(:user_id)
+      users_with_referrals: Invitation.used.distinct.count(:user_id)
     }
   end
-
-  private
-
-    def set_current_section
-      @current_section = :invitations
-    end
 end

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 = {}

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

app/controllers/admin/users_controller.rb

@@ -4,37 +4,25 @@ class Admin::UsersController < Admin::BaseController
 
   # GET /admin/users
   def index
-    ldap = LdapService.new
+    ldap   = LdapService.new
-    ou   = Setting.primary_domain
+    @ou    = Setting.primary_domain
-    @show_contributors = Setting.user_index_show_contributors
+    @pagy, @users = pagy(User.where(ou: @ou).order(cn: :asc))
-    @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))
 
     @stats = {
-      users_confirmed: User.where(ou: ou).confirmed.count,
+      users_confirmed: User.where(ou: @ou).confirmed.count,
-      users_pending: User.where(ou: ou).pending.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
   def show
-    @invitees = @user.invitees
-    @recent_invitees = @user.invitees.order(created_at: :desc).limit(5)
-    @more_invitees = (@invitees - @recent_invitees).count
-
     if Setting.lndhub_admin_enabled?
       @lndhub_user = @user.lndhub_user
     end
 
     @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
@@ -42,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"

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

app/controllers/contributions/donations_controller.rb

@@ -11,7 +11,7 @@ class Contributions::DonationsController < ApplicationController
   def index
     @current_section = :contributions
     @donations_completed = current_user.donations.completed.order('paid_at desc')
-    @donations_processing = current_user.donations.processing.order('created_at desc')
+    @donations_pending = current_user.donations.processing.order('created_at desc')
 
     if Setting.lndhub_enabled?
       begin
@@ -81,11 +81,14 @@ class Contributions::DonationsController < ApplicationController
 
     case invoice["status"]
     when "Settled"
-      @donation.complete!
+      @donation.paid_at = DateTime.now
+      @donation.payment_status = "settled"
+      @donation.save!
       flash_message = { success: "Thank you!" }
     when "Processing"
       unless @donation.processing?
-        @donation.start_processing!
+        @donation.payment_status = "processing"
+        @donation.save!
         flash_message = { success: "Thank you! We will send you an email when the payment is confirmed." }
         BtcpayCheckDonationJob.set(wait: 20.seconds).perform_later(@donation)
       end

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
 

app/controllers/lnurlpay_controller.rb

@@ -37,7 +37,7 @@ class LnurlpayController < ApplicationController
       pubkey: Setting.lndhub_public_key,
       customData: [{
         customKey: "696969",
-        customValue: @user.lndhub_username
+        customValue: @user.ln_account
       }]
     }
   end

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

app/controllers/services/rs_auths_controller.rb

@@ -23,11 +23,7 @@ class Services::RsAuthsController < Services::BaseController
   end
 
   def launch_app
-    user_address = Rails.env.development? ?
+    launch_url = "#{@auth.launch_url}#remotestorage=#{current_user.address}&access_token=#{@auth.token}"
-      "#{current_user.cn}@localhost:3000" :
-      current_user.address
-
-    launch_url = "#{@auth.launch_url}#remotestorage=#{user_address}"
 
     redirect_to launch_url, allow_other_host: true
   end

app/controllers/settings_controller.rb

@@ -21,12 +21,10 @@ class SettingsController < ApplicationController
     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.avatar_new = user_params[:avatar]
-    @user.pgp_pubkey   = user_params[:pgp_pubkey]
 
     if @user.save
       if @user.display_name && (@user.display_name != @user.ldap_entry[:display_name])
@@ -34,16 +32,7 @@ class SettingsController < ApplicationController
       end
 
       if @user.avatar_new.present?
-        if store_user_avatar
+        LdapManager::UpdateAvatar.call(dn: @user.dn, file: @user.avatar_new)
-          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)
       end
 
       redirect_to setting_path(@settings_section), flash: {
@@ -55,7 +44,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 +61,6 @@ class SettingsController < ApplicationController
     end
   end
 
-  # POST /settings/reset_email_password
   def reset_email_password
     @user.current_password = security_params[:current_password]
 
@@ -96,7 +83,6 @@ class SettingsController < ApplicationController
     end
   end
 
-  # POST /settings/reset_password
   def reset_password
     current_user.send_reset_password_instructions
     sign_out current_user
@@ -104,7 +90,6 @@ 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)
 
@@ -167,8 +152,7 @@ class SettingsController < ApplicationController
 
     def user_params
       params.require(:user).permit(
-        :display_name, :avatar_new, :pgp_pubkey,
+        :display_name, :avatar, preferences: UserPreferences.pref_keys
-        preferences: UserPreferences.pref_keys
       )
     end
 
@@ -189,30 +173,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

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,

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

app/controllers/webfinger_controller.rb

@@ -33,10 +33,6 @@ class WebfingerController < WellKnownController
       links: []
     }
 
-    if @user.avatar.attached?
-      jrd[:links] += avatar_link
-    end
-
     if Setting.mastodon_enabled && @user.service_enabled?(:mastodon)
       # https://docs.joinmastodon.org/spec/webfinger/
       jrd[:aliases] += mastodon_aliases
@@ -51,16 +47,6 @@ class WebfingerController < WellKnownController
     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}",
@@ -88,7 +74,7 @@ class WebfingerController < WellKnownController
   end
 
   def remotestorage_link
-    auth_url = new_rs_oauth_url(@username, host: Setting.rs_accounts_domain)
+    auth_url = new_rs_oauth_url(@username, host: Setting.accounts_domain)
     storage_url = "#{Setting.rs_storage_url}/#{@username}"
 
     {

app/controllers/webhooks_controller.rb

@@ -5,7 +5,7 @@ class WebhooksController < ApplicationController
   before_action :process_payload
 
   def lndhub
-    @user = User.find_by!(lndhub_username: @payload[:user_login])
+    @user = User.find_by!(ln_account: @payload[:user_login])
 
     if @zap = @user.zaps.find_by(payment_request: @payload[:payment_request])
       settled_at = Time.parse(@payload[:settled_at])

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

app/javascript/controllers/nostr_login_controller.js

@@ -1,4 +1,5 @@
 import { Controller } from "@hotwired/stimulus"
+// import { Nostrify } from '@nostrify/nostrify';
 
 // Connects to data-controller="nostr-login"
 export default class extends Controller {
@@ -6,6 +7,9 @@ export default class extends Controller {
   static values  = { site: String, sharedSecret: String }
 
   connect() {
+    // window.Nostrify = Nostrify;
+    // console.log(Nostrify);
+
     if (window.nostr) {
       this.loginButtonTarget.disabled = false
       this.loginFormTarget.classList.remove("hidden")

app/jobs/btcpay_check_donation_job.rb

@@ -10,7 +10,9 @@ class BtcpayCheckDonationJob < ApplicationJob
 
     case invoice["status"]
     when "Settled"
-      donation.complete!
+      donation.paid_at = DateTime.now
+      donation.payment_status = "settled"
+      donation.save!
 
       NotificationMailer.with(user: donation.user)
                         .bitcoin_donation_confirmed

app/jobs/create_ldap_user_job.rb

@@ -4,7 +4,7 @@ class CreateLdapUserJob < ApplicationJob
   def perform(username:, domain:, email:, hashed_pw:, confirmed: false)
     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,

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"],
+    user.update! ln_account: credentials["login"],
-                 lndhub_password: credentials["password"]
+                 ln_password: credentials["password"]
   end
 end

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

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

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

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

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

app/models/concerns/settings/mastodon_settings.rb

@@ -11,9 +11,6 @@ module Settings
 
       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

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

app/models/concerns/settings/remote_storage_settings.rb

@@ -6,9 +6,6 @@ module Settings
       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
 

app/models/donation.rb

@@ -1,42 +1,22 @@
 class Donation < ApplicationRecord
-  include AASM
+  # Relations
-
   belongs_to :user
 
+  # Validations
   validates_presence_of :user
   validates_presence_of :donation_method,
     inclusion: { in: %w[ custom btcpay lndhub ] }
   validates_presence_of :payment_status, allow_nil: true,
-    inclusion: { in: %w[ pending processing settled ] }
+    inclusion: { in: %w[ processing settled ] }
   validates_presence_of :paid_at, allow_nil: true
   validates_presence_of :amount_sats, allow_nil: true
   validates_presence_of :fiat_amount, allow_nil: true
   validates_presence_of :fiat_currency, allow_nil: true,
     inclusion: { in: %w[ EUR USD ] }
 
-  scope :pending,    -> { where(payment_status: "pending") }
+  #Scopes
   scope :processing, -> { where(payment_status: "processing") }
-  scope :completed,  -> { where(payment_status: "settled") }
+  scope :completed, -> { where(payment_status: "settled") }
-  scope :incomplete, -> { where.not(payment_status: "settled") }
-
-  aasm column: :payment_status do
-    state :pending, initial: true
-    state :processing
-    state :settled
-
-    event :start_processing do
-      transitions from: :pending, to: :processing
-    end
-
-    event :complete do
-      transitions from: :processing, to: :settled, after: [:set_paid_at, :set_sustainer_status]
-      transitions from: :pending, to: :settled, after: [:set_paid_at, :set_sustainer_status]
-    end
-  end
-
-  def pending?
-    payment_status == "pending"
-  end
 
   def processing?
     payment_status == "processing"
@@ -45,17 +25,4 @@ class Donation < ApplicationRecord
   def completed?
     payment_status == "settled"
   end
-
-  private
-
-    def set_paid_at
-      update paid_at: DateTime.now if paid_at.nil?
-    end
-
-    def set_sustainer_status
-      user.add_member_status :sustainer
-    rescue => e
-      Sentry.capture_exception(e) if Setting.sentry_enabled?
-      Rails.logger.error("Failed to set memberStatus: #{e.message}")
-    end
 end

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

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
+      queue = Sidekiq::Queue.new(RemoteStorageExpireAuthorizationJob.queue_name)
-      job_args = [id]
+      queue.each do |job|
-
+        next unless job.display_class == "RemoteStorageExpireAuthorizationJob"
-      query = SolidQueue::Job.where(class_name: job_class.to_s)
+        job.delete if job.display_args == [id]
-
+      end
-      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
     end
 
     def find_or_create_web_app

app/models/setting.rb

@@ -16,7 +16,6 @@ class Setting < RailsSettings::Base
   include Settings::LightningNetworkSettings
   include Settings::MastodonSettings
   include Settings::MediaWikiSettings
-  include Settings::MembershipSettings
   include Settings::NostrSettings
   include Settings::OpenCollectiveSettings
   include Settings::RemoteStorageSettings

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
 
@@ -23,16 +22,10 @@ class User < ApplicationRecord
   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
-
   #
   # Validations
   #
@@ -56,11 +49,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 +63,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 +74,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(',')
@@ -163,41 +149,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
+    @ldap_entry = ldap.fetch_users(uid: self.cn, ou: self.ou).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)
   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,22 +165,8 @@ class User < ApplicationRecord
     Nostr::PublicKey.new(nostr_pubkey).to_bech32
   end
 
-  def pgp_pubkey
+  def avatar
-    @pgp_pubkey ||= ldap_entry[:pgp_key]
+    @avatar_base64 ||= LdapManager::FetchAvatar.call(cn: cn)
-  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))
   end
 
   def services_enabled
@@ -234,39 +178,21 @@ class User < ApplicationRecord
   end
 
   def enable_service(service)
-    add_to_ldap_array :services_enabled, :serviceEnabled, service
+    current_services = services_enabled
-    ldap_entry(reload: true)[:services_enabled]
+    new_services = Array(service).map(&:to_s)
+    services = (current_services + new_services).uniq.sort
+    ldap.replace_attribute(dn, :serviceEnabled, services)
   end
 
   def disable_service(service)
-    remove_from_ldap_array :services_enabled, :serviceEnabled, service
+    current_services = services_enabled
-    ldap_entry(reload: true)[:services_enabled]
+    disabled_services = Array(service).map(&:to_s)
+    services = (current_services - disabled_services).uniq.sort
+    ldap.replace_attribute(dn, :serviceEnabled, services)
   end
 
   def disable_all_services
-    ldap.delete_attribute(dn, :serviceEnabled)
+    ldap.delete_attribute(dn,:service)
-  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)
   end
 
   private
@@ -280,7 +206,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 +214,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

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
+    def base_url
-    @base_url ||= "#{Setting.btcpay_api_url}/stores/#{Setting.btcpay_store_id}"
+      @base_url ||= "#{Setting.btcpay_api_url}/stores/#{Setting.btcpay_store_id}"
-  end
+    end
 
-  def auth_token
+    def auth_token
-    @auth_token ||= Setting.btcpay_auth_token
+      @auth_token ||= Setting.btcpay_auth_token
-  end
+    end
 
-  def headers
+    def headers
-    {
+      {
-      "Content-Type" => "application/json",
+        "Content-Type" => "application/json",
-      "Accept" => "application/json",
+        "Accept" => "application/json",
-      "Authorization" => "token #{auth_token}"
+        "Authorization" => "token #{auth_token}"
-    }
+      }
-  end
+    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

app/services/create_account.rb

@@ -0,0 +1,54 @@
+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
+
+  def add_ldap_document
+    hashed_pw = Devise.ldap_auth_password_builder.call(@password)
+    CreateLdapUserJob.perform_later(
+      username: @username,
+      domain: @domain,
+      email: @email,
+      hashed_pw: hashed_pw,
+      confirmed: @confirmed
+    )
+  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

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

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,
+    res = Faraday.post("#{@base_url}/#{endpoint}", payload.to_json,
-                 "Content-Type" => "application/json"
+                       "Content-Type" => "application/json")
-  end
 
-  #
+    if res.status != 200
-  # API endpoints
+      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 = {
+    payload = { user: user.cn, host: user.ou, element: content }
-      user: user.cn, host: user.ou,
-      element: content
-    }
     post "private_set", payload
   end
 end

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

app/services/ldap_manager/update_avatar.rb

@@ -2,41 +2,26 @@ require "image_processing/vips"
 
 module LdapManager
   class UpdateAvatar < LdapManagerService
-    def initialize(user:)
+    def initialize(dn:, file:)
-      @user = user
+      @dn = dn
-      @dn = user.dn
+      @img_data = process(file)
     end
 
     def call
-      unless @user.avatar.attached?
+      replace_attribute @dn, :jpegPhoto, @img_data
-        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
     end
 
     private
 
-    def process_avatar
+    def process(file)
-      @user.avatar.blob.open do |file|
+      processed = ImageProcessing::Vips
-        processed = ImageProcessing::Vips
+        .resize_to_fill(512, 512)
-          .source(file)
+        .source(file)
-          .resize_to_fill(256, 256)
+        .convert("jpeg")
-          .convert("jpeg")
+        .saver(strip: true)
-          .saver(strip: true)
+        .call
-          .call
+
-        processed.read
+      Base64.strict_encode64 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
     end
   end
 end

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
-        replace_attribute @dn, :displayName, @display_name
-      else
-        delete_attribute @dn, :displayName
-      end
     end
   end
 end

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

app/services/ldap_service.rb

@@ -50,17 +50,19 @@ class LdapService < ApplicationService
   end
 
   def fetch_users(args={})
-    attributes = %w[
+    if args[:ou]
-      dn cn uid mail displayName admin serviceEnabled memberStatus
+      treebase = "ou=#{args[:ou]},cn=users,#{ldap_suffix}"
-      mailRoutingAddress mailpassword nostrKey pgpKey
+    else
-    ]
+      treebase = ldap_config["base"]
-    filter = Net::LDAP::Filter.eq('objectClass', 'person') &
+    end
-             Net::LDAP::Filter.eq("cn", args[:cn] || "*")
 
-    entries = client.search(
+    attributes = %w[
-      base: ldap_config["base"], filter: filter,
+      dn cn uid mail displayName admin serviceEnabled
-      attributes: attributes
+      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,
+        nostr_key: e.try(:nostrKey) ? e.nostrKey.first : nil
-        pgp_key: e.try(:pgpKey) ? e.pgpKey.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 || userPassword || mail || mailRoutingAddress || serviceEnabled || nostrKey || nsRole || objectClass") (version 3.0; acl "service-#{ou.gsub(".", "-")}-read-search"; allow (read,search) userdn="ldap:///uid=service,ou=#{ou},cn=applications,#{ldap_suffix}";)
     EOS
 
     attrs = {

app/services/lndhub.rb

@@ -33,10 +33,7 @@ class Lndhub < ApplicationService
   end
 
   def authenticate(user)
-    credentials = post "auth?type=auth", {
+    credentials = post "auth?type=auth", { login: user.ln_account, password: user.ln_password }
-      login: user.lndhub_username,
-      password: user.lndhub_password
-    }
     self.auth_token = credentials["access_token"]
     self.auth_token
   end

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

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

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

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

app/services/rest_api_service.rb

@@ -1,27 +0,0 @@
-class RestApiService < ApplicationService
-  private
-
-  def base_url
-    raise NotImplementedError
-  end
-
-  def headers
-    raise NotImplementedError
-  end
-
-  def endpoint_url(path)
-    "#{base_url}/#{path.gsub(/^\//, '')}"
-  end
-
-  def get(path, params = {})
-    res = Faraday.get endpoint_url(path), params, headers
-    # TODO handle unsuccessful responses with no valid JSON body
-    JSON.parse(res.body)
-  end
-
-  def post(path, payload)
-    res = Faraday.post endpoint_url(path), payload.to_json, headers
-    # TODO handle unsuccessful responses with no valid JSON body
-    JSON.parse(res.body)
-  end
-end

app/services/user_manager/create_account.rb

@@ -1,56 +0,0 @@
-module UserManager
-  class CreateAccount < UserManagerService
-    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
-
-    def add_ldap_document
-      hashed_pw = Devise.ldap_auth_password_builder.call(@password)
-      CreateLdapUserJob.perform_later(
-        username: @username,
-        domain: @domain,
-        email: @email,
-        hashed_pw: hashed_pw,
-        confirmed: @confirmed
-      )
-    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
-end

app/services/user_manager/create_invitations.rb

@@ -1,19 +0,0 @@
-module UserManager
-  class CreateInvitations < UserManagerService
-    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
-end

app/services/user_manager/import_remote_avatar.rb

@@ -1,42 +0,0 @@
-module UserManager
-  class ImportRemoteAvatar < UserManagerService
-    def initialize(user:, avatar_url:)
-      @user = user
-      @avatar_url = avatar_url
-    end
-
-    def call
-      if import_remote_avatar
-        UserManager::UpdateAvatar.call(user: @user)
-      end
-    end
-
-    private
-
-    def import_remote_avatar
-      tempfile = Down.download(@avatar_url)
-      content_type = tempfile.content_type
-      unless %w[image/jpeg image/png].include?(content_type)
-        Rails.logger.warn { "Wrong content type of remote avatar for user #{user.cn}: '#{content_type}'" }
-        return false
-      end
-
-      img_data = UserManager::ProcessAvatar.call(io: tempfile)
-      tempfile = Tempfile.create
-      tempfile.binmode
-      tempfile.write(img_data)
-      tempfile.rewind
-
-      hash = Digest::SHA256.hexdigest(img_data)
-      ext = content_type == "image/png" ? "png" : "jpg"
-      filename = "#{hash}.#{ext}"
-      key = "users/#{@user.cn}/avatars/#{filename}"
-
-      @user.avatar.attach io: tempfile, key: key, filename: filename
-    rescue => e
-      Sentry.capture_exception(e) if Setting.sentry_enabled?
-      Rails.logger.warn "Importing remote avatar failed: \"#{e.message}\""
-      false
-    end
-  end
-end

app/services/user_manager/pgp_encrypt.rb

@@ -1,19 +0,0 @@
-require 'gpgme'
-
-module UserManager
-  class PgpEncrypt < UserManagerService
-    def initialize(user:, text:)
-      @user = user
-      @text = text
-    end
-
-    def call
-      crypto = GPGME::Crypto.new
-      crypto.encrypt(
-        @text,
-        recipients: @user.gnupg_key,
-        always_trust: true
-      )
-    end
-  end
-end

app/services/user_manager/process_avatar.rb

@@ -1,21 +0,0 @@
-module UserManager
-  class ProcessAvatar < UserManagerService
-    def initialize(io:)
-      @io = io
-    end
-
-    def call
-      processed = ImageProcessing::Vips
-        .source(@io)
-        .resize_to_fill(400, 400)
-        .saver(strip: true)
-        .call
-      @io.rewind
-      processed.read
-    rescue Vips::Error => e
-      Sentry.capture_exception(e) if Setting.sentry_enabled?
-      Rails.logger.warn { "Image processing failed for avatar: #{e.message}" }
-      nil
-    end
-  end
-end

app/services/user_manager/update_avatar.rb

@@ -1,15 +0,0 @@
-module UserManager
-  class UpdateAvatar < UserManagerService
-    def initialize(user:)
-      @user = user
-    end
-
-    def call
-      LdapManager::UpdateAvatar.call(user: @user)
-
-      if Setting.ejabberd_enabled?
-        XmppSetAvatarJob.perform_later(user: @user)
-      end
-    end
-  end
-end

app/services/user_manager/update_pgp_key.rb

@@ -1,24 +0,0 @@
-module UserManager
-  class UpdatePgpKey < UserManagerService
-    def initialize(user:)
-      @user = user
-    end
-
-    def call
-      if @user.pgp_pubkey.blank?
-        @user.update! pgp_fpr: nil
-      else
-        result = GPGME::Key.import(@user.pgp_pubkey)
-
-        if result.imports.present?
-          @user.update! pgp_fpr: result.imports.first.fpr
-        else
-          # TODO notify Sentry, user
-          raise "Failed to import OpenPGP pubkey"
-        end
-      end
-
-      LdapManager::UpdatePgpKey.call(dn: @user.dn, pubkey: @user.pgp_pubkey)
-    end
-  end
-end

app/services/user_manager_service.rb

@@ -1,2 +0,0 @@
-class UserManagerService < ApplicationService
-end

app/views/admin/_username_search_form.html.erb

@@ -1,11 +0,0 @@
-<%= form_with url: path, method: :get, local: true, class: "flex gap-1" do %>
-  <%= text_field_tag :username, @username, placeholder: 'Filter by username' %>
-  <%= button_tag type: 'submit', name: nil, title: "Filter", class: 'btn-md btn-icon btn-outline' do %>
-    <%= render partial: "icons/filter", locals: { custom_class: "text-blue-600 h-4 w-4 inline" } %>
-  <% end %>
-  <% if @username %>
-    <%= link_to path, title: "Remove filter", class: 'btn-md btn-icon btn-outline' do  %>
-      <%= render partial: "icons/x", locals: { custom_class: "text-red-600 h-4 w-4 inline" } %>
-    <% end %>
-  <% end %>
-<% end %>

app/views/admin/donations/_list.html.erb

@@ -1,34 +0,0 @@
-<table class="divided">
-  <thead>
-    <tr>
-      <th>User</th>
-      <th class="text-right">Sats</th>
-      <th class="text-right">Fiat Amount</th>
-      <th class="pl-2">Public name</th>
-      <th>Date</th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% donations.each do |donation| %>
-      <tr>
-        <td><%= link_to donation.user.cn, admin_user_path(donation.user.cn), class: 'ks-text-link' %></td>
-        <td class="text-right"><% if donation.amount_sats.present? %><%= number_with_delimiter donation.amount_sats %><% end %></td>
-        <td class="text-right"><% if donation.fiat_amount.present? %><%= number_to_currency donation.fiat_amount.to_f / 100, unit: "" %> <%= donation.fiat_currency %><% end %></td>
-        <td class="pl-2"><%= donation.public_name %></td>
-        <td><%= donation.paid_at ? donation.paid_at.strftime("%Y-%m-%d (%H:%M UTC)") : donation.created_at.strftime("%Y-%m-%d (%H:%M UTC)") %></td>
-        <td class="text-right">
-          <%= link_to 'Show', admin_donation_path(donation), class: 'btn btn-sm btn-gray' %>
-          <%= link_to 'Edit', edit_admin_donation_path(donation), class: 'btn btn-sm btn-gray' %>
-          <%= link_to 'Destroy', admin_donation_path(donation), class: 'btn btn-sm btn-red',
-            data: { turbo_method: :delete, turbo_confirm: 'Are you sure?' } %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-<% if defined?(pagy) %>
-<div class="mt-8">
-  <%== pagy_nav pagy %>
-</div>
-<% end %>

app/views/admin/donations/index.html.erb

@@ -5,7 +5,7 @@
     <%= render QuickstatsContainerComponent.new do %>
       <%= render QuickstatsItemComponent.new(
           type: :number,
-          title: 'Received',
+          title: 'Overall',
           value: @stats[:overall_sats],
           unit: 'sats'
       ) %>
@@ -19,28 +19,41 @@
   </section>
 
   <section>
-    <%= render partial: "admin/username_search_form",
+  <% if @donations.any? %>
-               locals: { path: admin_donations_path } %>
+    <h3>Recent Donations</h3>
-  </section>
+    <table class="divided mb-8">
-
+      <thead>
-  <% if @pending_donations.present? %>
+        <tr>
-  <section>
+          <th>User</th>
-    <h3>Pending</h3>
+          <th class="text-right">Sats</th>
-    <%= render partial: "admin/donations/list", locals: {
+          <th class="text-right">Fiat Amount</th>
-          donations: @pending_donations
+          <th class="pl-2">Public name</th>
-        } %>
+          <th>Date</th>
-  </section>
+          <th></th>
-  <% end %>
+        </tr>
-
+      </thead>
-  <section>
+      <tbody>
-  <% if @donations.present? %>
+        <% @donations.each do |donation| %>
-    <h3>Received</h3>
+          <tr>
-    <%= render partial: "admin/donations/list", locals: {
+            <td><%= link_to donation.user.cn, admin_user_path(donation.user.cn), class: 'ks-text-link' %></td>
-          donations: @donations, pagy: @pagy
+            <td class="text-right"><% if donation.amount_sats.present? %><%= number_with_delimiter donation.amount_sats %><% end %></td>
-        } %>
+            <td class="text-right"><% if donation.fiat_amount.present? %><%= number_to_currency donation.fiat_amount.to_f / 100, unit: "" %> <%= donation.fiat_currency %><% end %></td>
+            <td class="pl-2"><%= donation.public_name %></td>
+            <td><%= donation.paid_at ? donation.paid_at.strftime("%Y-%m-%d (%H:%M UTC)") : "" %></td>
+            <td class="text-right">
+              <%= link_to 'Show', admin_donation_path(donation), class: 'btn btn-sm btn-gray' %>
+              <%= link_to 'Edit', edit_admin_donation_path(donation), class: 'btn btn-sm btn-gray' %>
+              <%= link_to 'Destroy', admin_donation_path(donation), class: 'btn btn-sm btn-red',
+                data: { turbo_method: :delete, turbo_confirm: 'Are you sure?' } %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+    <%== pagy_nav @pagy %>
   <% else %>
     <p>
-      No donations received yet.
+      No donations yet.
     </p>
   <% end %>
   </section>

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

@@ -25,15 +25,7 @@
           <td><%= @donation.public_name %></td>
         </tr>
         <tr>
-          <th>Payment status</th>
+          <th>Date</th>
-          <td><%= @donation.payment_status %></td>
-        </tr>
-        <tr>
-          <th>Created at</th>
-          <td><%= @donation.created_at&.strftime("%Y-%m-%d (%H:%M UTC)") %></td>
-        </tr>
-        <tr>
-          <th>Paid at</th>
           <td><%= @donation.paid_at&.strftime("%Y-%m-%d (%H:%M UTC)") %></td>
         </tr>
       </tbody>

app/views/admin/invitations/index.html.erb

@@ -21,15 +21,9 @@
       ) %>
     <% end %>
   </section>
-
-  <section>
-    <%= render partial: "admin/username_search_form",
-               locals: { path: admin_invitations_path } %>
-  </section>
-
   <% if @invitations_used.any? %>
     <section>
-      <h3>Accepted</h3>
+      <h3>Recently Accepted</h3>
       <table class="divided mb-8">
         <thead>
           <tr>

app/views/admin/settings/membership/show.html.erb

@@ -1,53 +0,0 @@
-<%= render HeaderComponent.new(title: "Settings") %>
-
-<%= render MainWithSidenavComponent.new(sidenav_partial: 'shared/admin_sidenav_settings') do %>
-  <%= form_for(Setting.new, url: admin_settings_membership_path, method: :put) do |f| %>
-    <section>
-      <h3>Membership</h3>
-
-      <% if @errors && @errors.any? %>
-        <%= render partial: "admin/settings/errors", locals: { errors: @errors } %>
-      <% end %>
-
-      <ul role="list">
-        <%= render FormElements::FieldsetResettableSettingComponent.new(
-              key: :member_status_contributor,
-              title: "Status name for contributing users",
-              description: "A contributing member of your organization/group"
-            ) %>
-        <%= render FormElements::FieldsetResettableSettingComponent.new(
-              key: :member_status_sustainer,
-              title: "Status name for paying users",
-              description: "A paying/donating member or customer"
-            ) %>
-      </ul>
-    </section>
-
-    <section>
-      <h3>Admin panel</h3>
-
-      <ul role="list">
-        <%= render FormElements::FieldsetToggleComponent.new(
-          form: f,
-          attribute: :user_index_show_contributors,
-          enabled: Setting.user_index_show_contributors?,
-          title: "Show #{Setting.member_status_contributor.downcase} status in user list",
-          description: "Can slow down page rendering with large user base"
-        ) %>
-        <%= render FormElements::FieldsetToggleComponent.new(
-          form: f,
-          attribute: :user_index_show_sustainers,
-          enabled: Setting.user_index_show_sustainers?,
-          title: "Show #{Setting.member_status_sustainer.downcase} status in user list",
-          description: "Can slow down page rendering with large user base"
-        ) %>
-      </ul>
-    </section>
-
-    <section>
-      <p class="pt-6 border-t border-gray-200 text-right">
-        <%= f.submit 'Save', class: "btn-md btn-blue w-full md:w-auto" %>
-      </p>
-    </section>
-  <% end %>
-<% end %>

app/views/admin/settings/services/_mastodon.html.erb

@@ -16,10 +16,5 @@
           key: :mastodon_address_domain,
           title: "User address domain"
         ) %>
-    <%= render FormElements::FieldsetResettableSettingComponent.new(
-          key: :mastodon_auth_token,
-          type: :password,
-          title: "API auth token"
-        ) %>
   <% end %>
 </ul>

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

@@ -13,20 +13,6 @@
           title: 'Pending',
           value: @stats[:users_pending],
       ) %>
-      <% if @show_contributors %>
-      <%= render QuickstatsItemComponent.new(
-          type: :number,
-          title: Setting.member_status_contributor.pluralize,
-          value: @stats[:users_contributing],
-      ) %>
-      <% end %>
-      <% if @show_sustainers %>
-      <%= render QuickstatsItemComponent.new(
-          type: :number,
-          title: Setting.member_status_sustainer.pluralize,
-          value: @stats[:users_paying],
-      ) %>
-      <% end %>
     <% end %>
   </section>
 
@@ -43,12 +29,8 @@
         <% @users.each do |user| %>
         <tr>
           <td><%= link_to(user.cn, admin_user_path(user.cn), class: 'ks-text-link') %></td>
-          <td>
+          <td><%= user.confirmed_at.nil? ? badge("pending", :yellow) : "" %></td>
-            <%= user.confirmed_at.nil? ? badge("pending", :yellow) : "" %>
+          <td><%= user.is_admin? ? badge("admin", :red) : "" %></td>
-            <% if @show_contributors %><%= @contributors.include?(user.cn) ? badge("contributor", :green) : "" %><% end %>
-            <% if @show_sustainers %><%= @sustainers.include?(user.cn) ? badge("sustainer", :green) : "" %><% end %>
-          </td>
-          <td><%= @admins.include?(user.cn) ? badge("admin", :red) : "" %></td>
         </tr>
         <% end %>
       </tbody>

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

@@ -32,30 +32,6 @@
             <th>Roles</th>
             <td><%= @user.is_admin? ? badge("admin", :red) : "—" %></td>
           </tr>
-          <tr>
-            <th>Status</th>
-            <td>
-            <% if @user.is_contributing_member? || @user.is_paying_member? %>
-              <%= @user.is_contributing_member? ? badge("contributor", :green) : "" %>
-              <%= @user.is_paying_member? ? badge("sustainer", :green) : "" %>
-            <% else %>
-              —
-            <% end %>
-            </td>
-          </tr>
-          <tr>
-            <th>Donations</th>
-            <td>
-            <% if @user.donations.any? %>
-              <%= link_to admin_donations_path(username: @user.cn), class: "ks-text-link" do %>
-                <%= @user.donations.completed.count %> for
-                <%= number_with_delimiter @user.donations.completed.sum("amount_sats") %> sats
-              <% end %>
-            <% else %>
-              —
-            <% end %>
-            </td>
-          </tr>
           <tr>
             <th>Invited by</th>
             <td>
@@ -99,13 +75,10 @@
           <tr>
             <th class="align-top">Invited users</th>
             <td class="align-top">
-            <% if @invitees.any? %>
+            <% if @user.invitees.length > 0 %>
               <ul class="mb-0">
-              <% @recent_invitees.each do |invitee| %>
+              <% @user.invitees.order(cn: :asc).each do |invitee| %>
-                <li class="leading-none mb-2 last:mb-0"><%= link_to invitee.cn, admin_user_path(invitee.cn), class: "ks-text-link" %></li>
+                <li class="leading-none mb-2 last:mb-0"><%= link_to invitee.cn, admin_user_path(invitee.cn), class: 'ks-text-link' %></li>
-              <% end %>
-              <% if @more_invitees > 0 %>
-                <li>and <%= link_to "#{@more_invitees} more", admin_invitations_path(username: @user.cn), class: "ks-text-link" %></li>
               <% end %>
               </ul>
             <% else %>&mdash;<% end %>
@@ -116,75 +89,13 @@
     </section>
 
     <section class="sm:flex-1 sm:pt-0">
-      <h3>Avatar</h3>
+      <% if @avatar.present? %>
-      <% if @user.avatar.attached? %>
+      <h3>LDAP<h3>
-      <table class="divided">
+      <p>
-        <tbody>
+        <img src="data:image/jpeg;base64,<%= @avatar %>" class="h-48 w-48" />
-          <tr>
+      </p>
-            <th class="align-top">Image</th>
-            <td class="align-top">
-              <%= image_tag image_url_for(@user.avatar), class: "h-20 w-20 rounded-lg" %>
-            </td>
-          </tr>
-          <tr>
-            <th>Content type</th>
-            <td>
-              <%= @user.avatar.content_type %>
-            </td>
-          </tr>
-          <tr>
-            <th>Size</th>
-            <td>
-              <%= number_to_human_size(@user.avatar.blob.byte_size) %>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <% else %>
-      <p class="text-gray-500">No avatar uploaded</p>
       <% end %>
-
+      <!-- <h3>Actions</h3> -->
-      <h3 class="mt-12">LDAP</h3>
-      <table class="divided">
-        <tbody>
-          <tr>
-            <th>Avatar</th>
-            <td>
-              <% if @ldap_avatar.present? %>
-                JPEG size: <%= number_to_human_size(@ldap_avatar.size) %>
-              <% else %>
-                &mdash;
-              <% end %>
-            </td>
-          </tr>
-          <tr>
-            <th>Display name</th>
-            <td><%= @user.display_name || "—" %></td>
-          </tr>
-          <tr>
-            <th class="align-top">PGP key</th>
-            <td class="align-top leading-5">
-              <% if @user.pgp_pubkey.present? %>
-                <span class="font-mono" title="<%= @user.pgp_fpr %>">
-                  <% if @user.pgp_pubkey_contains_user_address? %>
-                    <%= link_to wkd_key_url(hashed_username: @user.wkd_hash, l: @user.cn, format: :txt),
-                      class: "ks-text-link", target: "_blank" do %>
-                      <%= "#{@user.pgp_fpr[0, 8]}…#{@user.pgp_fpr[-8..-1]}" %>
-                    <% end %>
-                  <% else %>
-                    <%= "#{@user.pgp_fpr[0, 8]}…#{@user.pgp_fpr[-8..-1]}" %>
-                  <% end %>
-                </span><br />
-                <% @user.gnupg_key.uids.each do |uid| %>
-                  <%= uid.uid %><br />
-                <% end %>
-              <% else %>
-                &mdash;
-              <% end %>
-            </td>
-          </tr>
-        </tbody>
-      </table>
     </section>
   </div>
 
@@ -294,9 +205,7 @@
             ) %>
           </td>
           <td class="text-right">
-            <% if @user.nostr_pubkey.present? %>
             <%= link_to "Open profile", "https://njump.me/#{@user.nostr_pubkey_bech32}", class: "btn-sm btn-gray" %>
-            <% end %>
           </td>
         </tr>
         <% end %>
@@ -333,7 +242,7 @@
       </thead>
       <tbody>
         <tr>
-          <td><%= @user.lndhub_username %></td>
+          <td><%= @user.ln_account %></td>
           <td><%= number_with_delimiter @lndhub_user.balance %> sats</td>
           <td><%= number_with_delimiter @lndhub_user.sum_incoming %> sats</td>
           <td><%= number_with_delimiter @lndhub_user.sum_outgoing %> sats</td>
@@ -342,7 +251,7 @@
       </tbody>
     </table>
     <% else %>
-      <p>No LndHub user found for account <strong class="font-mono"><%= @user.lndhub_username %></strong>.
+      <p>No LndHub user found for account <strong class="font-mono"><%= @user.ln_account %></strong>.
     <% end %>
   </section>
   <% end %>

app/views/contributions/donations/index.html.erb

@@ -22,17 +22,17 @@
     </div>
   </section>
 
-  <% if @donations_processing.any? %>
+  <% if @donations_pending.any? %>
   <section class="donation-list">
     <h2>Pending</h2>
     <%= render partial: "contributions/donations/list",
-               locals: { donations: @donations_processing } %>
+               locals: { donations: @donations_pending } %>
   </section>
   <% end %>
 
   <% if @donations_completed.any? %>
   <section class="donation-list">
-    <h2>Contributions</h2>
+    <h2>Past contributions</h2>
     <%= render partial: "contributions/donations/list",
                locals: { donations: @donations_completed } %>
   </section>

app/views/icons/_filter.html.erb

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-filter <%= custom_class %>"><polygon points="22 3 2 3 10 12.46 10 19 14 21 14 12.46 22 3"></polygon></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-filter"><polygon points="22 3 2 3 10 12.46 10 19 14 21 14 12.46 22 3"></polygon></svg>

app/views/icons/_server.html.erb

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-server <%= custom_class %>"><rect x="2" y="2" width="20" height="8" rx="2" ry="2"></rect><rect x="2" y="14" width="20" height="8" rx="2" ry="2"></rect><line x1="6" y1="6" x2="6.01" y2="6"></line><line x1="6" y1="18" x2="6.01" y2="18"></line></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-server"><rect x="2" y="2" width="20" height="8" rx="2" ry="2"></rect><rect x="2" y="14" width="20" height="8" rx="2" ry="2"></rect><line x1="6" y1="6" x2="6.01" y2="6"></line><line x1="6" y1="18" x2="6.01" y2="18"></line></svg>

app/views/icons/_users.html.erb

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-users <%= custom_class %>"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="9" cy="7" r="4"></circle><path d="M23 21v-2a4 4 0 0 0-3-3.87"></path><path d="M16 3.13a4 4 0 0 1 0 7.75"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-users"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="9" cy="7" r="4"></circle><path d="M23 21v-2a4 4 0 0 0-3-3.87"></path><path d="M16 3.13a4 4 0 0 1 0 7.75"></path></svg>

app/views/services/remotestorage/show.html.erb

@@ -14,9 +14,8 @@
     <p class="mb-6">
       In order to connect an app to your storage account, give it your address:
     </p>
-    <p data-controller="clipboard" class="flex gap-1 sm:w-2/5">
+    <p data-controller="clipboard" class="flex items-center gap-1 sm:w-2/5">
-      <img src="/img/logos/icon_remotestorage.svg"
+      <img src="/img/logos/icon_remotestorage.svg" class="inline-block h-6 w-6 mr-1">
-           class="inline-block h-6 w-6 mr-1 self-center">
       <input type="text" id="user_address" class="grow"
              value=<%= current_user.address %> disabled="disabled"
              data-clipboard-target="source" />

app/views/settings/_account.html.erb

@@ -1,6 +1,6 @@
 <%= tag.section data: {
       controller: "settings--account--email",
-      "settings--account--email-validation-failed-value": @validation_errors&.[](:email)&.present?
+      "settings--account--email-validation-failed-value": @validation_errors.present?
     } do %>
   <h3>E-Mail</h3>
   <%= form_for(@user, url: update_email_settings_path, method: "post") do |f| %>
@@ -23,7 +23,7 @@
         </span>
       </button>
     </p>
-    <% if @validation_errors&.[](:email)&.present? %>
+    <% if @validation_errors.present? && @validation_errors[:email].present? %>
       <p class="error-msg"><%= @validation_errors[:email].first %></p>
     <% end %>
     <div class="initial-hidden">
@@ -41,35 +41,10 @@
 <% end %>
 <section>
   <h3>Password</h3>
-  <p class="mb-6">Use the following button to request an email with a password reset link:</p>
+  <p class="mb-8">Use the following button to request an email with a password reset link:</p>
   <%= form_with(url: reset_password_settings_path, method: :post) do %>
     <p>
       <%= submit_tag("Send me a password reset link", class: 'btn-md btn-gray w-full sm:w-auto') %>
     </p>
   <% end %>
 </section>
-<%= form_for(@user, url: setting_path(:account), html: { :method => :put }) do |f| %>
-  <section class="!pt-8 sm:!pt-12">
-    <h3>OpenPGP</h3>
-    <ul role="list">
-      <% example_link = link_to "example", "https://kosmos.org/.well-known/openpgpkey/hu/yuca4ky39mhwkjo78qb8zjgbfj1hg3yf.txt?l=jimmy",
-          target: "_blank", class: "text-gray-500 underline" %>
-      <%= render FormElements::FieldsetComponent.new(
-            title: "Public key",
-            description: raw("Your OpenPGP public key in ASCII Armor format (#{example_link})")
-          ) do %>
-        <%= f.text_area :pgp_pubkey,
-          value: @user.pgp_pubkey,
-          class: "h-24 w-full" %>
-        <% if @validation_errors&.[](:pgp_pubkey)&.present? %>
-          <p class="error-msg">This <%= @validation_errors[:pgp_pubkey].first %></p>
-        <% end %>
-      <% end %>
-    </ul>
-  </section>
-  <section>
-    <p class="pt-6 border-t border-gray-200 text-right">
-      <%= f.submit 'Save', class: "btn-md btn-blue w-full md:w-auto" %>
-    </p>
-  </section>
-<% end %>

app/views/settings/_email.html.erb

@@ -5,7 +5,7 @@
   <h3>E-Mail Password</h3>
   <%= form_for(@user, url: reset_email_password_settings_path, method: "post") do |f| %>
     <%= hidden_field_tag :section, "email" %>
-    <p class="mb-6">
+    <p class="mb-8">
       Use the following button to generate a new email password:
     </p>
     <p class="hidden initial-visible">

app/views/settings/_profile.html.erb

@@ -20,7 +20,7 @@
       </button>
     </p>
     <p class="text-sm text-gray-500">
-      Your account's address on the Internet
+      Your user address for Chat and Lightning Network.
     </p>
   </div>
   <%= form_for(@user, url: setting_path(:profile), html: { :method => :put }) do |f| %>
@@ -31,19 +31,23 @@
       <% end %>
     <% end %>
 
+    <% if Flipper.enabled?(:avatar_upload, current_user) %>
     <label class="block">
-      <p class="font-bold mb-1">Avatar</p>
+      <p class="font-bold mb-1">
-      <p class="text-gray-500">Default profile picture</p>
+        Avatar
+      </p>
+      <p class="text-gray-500">
+        Default profile picture
+      </p>
       <div class="flex items-center gap-6">
-        <% if @user.avatar.attached? %>
+        <% if current_user.avatar.present? %>
-          <p class="flex-none">
+        <p class="flex-none">
-            <%= image_tag image_url_for(@user.avatar), class: "h-24 w-24 rounded-lg" %>
+          <%= image_tag "data:image/jpeg;base64,#{current_user.avatar}", class: "h-24 w-24 rounded-lg" %>
-          </p>
+        </p>
         <% end %>
         <div class="grow">
           <p class="mb-2">
-            <%= f.file_field :avatar_new, accept: "image/jpeg,image/png" %>
+          <%= f.file_field :avatar, class: "" %>
-          </p>
           <p class="text-sm text-gray-500">
             JPEG or PNG image, not larger than 1 megabyte
           </p>
@@ -53,6 +57,7 @@
         </div>
       </div>
     </label>
+    <% end %>
 
     <p class="mt-8 pt-6 border-t border-gray-200 text-right">
       <%= f.submit 'Save', class: "btn-md btn-blue w-full md:w-auto" %>

app/views/shared/_admin_sidenav_settings.html.erb

@@ -3,11 +3,7 @@
   active: current_page?(admin_settings_registrations_path)
 ) %>
 <%= render SidenavLinkComponent.new(
-  name: "Membership", path: admin_settings_membership_path, icon: "users",
+  name: "Services", path: admin_settings_services_path, icon: "grid",
-  active: current_page?(admin_settings_membership_path)
-) %>
-<%= render SidenavLinkComponent.new(
-  name: "Services", path: admin_settings_services_path, icon: "server",
   active: controller_name == "services"
 ) %>
 <% if controller_name == "services" %>

bin/jobs

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative "../config/environment"
-require "solid_queue/cli"
-
-SolidQueue::Cli.start(ARGV)

bin/rails

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path("../config/application", __dir__)
+begin
-require_relative "../config/boot"
+  load File.expand_path('../spring', __FILE__)
-require "rails/commands"
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'

bin/rake

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
-require_relative "../config/boot"
+begin
-require "rake"
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+require_relative '../config/boot'
+require 'rake'
 Rake.application.run

bin/rubocop

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-require "rubygems"
-require "bundler/setup"
-
-# explicit rubocop config increases performance slightly while avoiding config confusion.
-ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
-
-load Gem.bin_path("rubocop", "rubocop")

bin/setup

@@ -1,34 +1,36 @@
 #!/usr/bin/env ruby
-require "fileutils"
+require 'fileutils'
 
-APP_ROOT = File.expand_path("..", __dir__)
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*args)
-  system(*args, exception: true)
+  system(*args) || abort("\n== Command #{args} failed ==")
 end
 
 FileUtils.chdir APP_ROOT do
-  # This script is a way to set up or update your development environment automatically.
+  # This script is a way to setup or update your development environment automatically.
-  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
+  # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
   # Add necessary setup steps to this file.
 
-  puts "== Installing dependencies =="
+  puts '== Installing dependencies =='
-  system("bundle check") || system!("bundle install")
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies
+  # system('bin/yarn')
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
+  # unless File.exist?('config/database.yml')
-  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
+  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system! "bin/rails db:prepare"
+  system! 'bin/rails db:prepare'
 
   puts "\n== Removing old logs and tempfiles =="
-  system! "bin/rails log:clear tmp:clear"
+  system! 'bin/rails log:clear tmp:clear'
 
-  unless ARGV.include?("--skip-server")
+  puts "\n== Restarting application server =="
-    puts "\n== Starting development server =="
+  system! 'bin/rails restart'
-    STDOUT.flush # flush the output before exec(2) so that it displays
-    exec "bin/dev"
-  end
 end

config/application.rb

@@ -1,4 +1,4 @@
-require_relative "boot"
+require_relative 'boot'
 
 require "rails"
 # Pick the frameworks you want:
@@ -12,6 +12,7 @@ require "action_mailbox/engine"
 # require "action_text/engine"
 require "action_view/railtie"
 require "action_cable/engine"
+require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 
 # Require the gems listed in Gemfile, including any gems
@@ -21,20 +22,12 @@ Bundler.require(*Rails.groups)
 module Akkounts
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 8.0
+    config.load_defaults 7.0
 
-    # Please, add to the `ignore` list any other `lib` subdirectories that do
+    # Settings in config/environments/* take precedence over those specified here.
-    # not contain `.rb` files, or that should not be reloaded or eager loaded.
+    # Application configuration can go into files in config/initializers
-    # Common ones are `templates`, `generators`, or `middleware`, for example.
+    # -- all .rb files in that directory are automatically loaded after loading
-    config.autoload_lib(ignore: %w[assets tasks])
+    # the framework and any gems in your application.
-
-    # Configuration for the application, engines, and railties goes here.
-    #
-    # These settings can be overridden in specific environments using the files
-    # in config/environments, which are processed later.
-    #
-    # config.time_zone = "Central Time (US & Canada)"
-    # config.eager_load_paths << Rails.root.join("extras")
 
     # Don't generate system test files.
     config.generators.system_tests = nil
@@ -47,15 +40,7 @@ module Akkounts
       g.stylesheets         false
     end
 
-    config.active_job.queue_adapter = :solid_queue
+    config.active_job.queue_adapter = :sidekiq
-    config.mission_control.jobs.http_basic_auth_enabled = false
-
     config.action_mailer.deliver_later_queue_name = nil # use "default" queue
-
-    # The default includes webp, which requires webp support everywhere
-    config.active_storage.web_image_content_types = %w[image/png image/jpeg image/gif]
-
-    config.active_record.encryption.primary_key = ENV["ENCRYPTION_PRIMARY_KEY"]
-    config.active_record.encryption.key_derivation_salt = ENV["ENCRYPTION_KEY_DERIVATION_SALT"]
   end
 end

config/credentials.yml.enc

@@ -0,0 +1 @@
+tmI5vm7qZhaigr52jEBVWkRdj+EE+9OmPh3vWXC7kA/OHuuucpr7SodychuMkQDPLM0BLk88LFsqvRIR+mqnLWpRC+P9aeUFE6ohxSWzcAd7Y4sgxUD8zpCRPndrwTw0hxXXj1WZSYeWn4BoAB34aV+gYen2MajZF3a95hJGtS5yjgWxvLVkQQKqRDfykkfX6fCS0BPo5X7sT7m4xwCATD/D4219wajm5W3TIdkriHtwt28ZLspaRWA5e0UkzKf8+/Gaj2CrW7UWcvew8R93zQ5RA2/Sp3sDTVN+kLz9I9Q095lQC0ywCAEFYHeKmc2tjrzqRaAAWu06xmWLqGIg21G+A/UU9lUJOkIpxQACWoOfS2IoXR1nXhgXMopkz3aCBXDxKw554v4H2QyOceOsuRf2C685ibMqzQkKMmJ4tcbiOJL77DUc08JTjB8Dq4Ohr8sMzXbV/hATevjYoRP0XarLekqhLv90ZLuIVY16DwB0CzACeNBKeKbeLqJF51upRRWgi+gTbYpV04yUwnXdyssF8mydWocgihrTryBi8F6PsuhBGcaYdP+0yibnGxDCC4x2rupbBfMj2OIX7pYzgtIHB3Eo954Y+bCoggqbE/Qrb9VVXNMgtKgLt8EGWU2tg6wl9QicitIq87uLDAade93zTn6rmcKPywjMDo6jbVIs653ZdUhiKdHGdpnJccbgQ/iLSPB1umNnCeaEX5jM+K9zBvl7ZMCdSk1YIQ==--ekKumqLiSlVJNwMe--K/ecXmmMT1x+WnIXMbHBDw==

config/credentials/test.key

@@ -0,0 +1 @@
+6b101c9addbfa5f959b5859f756bc9d7

config/credentials/test.yml.enc

@@ -0,0 +1 @@
+vqH5By5qFLImVjdlWj+7FwGg8APKnr/AEd7WqekG7L0vNA32WGBpwS1uGzs02LIcATRwGj8DyJxiBOB/w9z8cwoO+t6Woi5hAnOSCQwFWKLT0dZq7jgtT8pxK0Yu/Nf91PEFN1rc/8ZFy2KKVpbtMbMPyivT38e/ctBZD/lHrWkndvLXYvFVhqWjUnDOGbhwl/U0RZgqBBjvlm3B0JkQfiN8VXPlCJL2Cd8kd0+MpRCRTgtcxA==--OdVXnDP7OhzJxCsP--+8SI6IFIeXyDxXb+WpqhIQ==

config/database.yml

@@ -1,37 +1,21 @@
 default: &default
-  adapter: <%= ENV["DB_ADAPTER"] || "sqlite3" %>
+  adapter: sqlite3
   pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %>
   timeout: 5000
-<% if ENV["DB_ADAPTER"] == "postgresql" %>
-  host: <%= ENV["PG_HOST"] || 'localhost' %>
-  port: <%= ENV["PG_PORT"] || 5432 %>
-  username: <%= ENV["PG_USERNAME"] || 'akkounts' %>
-  password: <%= ENV["PG_PASSWORD"] %>
-<% end %>
-
-<% if ENV["LNDHUB_PG_HOST"].present? %>
-lndhub: &lndhub
-  adapter: postgresql
-  database_tasks: false
-  host: <%= ENV["LNDHUB_PG_HOST"] %>
-  port: <%= ENV["LNDHUB_PG_PORT"] || 5432 %>
-  database: <%= ENV["LNDHUB_PG_DATABASE"] || 'lndhub' %>
-  username: <%= ENV["LNDHUB_PG_USERNAME"] || 'lndhub' %>
-  password: <%= ENV["LNDHUB_PG_PASSWORD"] %>
-<% end %>
 
 development:
   primary:
     <<: *default
-    database: <%= ENV["DB_ADAPTER"] == "postgresql" ? ENV["PG_DATABASE"] : "db/development.sqlite3" %>
+    database: db/development.sqlite3
-  queue:
-    <<: *default
-    database: <%= ENV["DB_ADAPTER"] == "postgresql" ? ENV["PG_DATABASE_QUEUE"] : "db/development_queue.sqlite3" %>
-    migrations_paths: db/queue_migrate
-<% if ENV["LNDHUB_PG_HOST"].present? %>
   lndhub:
-    <<: *lndhub
+    <<: *default
-<% end %>
+    adapter: postgresql
+    database_tasks: false
+    host: <%= ENV["LNDHUB_PG_HOST"] || 'localhost' %>
+    port: <%= ENV["LNDHUB_PG_PORT"] || 5432 %>
+    database: <%= ENV["LNDHUB_PG_DATABASE"] || 'lndhub' %>
+    username: <%= ENV["LNDHUB_PG_USERNAME"] || 'lndhub' %>
+    password: <%= ENV["LNDHUB_PG_PASSWORD"] %>
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -48,12 +32,18 @@ test:
 production:
   primary:
     <<: *default
-    database: <%= ENV["DB_ADAPTER"] == "postgresql" ? ENV["PG_DATABASE"] : "db/production.sqlite3" %>
+    adapter: postgresql
-  queue:
+    database: akkounts
-    <<: *default
+    port: 5432
-    database: <%= ENV["DB_ADAPTER"] == "postgresql" ? ENV["PG_DATABASE_QUEUE"] : "db/production_queue.sqlite3" %>
+    host: <%= Rails.application.credentials.postgres[:host] rescue nil %>
-    migrations_paths: db/queue_migrate
+    username: <%= Rails.application.credentials.postgres[:username] rescue nil %>
-<% if ENV["LNDHUB_PG_HOST"].present? %>
+    password: <%= Rails.application.credentials.postgres[:password] rescue nil %>
   lndhub:
-    <<: *lndhub
+    <<: *default
-<% end %>
+    adapter: postgresql
+    database_tasks: false
+    host: <%= ENV["LNDHUB_PG_HOST"] || 'localhost' %>
+    port: <%= ENV["LNDHUB_PG_PORT"] || 5432 %>
+    database: <%= ENV["LNDHUB_PG_DATABASE"] || 'lndhub' %>
+    username: <%= ENV["LNDHUB_PG_USERNAME"] || 'lndhub' %>
+    password: <%= ENV["LNDHUB_PG_PASSWORD"] %>

config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require_relative "application"
+require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!