Add missing dash for no member status

.drone.yml

@@ -0,0 +1,61 @@
+---
+kind: pipeline
+type: docker
+name: CI build
+
+steps:
+  - name: restore-cache
+    image: drillster/drone-volume-cache
+    volumes:
+    - name: cache
+      path: /cache
+    settings:
+      restore: true
+      mount:
+      - ./vendor/cache
+    when:
+      branch:
+        - master
+  - name: rspec
+    image: gitea.kosmos.org/kosmos/akkounts-ci:0.9.1
+    environment:
+      RAILS_ENV: test
+      REDIS_URL: redis://redis:6379/0
+      RS_REDIS_URL: redis://redis:6379/1
+    commands:
+      - bundle config unset deployment
+      - bundle config set cache_all 'true'
+      - bundle config set cache_path 'vendor/cache'
+      - bundle config set with 'development test'
+      - bundle install --jobs=3 --retry=3
+      - bundle exec rails db:create
+      - bundle exec rails db:migrate
+      - yarn install
+      - rake css:build
+      - bundle exec rspec
+  - name: rebuild-cache
+    image: drillster/drone-volume-cache
+    volumes:
+    - name: cache
+      path: /cache
+    settings:
+      rebuild: true
+      mount:
+      - ./vendor/cache
+    when:
+      branch:
+        - master
+
+services:
+  - name: redis
+    image: redis
+
+volumes:
+  - name: cache
+    host:
+      path: /var/lib/drone/tmp
+---
+kind: signature
+hmac: f9a8cf97f6596625721365f6238f6f298aa5a7a4de10c3fb61c57202ae9d1ee1
+
+...

.env.example

@@ -87,7 +87,6 @@
 # NOSTR_PRIVATE_KEY='123456abcdef...'
 # NOSTR_PUBLIC_KEY='123456abcdef...'
 # NOSTR_RELAY_URL='wss://nostr.kosmos.org'
-# NOSTR_BLOSSOM_SERVER_URL='https://blossom.kosmos.org'
 
 # RS_STORAGE_URL='https://storage.kosmos.org'
 # RS_REDIS_URL='redis://localhost:6379/2'

.gitea/workflows/ci.yml

@@ -1,59 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-
-jobs:
-  test:
-    name: Test
-    runs-on: ubuntu-latest
-    container: gitea.kosmos.org/kosmos/akkounts-ci:0.11.1
-    services:
-      redis:
-        image: redis
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      RAILS_ENV: test
-      REDIS_URL: redis://redis:6379/0
-      RS_REDIS_URL: redis://redis:6379/1
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Restore bundle cache
-        uses: actions/cache@v4
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-ruby-3.3.12-${{ hashFiles('Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-ruby-3.3.12-
-
-      - name: Install Ruby dependencies
-        run: |
-          bundle config unset deployment
-          bundle config set cache_all 'true'
-          bundle config set cache_path 'vendor/cache'
-          bundle config set path 'vendor/bundle'
-          bundle config set with 'development test'
-          bundle install --jobs=3 --retry=3
-
-      - name: Prepare database
-        run: |
-          bundle exec rails db:create
-          bundle exec rails db:migrate
-
-      - name: Install JS dependencies
-        run: bun install
-
-      - name: Build CSS
-        run: |
-          bundle exec rake css:build
-          test -s app/assets/builds/application.css
-
-      - name: Run tests
-        run: bundle exec rspec

.gitea/workflows/release_drafter.yml

@@ -9,5 +9,3 @@ jobs:
     steps:
       - name: Release Drafter
         uses: https://github.com/raucao/gitea-release-drafter@dev
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -34,6 +34,10 @@
 /public/packs
 /public/packs-test
 /node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
+bun.lock
 
 # Ignore local dotenv config file
 .env

.ruby-version

@@ -1 +1 @@
-3.3.12
+3.3.0

AGENTS.md

@@ -1,73 +0,0 @@
-# AGENTS.md
-
-Akkounts is a Rails 8 monolith for managing Kosmos/LDAP user accounts.
-It authenticates against an LDAP directory via Devise and integrates with
-ejabberd, Discourse, Mastodon, remoteStorage, Nostr, LNDHub, and BTCPay.
-
-## Development environment
-
-Development runs in Docker Compose — run all commands against the `web` container.
-Start services: `docker compose up` (web, ldap, redis, minio, liquor-cabinet, strfry).
-The `web` service runs `bin/dev` (foreman: Puma + Tailwind CSS watcher) and embeds
-Solid Queue workers (`SOLID_QUEUE_IN_PUMA=true`).
-
-First-time LDAP setup (after creating the 389ds backend once):
-`docker compose exec ldap dsconf localhost backend create --suffix="dc=kosmos,dc=org" --be_name="dev"`
-then `docker compose run web bin/rails ldap:setup`.
-
-## Common commands (prefix with `docker compose exec web`)
-
-- `bin/rspec` — run the test suite (CI runs `bundle exec rspec`)
-- `bin/rails db:prepare` — create/migrate DB (also `db:setup`, `db:migrate`)
-- `bin/rails ldap:setup` — reset LDAP dir and seed dev entries
-- `bin/rails css:build` — build Tailwind CSS (auto-watched in dev)
-- `bin/rails lndhub:generate_wallets`, `invitations:generate_for_all_users[N]`
-- `bin/jobs` — Solid Queue CLI
-
-Tests use the test env explicitly: `docker compose exec -e RAILS_ENV=test web bin/rspec`.
-There is no enforced linter — a `bin/rubocop` binstub exists but no `.rubocop.yml`
-(rubocop is a transitive gem, not in the Gemfile); CI does not lint.
-
-## Stack & conventions
-
-- **Assets/views:** ERB + ViewComponent (`app/components/`), Tailwind built via Bun +
-  importmap (`config/importmap.rb`); pin JS deps with `bin/importmap pin <pkg> --download`.
-- **Auth:** Devise + `devise_ldap_authenticatable`; `authentication_keys = [:cn]`,
-  custom SSHA512 password builder, admin bind. Admin-only mounts (`/jobs` MissionControl,
-  `/flipper` Flipper UI) are gated by `authenticate :user, ->(u) { u.is_admin? }`.
-- **Services:** `app/services/` uses `ApplicationService.call(**args)` with namespaced
-  `*ManagerService` bases (e.g. `UserManagerService`) and verb-named operations
-  (`UserManager::CreateAccount`, `NostrManager::PublishEvent`, `BtcpayManager::*`).
-- **Models:** `User` is central; `Setting` uses rails-settings-cached with one concern per
-  service in `app/models/concerns/settings/`. LNDHub models connect to a separate DB
-  (`LndhubBase` `establish_connection :lndhub`). LDAP is accessed via `LdapService`/
-  `LdapManagerService`, not ActiveRecord.
-- **Jobs:** `app/jobs/` inherit `ApplicationJob < ActiveJob::Base`; backend is **Solid Queue**
-  (`config.active_job.queue_adapter = :solid_queue`, separate `queue` DB in prod).
-  `config/recurring.yml` has no active scheduled jobs. Ignore `config/sidekiq.yml` — it's
-  stale (sidekiq is not in the Gemfile; the README mention is outdated).
-- **Config:** env-var driven (`.env.example`/`.env.development`/`.env.test`); `SERVICES`
-  constant is loaded from `config/services.yml` in `config/initializers/service_details.rb`.
-  Custom LDAP schema attributes are applied from `schemas/ldap/*.ldif` by `lib/tasks/ldap.rake`.
-
-## Testing conventions (`spec/`)
-
-`spec/rails_helper.rb` includes FactoryBot, Devise `ControllerHelpers` (controller specs),
-Warden `Test::Helpers`, DatabaseCleaner (transactional fixtures **off**), ViewComponent
-`TestHelpers` + Capybara matchers, and `ActiveJob::TestHelper` for `type: :job`.
-
-- **Feature specs** (`spec/features/`, `type: :feature`): Capybara **rack-test** driver (no JS).
-  Log in with Warden: `login_as user, scope: :user`; stub admin with
-  `allow(Devise::LDAP::Adapter).to receive(:get_ldap_param).with(user.cn, :admin).and_return(["true"])`.
-- **Services** (`spec/services/`) are tagged `type: :model`; exercise `#call`/`service.send(:private)`
-  and assert on DB rows / `enqueued_jobs`.
-- **Request/component/mailer/job/model/helper** specs in matching `spec/` subdirs.
-  Fixtures live in `spec/fixtures/`; factories in `spec/factories/`.
-
-## Notes & gotchas
-
-- Generators (`config/application.rb`): ERB templates, RSpec, no stylesheets, factory_bot
-  with `_factory` suffix dir `spec/factories`.
-- `gitno/` and `extras/strfry/` are scratch/infra (Deno Nostr relay policies) — not app code; ignore.
-- Don't add code comments unless asked (matches repo style); `frozen_string_literal` is inconsistent.
-- Default dev login: username `admin` / password `admin is admin`.

Dockerfile

@@ -1,21 +1,22 @@
 # syntax=docker/dockerfile:1
-FROM ruby:3.3.12
+FROM ruby:3.3.4
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-RUN apt-get update -qq && apt-get install -y --no-install-recommends curl unzip \
+RUN apt-get update -qq && apt-get install -y --no-install-recommends curl \
       ldap-utils tini libvips
 
-RUN curl -fsSL https://bun.sh/install | bash -s -- bun-v1.3.14
-ENV PATH="/root/.bun/bin:$PATH"
+RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
+RUN apt-get update && apt-get install -y nodejs
 
 WORKDIR /akkounts
 
-COPY ["Gemfile", "Gemfile.lock", "package.json", "bun.lock", "./"]
+COPY ["Gemfile", "Gemfile.lock", "package.json", "./"]
 
 RUN bundle install
 RUN gem install foreman
-RUN bun install
+RUN npm install -g yarn
+RUN yarn install
 
 ENTRYPOINT ["/usr/bin/tini", "--"]
 EXPOSE 3000

Gemfile

@@ -2,9 +2,9 @@ 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.1'
+gem 'rails', '~> 8.0'
 # Use Puma as the app server
-gem 'puma', '~> 8.0'
+gem 'puma', '~> 6.6'
 # View components
 gem "view_component"
 # Asset bundler
@@ -18,7 +18,7 @@ gem "turbo-rails"
 # Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
 gem "stimulus-rails"
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.15'
+gem 'jbuilder', '~> 2.7'
 # Use Active Model has_secure_password
 gem 'bcrypt', '~> 3.1'
 
@@ -27,7 +27,7 @@ gem 'dotenv-rails'
 
 # Authentication
 gem 'warden'
-gem 'devise', '~> 5.0'
+gem 'devise', '~> 4.9.0'
 gem 'devise_ldap_authenticatable'
 gem 'net-ldap'
 
@@ -42,7 +42,6 @@ gem 'flipper-active_record'
 gem 'flipper-ui'
 gem 'gpgme', '~> 2.0.24'
 gem 'zbase32', '~> 0.1.1'
-gem 'kramdown'
 
 # HTTP requests
 gem 'faraday'
@@ -73,7 +72,7 @@ end
 
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  gem 'web-console', '~> 4.3'
+  gem 'web-console', '~> 4.2'
   gem 'listen', '~> 3.2'
   gem 'letter_opener'
   gem 'letter_opener_web'

Gemfile.lock

@@ -3,31 +3,29 @@ GEM
   specs:
     aasm (5.5.0)
       concurrent-ruby (~> 1.0)
-    action_text-trix (2.1.19)
-      railties
-    actioncable (8.1.3.1)
-      actionpack (= 8.1.3.1)
-      activesupport (= 8.1.3.1)
+    actioncable (8.0.2)
+      actionpack (= 8.0.2)
+      activesupport (= 8.0.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.1.3.1)
-      actionpack (= 8.1.3.1)
-      activejob (= 8.1.3.1)
-      activerecord (= 8.1.3.1)
-      activestorage (= 8.1.3.1)
-      activesupport (= 8.1.3.1)
+    actionmailbox (8.0.2)
+      actionpack (= 8.0.2)
+      activejob (= 8.0.2)
+      activerecord (= 8.0.2)
+      activestorage (= 8.0.2)
+      activesupport (= 8.0.2)
       mail (>= 2.8.0)
-    actionmailer (8.1.3.1)
-      actionpack (= 8.1.3.1)
-      actionview (= 8.1.3.1)
-      activejob (= 8.1.3.1)
-      activesupport (= 8.1.3.1)
+    actionmailer (8.0.2)
+      actionpack (= 8.0.2)
+      actionview (= 8.0.2)
+      activejob (= 8.0.2)
+      activesupport (= 8.0.2)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.1.3.1)
-      actionview (= 8.1.3.1)
-      activesupport (= 8.1.3.1)
+    actionpack (8.0.2)
+      actionview (= 8.0.2)
+      activesupport (= 8.0.2)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -35,43 +33,42 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (8.1.3.1)
-      action_text-trix (~> 2.1.15)
-      actionpack (= 8.1.3.1)
-      activerecord (= 8.1.3.1)
-      activestorage (= 8.1.3.1)
-      activesupport (= 8.1.3.1)
+    actiontext (8.0.2)
+      actionpack (= 8.0.2)
+      activerecord (= 8.0.2)
+      activestorage (= 8.0.2)
+      activesupport (= 8.0.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.1.3.1)
-      activesupport (= 8.1.3.1)
+    actionview (8.0.2)
+      activesupport (= 8.0.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (8.1.3.1)
-      activesupport (= 8.1.3.1)
+    activejob (8.0.2)
+      activesupport (= 8.0.2)
       globalid (>= 0.3.6)
-    activemodel (8.1.3.1)
-      activesupport (= 8.1.3.1)
-    activerecord (8.1.3.1)
-      activemodel (= 8.1.3.1)
-      activesupport (= 8.1.3.1)
+    activemodel (8.0.2)
+      activesupport (= 8.0.2)
+    activerecord (8.0.2)
+      activemodel (= 8.0.2)
+      activesupport (= 8.0.2)
       timeout (>= 0.4.0)
-    activestorage (8.1.3.1)
-      actionpack (= 8.1.3.1)
-      activejob (= 8.1.3.1)
-      activerecord (= 8.1.3.1)
-      activesupport (= 8.1.3.1)
+    activestorage (8.0.2)
+      actionpack (= 8.0.2)
+      activejob (= 8.0.2)
+      activerecord (= 8.0.2)
+      activesupport (= 8.0.2)
       marcel (~> 1.0)
-    activesupport (8.1.3.1)
+    activesupport (8.0.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
-      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
@@ -99,12 +96,12 @@ GEM
     aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     backport (1.2.0)
-    base64 (0.3.0)
-    bcrypt (3.1.22)
+    base64 (0.2.0)
+    bcrypt (3.1.20)
     bech32 (1.5.0)
       thor (>= 1.1.0)
-    benchmark (0.5.0)
-    bigdecimal (4.1.2)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
     bip-schnorr (0.7.0)
       ecdsa_ext (~> 0.5.0)
@@ -121,12 +118,12 @@ GEM
     childprocess (5.1.0)
       logger (~> 1.5)
     chunky_png (1.4.0)
-    concurrent-ruby (1.3.8)
-    connection_pool (3.0.2)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.5.2)
     crack (1.0.0)
       bigdecimal
       rexml
-    crass (1.0.7)
+    crass (1.0.6)
     cssbundling-rails (1.4.3)
       railties (>= 6.0.0)
     database_cleaner (2.1.0)
@@ -135,17 +132,17 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.5.1)
-    devise (5.0.4)
+    date (3.4.1)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 7.0)
+      railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
     devise_ldap_authenticatable (0.8.7)
       devise (>= 3.4.1)
       net-ldap (>= 0.16.0)
-    diff-lcs (1.6.2)
+    diff-lcs (1.6.1)
     discourse_api (2.0.1)
       faraday (~> 2.7)
       faraday-follow_redirects
@@ -157,13 +154,12 @@ GEM
       railties (>= 6.1)
     down (5.4.2)
       addressable (~> 2.8)
-    drb (2.2.3)
+    drb (2.2.1)
     ecdsa (1.2.0)
     ecdsa_ext (0.5.1)
       ecdsa (~> 1.2.0)
-    erb (6.0.7)
     erubi (1.13.1)
-    et-orbi (1.4.1)
+    et-orbi (1.2.11)
       tzinfo
     event_emitter (0.2.6)
     eventmachine (1.2.7)
@@ -200,35 +196,34 @@ GEM
       rack-protection (>= 1.5.3, < 5.0.0)
       rack-session (>= 1.0.2, < 3.0.0)
       sanitize (< 8)
-    fugit (1.13.0)
-      et-orbi (~> 1.4)
+    fugit (1.11.1)
+      et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
-    globalid (1.4.0)
+    globalid (1.2.1)
       activesupport (>= 6.1)
     gpgme (2.0.24)
       mini_portile2 (~> 2.7)
     hashdiff (1.1.2)
-    i18n (1.15.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.2.3)
+    importmap-rails (2.1.0)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
-    io-console (0.9.2)
-    irb (1.18.0)
+    io-console (0.8.0)
+    irb (1.15.2)
       pp (>= 0.6.0)
-      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jaro_winkler (1.6.0)
-    jbuilder (2.15.1)
-      actionview (>= 7.0.0)
-      activesupport (>= 7.0.0)
+    jbuilder (2.13.0)
+      actionview (>= 5.0.0)
+      activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    json (2.21.2)
+    json (2.11.3)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
@@ -252,11 +247,10 @@ GEM
     lnurl (1.1.1)
       bech32 (~> 1.1)
     logger (1.7.0)
-    loofah (2.25.2)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.9.1)
-      logger
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -265,15 +259,14 @@ GEM
       faraday (~> 2.9.0)
       faraday-follow_redirects (= 0.3.0)
       nokogiri (~> 1.16.0)
-    marcel (1.2.1)
+    marcel (1.0.4)
     matrix (0.4.2)
+    method_source (1.1.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.9)
-    minitest (6.0.6)
-      drb (~> 2.0)
-      prism (~> 1.5)
-    mission_control-jobs (1.1.0)
+    mini_portile2 (2.8.8)
+    minitest (5.25.5)
+    mission_control-jobs (1.0.2)
       actioncable (>= 7.1)
       actionpack (>= 7.1)
       activejob (>= 7.1)
@@ -286,7 +279,7 @@ GEM
     multipart-post (2.4.1)
     net-http (0.6.0)
       uri
-    net-imap (0.6.6)
+    net-imap (0.5.7)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -296,7 +289,7 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.5)
+    nio4r (2.7.4)
     nokogiri (1.16.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -320,23 +313,24 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.9)
-    pp (0.6.4)
+    pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.9.0)
-    propshaft (1.3.2)
+    prism (1.4.0)
+    propshaft (1.1.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
-    psych (5.4.0)
+      railties (>= 7.0.0)
+    psych (5.2.3)
       date
       stringio
     public_suffix (6.0.1)
-    puma (8.0.2)
+    puma (6.6.0)
       nio4r (~> 2.0)
-    raabro (1.5.0)
+    raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.23)
+    rack (2.2.13)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
@@ -347,64 +341,61 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (8.1.3.1)
-      actioncable (= 8.1.3.1)
-      actionmailbox (= 8.1.3.1)
-      actionmailer (= 8.1.3.1)
-      actionpack (= 8.1.3.1)
-      actiontext (= 8.1.3.1)
-      actionview (= 8.1.3.1)
-      activejob (= 8.1.3.1)
-      activemodel (= 8.1.3.1)
-      activerecord (= 8.1.3.1)
-      activestorage (= 8.1.3.1)
-      activesupport (= 8.1.3.1)
+    rails (8.0.2)
+      actioncable (= 8.0.2)
+      actionmailbox (= 8.0.2)
+      actionmailer (= 8.0.2)
+      actionpack (= 8.0.2)
+      actiontext (= 8.0.2)
+      actionview (= 8.0.2)
+      activejob (= 8.0.2)
+      activemodel (= 8.0.2)
+      activerecord (= 8.0.2)
+      activestorage (= 8.0.2)
+      activesupport (= 8.0.2)
       bundler (>= 1.15.0)
-      railties (= 8.1.3.1)
+      railties (= 8.0.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.3.0)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.7.1)
-      loofah (~> 2.25, >= 2.25.2)
+    rails-html-sanitizer (1.6.2)
+      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)
     rails-settings-cached (2.8.3)
       activerecord (>= 5.0.0)
       railties (>= 5.0.0)
-    railties (8.1.3.1)
-      actionpack (= 8.1.3.1)
-      activesupport (= 8.1.3.1)
+    railties (8.0.2)
+      actionpack (= 8.0.2)
+      activesupport (= 8.0.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
-      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.4.2)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rbs (3.9.2)
       logger
-    rdoc (7.2.0)
-      erb
+    rdoc (6.13.1)
       psych (>= 4.0.0)
-      tsort
     redis (5.4.0)
       redis-client (>= 0.22.0)
     redis-client (0.24.0)
       connection_pool
     regexp_parser (2.10.0)
-    reline (0.7.0)
+    reline (0.6.1)
       io-console (~> 0.5)
-    responders (3.2.0)
-      actionpack (>= 7.0)
-      railties (>= 7.0)
+    responders (3.1.1)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
     reverse_markdown (3.0.0)
       nokogiri
     rexml (3.4.1)
@@ -412,23 +403,23 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec-core (3.13.6)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.8)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.4)
-      actionpack (>= 7.2)
-      activesupport (>= 7.2)
-      railties (>= 7.2)
-      rspec-core (>= 3.13.0, < 5.0.0)
-      rspec-expectations (>= 3.13.0, < 5.0.0)
-      rspec-mocks (>= 3.13.0, < 5.0.0)
-      rspec-support (>= 3.13.0, < 5.0.0)
-    rspec-support (3.13.7)
+    rspec-rails (7.1.1)
+      actionpack (>= 7.0)
+      activesupport (>= 7.0)
+      railties (>= 7.0)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.2)
     rubocop (1.75.3)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
@@ -476,25 +467,24 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
       yard-solargraph (~> 0.1)
-    solid_queue (1.6.0)
+    solid_queue (1.1.5)
       activejob (>= 7.1)
       activerecord (>= 7.1)
       concurrent-ruby (>= 1.3.1)
-      fugit (~> 1.11)
+      fugit (~> 1.11.0)
       railties (>= 7.1)
-      thor (>= 1.3.1)
+      thor (~> 1.3.1)
     sqlite3 (2.6.0)
       mini_portile2 (~> 2.8.0)
     sqlite3 (2.6.0-arm64-darwin)
     sqlite3 (2.6.0-x86_64-linux-gnu)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
-    stringio (3.2.0)
-    thor (1.5.0)
+    stringio (3.1.7)
+    thor (1.3.2)
     tilt (2.6.0)
-    timeout (0.6.1)
-    tsort (0.2.0)
-    turbo-rails (2.0.23)
+    timeout (0.4.3)
+    turbo-rails (2.0.13)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
     tzinfo (2.0.6)
@@ -502,24 +492,25 @@ GEM
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    uri (1.1.1)
+    uri (1.0.3)
     useragent (0.16.11)
-    view_component (4.12.0)
-      actionview (>= 7.1.0)
-      activesupport (>= 7.1.0)
-      concurrent-ruby (~> 1)
+    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)
-    web-console (4.3.0)
-      actionview (>= 8.0.0)
+    web-console (4.2.1)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
-      railties (>= 8.0.0)
+      railties (>= 6.0.0)
     webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.2)
-    websocket-driver (0.8.2)
+    webrick (1.9.1)
+    websocket-driver (0.7.7)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -529,7 +520,7 @@ GEM
     yard-solargraph (0.1.0)
       yard (~> 0.9)
     zbase32 (0.1.1)
-    zeitwerk (2.8.3)
+    zeitwerk (2.7.2)
 
 PLATFORMS
   arm64-darwin-22
@@ -543,7 +534,7 @@ DEPENDENCIES
   capybara
   cssbundling-rails
   database_cleaner
-  devise (~> 5.0)
+  devise (~> 4.9.0)
   devise_ldap_authenticatable
   discourse_api
   dotenv-rails
@@ -557,8 +548,7 @@ DEPENDENCIES
   gpgme (~> 2.0.24)
   image_processing (~> 1.12.2)
   importmap-rails
-  jbuilder (~> 2.15)
-  kramdown
+  jbuilder (~> 2.7)
   letter_opener
   letter_opener_web
   listen (~> 3.2)
@@ -570,8 +560,8 @@ DEPENDENCIES
   pagy (~> 6.0, >= 6.0.2)
   pg (~> 1.5)
   propshaft
-  puma (~> 8.0)
-  rails (~> 8.1)
+  puma (~> 6.6)
+  rails (~> 8.0)
   rails-controller-testing
   rails-settings-cached (~> 2.8.3)
   redis (~> 5.4)
@@ -587,7 +577,7 @@ DEPENDENCIES
   tzinfo-data
   view_component
   warden
-  web-console (~> 4.3)
+  web-console (~> 4.2)
   webmock
   zbase32 (~> 0.1.1)
 

Procfile.dev

@@ -1,2 +1,2 @@
 web: bin/rails server -b 0.0.0.0 -p 3000
-css: bun run build:css:tailwind --watch
+css: yarn build:css --watch

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://gitea.kosmos.org/kosmos/akkounts/actions/workflows/ci.yml/badge.svg)](https://gitea.kosmos.org/kosmos/akkounts/actions)
+[![Build Status](https://drone.kosmos.org/api/badges/kosmos/akkounts/status.svg)](https://drone.kosmos.org/kosmos/akkounts)
 
 # Akkounts
 
@@ -36,7 +36,7 @@ run web`._
 Installing dependencies:
 
     bundle install
-    bun install
+    yarn install
 
 Migrating the local database (after schema changes):
 

app/assets/stylesheets/application.tailwind.css

@@ -7,7 +7,7 @@
 @import "components/buttons";
 @import "components/dashboard_services";
 @import "components/forms";
+@import "components/links";
 @import "components/notifications";
 @import "components/pagination";
-@import "components/rich_text";
 @import "components/tables";

app/assets/stylesheets/components/base.css

@@ -6,7 +6,6 @@
   body {
     @apply leading-none bg-cover bg-fixed;
     background-image: linear-gradient(35deg, rgba(255,0,255,0.2) 0, rgba(13,79,153,0.8) 100%), url('/img/bg-1.jpg');
-    color: black;
   }
 
   body#admin {
@@ -33,10 +32,6 @@
     @apply pt-8 sm:pt-12;
   }
 
-  main section h3:not(:first-child) {
-    @apply mt-8;
-  }
-
   main section:first-of-type {
     @apply pt-0;
   }
@@ -60,11 +55,4 @@
   main ul li {
     @apply leading-6;
   }
-
-  main a:not(nav > *) {
-    @apply text-blue-600;
-    &:hover   { @apply underline; }
-    &:visited { @apply text-indigo-600; }
-    &:active  { @apply text-red-600; }
-  }
 }

app/assets/stylesheets/components/buttons.css

@@ -1,15 +1,5 @@
 @layer components {
-  .btn-text-dark          { @apply text-black; }
-  .btn-text-dark:hover    { @apply text-black no-underline; }
-  .btn-text-dark:visited  { @apply text-black; }
-  .btn-text-dark:active   { @apply text-black; }
-  .btn-text-light         { @apply text-white; }
-  .btn-text-light:hover   { @apply text-white no-underline; }
-  .btn-text-light:visited { @apply text-white; }
-  .btn-text-light:active  { @apply text-white; }
-
   .btn {
-    @apply btn-text-dark;
     @apply inline-block font-semibold rounded-md leading-none cursor-pointer text-center
            transition-colors duration-75 focus:outline-none focus:ring-4;
   }
@@ -38,20 +28,17 @@
   }
 
   .btn-blue {
-    @apply btn-text-light;
-    @apply bg-blue-500 hover:bg-blue-600
+    @apply bg-blue-500 hover:bg-blue-600 text-white
            focus:ring-blue-400 focus:ring-opacity-75;
   }
 
   .btn-emerald {
-    @apply btn-text-light;
-    @apply bg-emerald-500 hover:bg-emerald-600
+    @apply bg-emerald-500 hover:bg-emerald-600 text-white
            focus:ring-emerald-400 focus:ring-opacity-75;
   }
 
   .btn-red {
-    @apply btn-text-light;
-    @apply bg-red-600 hover:bg-red-700
+    @apply bg-red-600 hover:bg-red-700 text-white
            focus:ring-red-500 focus:ring-opacity-75;
   }
 

app/assets/stylesheets/components/links.css

@@ -0,0 +1,8 @@
+@layer components {
+  .ks-text-link {
+    @apply text-blue-600;
+    &:hover   { @apply underline; }
+    &:visited { @apply text-indigo-600; }
+    &:active  { @apply text-red-600; }
+  }
+}

app/assets/stylesheets/components/pagination.css

@@ -34,7 +34,7 @@
   .pagy-nav .page a, .page.gap {
     @apply bg-white border-gray-300 text-gray-500 hover:bg-gray-100 relative
            inline-flex items-center border px-4 py-2 text-sm font-medium
-           no-underline focus:z-20;
+           focus:z-20;
   }
 
   .pagy-nav .page.active {

app/assets/stylesheets/components/rich_text.css

@@ -1,30 +0,0 @@
-@layer base {
-  main {
-    .rich-text {
-      ul {
-        @apply list-disc list-inside;
-
-        li {
-          @apply my-2;
-        }
-      }
-
-      ol {
-        @apply list-decimal list-inside;
-
-        li {
-          @apply my-2;
-        }
-      }
-
-      li > ul,
-      li > ol {
-        @apply ps-6 my-1;
-      }
-
-      hr {
-        @apply my-8;
-      }
-    }
-  }
-}

app/components/edit_content_button_component.html.erb

@@ -1,30 +0,0 @@
-<div class="inline-block text-left" data-controller="modal" data-action="keydown.esc->modal#close">
-  <button class="btn-md btn-outline text-red-600" data-action="click->modal#open" title="Edit">
-    <%= content || "Edit" %>
-  </button>
-
-  <%= render ModalComponent.new(show_close_button: false) do %>
-    <%= form_with model: [:admin, @editable_content],
-                  html: { autocomplete: "off" } do |form| %>
-      <%= form.hidden_field :redirect_to, value: @redirect_to  %>
-      <p class="mb-2">
-        <%= form.label :content, @editable_content.key.capitalize, class: 'font-bold' %>
-      </p>
-      <% if @editable_content.rich_text %>
-        <p>
-          <%= form.textarea :content, class: "md:w-[56rem] md:h-[28rem]" %>
-        </p>
-        <p class="text-right">
-          <%= form.submit "Save", class: "ml-2 btn-md btn-blue" %>
-        </p>
-      <% else %>
-        <p class="">
-          <%= form.text_field :content, class: "w-80" %>
-        </p>
-        <p>
-          <%= form.submit "Save", class: "btn-md btn-blue w-full" %>
-        </p>
-      <% end %>
-    <% end %>
-  <% end %>
-</div>

app/components/edit_content_button_component.rb

@@ -1,6 +0,0 @@
-class EditContentButtonComponent < ViewComponent::Base
-  def initialize(context:, key:, rich_text: false, redirect_to: nil)
-    @editable_content = EditableContent.find_or_create_by(context:, key:, rich_text:)
-    @redirect_to = redirect_to
-  end
-end

app/components/editable_content_component.html.erb

@@ -1,11 +0,0 @@
-<% if @editable_content.has_content? %>
-  <% if @editable_content.rich_text %>
-    <div class="rich-text">
-      <%= helpers.markdown_to_html @editable_content.content %>
-    </div>
-  <% else %>
-    <%= @editable_content.content %>
-  <% end %>
-<% else %>
-  <%= @default %>
-<% end %>

app/components/editable_content_component.rb

@@ -1,6 +0,0 @@
-class EditableContentComponent < ViewComponent::Base
-  def initialize(context:, key:, rich_text: false, default: nil)
-    @editable_content = EditableContent.find_or_create_by(context:, key:, rich_text:)
-    @default = default
-  end
-end

app/components/main_compact_component.html.erb

@@ -1,4 +1,4 @@
-<main class="w-full max-w-xl mx-auto px-4 sm:px-6 lg:px-8">
+<main class="w-full max-w-xl mx-auto pb-12 px-4 sm:px-6 lg:px-8">
   <div class="bg-white rounded-lg shadow px-6 sm:px-12 py-8 sm:py-12">
     <%= content %>
   </div>

app/components/main_simple_component.html.erb

@@ -1,4 +1,4 @@
-<main class="w-full max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
+<main class="w-full max-w-6xl mx-auto pb-12 px-4 md:px-6 lg:px-8">
   <div class="md:min-h-[50vh] bg-white rounded-lg shadow px-6 sm:px-12 py-8 sm:py-12">
     <%= content %>
   </div>

app/components/main_with_sidenav_component.html.erb

@@ -1,4 +1,4 @@
-<main class="w-full max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
+<main class="w-full max-w-6xl mx-auto pb-12 px-4 md:px-6 lg:px-8">
   <div class="bg-white rounded-lg shadow">
     <div class="md:min-h-[50vh] divide-y divide-gray-200 lg:grid lg:grid-cols-12 lg:divide-y-0 lg:divide-x">
       <aside class="py-6 sm:py-8 lg:col-span-3">

app/components/main_with_tabnav_component.html.erb

@@ -1,4 +1,4 @@
-<main class="w-full max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
+<main class="w-full max-w-6xl mx-auto pb-12 px-4 md:px-6 lg:px-8">
   <div class="md:min-h-[50vh] bg-white rounded-lg shadow">
     <div class="px-6 sm:px-12 pt-2 sm:pt-4">
       <%= render partial: @tabnav_partial %>

app/components/settings/nostr_edit_profile_component.html.erb

@@ -1,44 +0,0 @@
-<div class="w-[72vw] md:w-[500px]">
-  <header class="absolute z-10 h-36 sm:h-44 inset-x-1 top-1 rounded-t
-                 bg-cover bg-center bg-gray-50"
-          style="background-image: url('<%= @profile["banner"]%>');">
-    <div class="inline-block z-20 size-28 sm:size-32 ml-4 mt-16 sm:mt-20">
-    <% if @profile["picture"].present? %>
-      <img src="<%= @profile["picture"] %>"
-           class="inline-block size:28 sm:size-32 rounded-full border-2 border-white" />
-    <% else %>
-      <span class="inline-block size:28 sm:size-32 overflow-hidden rounded-full border-2 border-white bg-gray-100">
-        <svg class="size-full text-gray-300" fill="currentColor" viewBox="0 0 24 24">
-          <path d="M24 20.993V24H0v-2.996A14.977 14.977 0 0112.004 15c4.904 0 9.26 2.354 11.996 5.993zM16.002 8.999a4 4 0 11-8 0 4 4 0 018 0z" />
-        </svg>
-      </span>
-    <% end %>
-    </div>
-  </header>
-  <main class="mt-44 sm:mt-52">
-    <%= form_for(@user, url: setting_path(:nostr), html: { :method => :put }) do |f| %>
-      <%= render FormElements::FieldsetComponent.new(tag: "div", title: "Display name") do %>
-        <%= f.text_field :display_name, value: @display_name, class: "w-full sm:w-3/5" %>
-        <% if @validation_errors.present? && @validation_errors[:display_name].present? %>
-          <p class="error-msg mt-2"><%= @validation_errors[:display_name].first %></p>
-        <% end %>
-      <% end %>
-      <%= render FormElements::FieldsetComponent.new(tag: "div", title: "Nostr address (NIP-05)") do %>
-        <%= f.text_field :nip05_address, value: @profile["nip05"], class: "w-full sm:w-3/5" %>
-        <% if @validation_errors.present? && @validation_errors[:nip05_address].present? %>
-          <p class="error-msg mt-2"><%= @validation_errors[:nip05_address].first %></p>
-        <% end %>
-      <% end %>
-      <%= render FormElements::FieldsetComponent.new(tag: "div", title: "Ligtning address for Zaps") do %>
-        <%= f.text_field :lud16_address, value: @profile["lud16"], class: "w-full sm:w-3/5" %>
-        <% if @validation_errors.present? && @validation_errors[:lud16_address].present? %>
-          <p class="error-msg mt-2"><%= @validation_errors[:lud16_address].first %></p>
-        <% end %>
-      <% end %>
-    <% end %>
-  </main>
-  <footer>
-    <%# <%= @profile.inspect %>
-    <%# <%= @profile_event.inspect %>
-  </footer>
-</div>

app/components/settings/nostr_edit_profile_component.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Settings
-  class NostrEditProfileComponent < ViewComponent::Base
-    def initialize(user:, profile_event:)
-      @user = user
-      @profile_event = profile_event
-      @profile = {}
-      @display_name = nil
-
-      if profile_event.present? && profile_event["content"].present?
-        @profile = JSON.parse(profile_event["content"]) rescue {}
-        @display_name = @profile["display_name"] || @profile["displayName"]
-      end
-    end
-  end
-end

app/components/settings/nostr_edit_relays_component.html.erb

@@ -1,45 +0,0 @@
-<div class="w-[72vw] md:w-[500px]">
-  <h3 class="mb-6">Edit relays</h3>
-  <%= form_with url: "#", local: true,
-        html: { data: { controller: "relay-list-editor" } } do |f| %>
-    <ul data-relay-list-editor-target="list" class="mb-4 space-y-2">
-      <% @relays.each do |relay| %>
-        <li class="flex gap-x-2 items-center">
-          <input type="text" name="relay_urls[]" value="<%= relay[:url] %>" class="grow" />
-          <select name="relay_markers[]" class="shrink-0 w-32">
-            <option value=""<%= %( selected="selected") if relay[:marker].nil? %>>Read & write</option>
-            <option value="read"<%= %( selected="selected") if relay[:marker] == "read" %>>Read only</option>
-            <option value="write"<%= %( selected="selected") if relay[:marker] == "write" %>>Write only</option>
-          </select>
-          <button type="button" class="btn-md btn-icon btn-outline text-red-700 shrink-0"
-                  data-action="click->relay-list-editor#remove" title="Remove relay">
-            <%= render partial: "icons/trash-2", locals: { custom_class: "h-4 w-4" } %>
-          </button>
-        </li>
-      <% end %>
-    </ul>
-
-    <template data-relay-list-editor-target="template">
-      <li class="flex gap-x-2 items-center">
-        <input type="text" name="relay_urls[]" value="" class="grow" />
-        <select name="relay_markers[]" class="shrink-0 w-32">
-          <option value="">Read & write</option>
-          <option value="read">Read only</option>
-          <option value="write">Write only</option>
-        </select>
-        <button type="button" class="btn-md btn-icon btn-outline text-red-700 shrink-0"
-                data-action="click->relay-list-editor#remove" title="Remove relay">
-          <%= render partial: "icons/trash-2", locals: { custom_class: "h-4 w-4" } %>
-        </button>
-      </li>
-    </template>
-
-    <button type="button" class="btn-md btn-gray w-full mb-6"
-            data-action="click->relay-list-editor#add">
-      <%= render partial: "icons/plus", locals: { custom_class: "h-4 w-4 inline mr-1" } %>
-      Add relay
-    </button>
-
-    <%= f.submit "Save relay list", class: "btn-md btn-blue w-full" %>
-  <% end %>
-</div>

app/components/settings/nostr_edit_relays_component.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Settings
-  class NostrEditRelaysComponent < ViewComponent::Base
-    def initialize(nip65_event: nil)
-      @nip65_event = nip65_event
-      @relays = build_relays
-      ensure_site_relay
-    end
-
-    private
-
-    def build_relays
-      if @nip65_event.present?
-        @nip65_event["tags"]
-          .select { |t| t[0] == "r" }
-          .map { |t| { url: t[1], marker: t[2] } }
-      else
-        Setting.nostr_discovery_relays.map { |url| { url: url, marker: nil } }
-      end
-    end
-
-    def ensure_site_relay
-      site_relay_url = Setting.nostr_relay_url
-      return if site_relay_url.blank?
-
-      @relays.reject! { |r| r[:url] == site_relay_url }
-      @relays.unshift({ url: site_relay_url, marker: nil })
-    end
-  end
-end

app/components/settings/nostr_profile_status_component.html.erb

@@ -1,21 +0,0 @@
-<% @statuses.each do |status| %>
-  <%= render StatusTextComponent.new(
-    text: status[:text],
-    icon_name: status[:icon_name],
-    icon_color: status[:icon_color]
-  ) %>
-<% end %>
-
-<% if @status == 1 %>
-  <p class="mt-8">
-    <button class="btn-md btn-blue">
-      Edit my profile
-    </button>
-  </p>
-<% elsif @status == 2 %>
-  <p class="mt-8">
-    <button class="btn-md btn-blue">
-      Create my profile
-    </button>
-  </p>
-<% end %>

app/components/settings/nostr_profile_status_component.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Settings
-  class NostrProfileStatusComponent < ViewComponent::Base
-    def initialize(profile_event:, user_address:)
-      @statuses = []
-
-      if profile_event.present?
-        profile = JSON.parse(profile_event["content"])
-
-        @statuses.push({
-          text: "You have a public Nostr profile",
-          icon_name: "check-circle",
-          icon_color: "emerald-500"
-        })
-
-        if profile["nip05"].present? && profile["nip05"] == user_address
-          @statuses.push({
-            text: "Your profile's Nostr address is set to <strong>#{ user_address }</strong>",
-            icon_name: "check-circle",
-            icon_color: "emerald-500"
-          })
-        else
-          @statuses.push({
-            text: "Your profile's Nostr address is not set to <strong>#{ user_address }</strong> yet",
-            icon_name: "alert-octagon",
-            icon_color: "amber-500"
-          })
-        end
-
-        if profile["lud16"].present? && profile["lud16"] == user_address
-          @statuses.push({
-            text: "Your profile's Lightning address is set to <strong>#{ user_address }</strong>",
-            icon_name: "check-circle",
-            icon_color: "emerald-500"
-          })
-        else
-          @statuses.push({
-            text: "Your profile's Lightning address is not set to <strong>#{ user_address }</strong> yet",
-            icon_name: "alert-octagon",
-            icon_color: "amber-500"
-          })
-        end
-      else
-        @statuses.push({
-          text: "We could not find a profile for your public key",
-          icon_name: "alert-octagon",
-          icon_color: "amber-500"
-        })
-      end
-    end
-  end
-end

app/components/settings/nostr_relay_status_component.html.erb

@@ -1,18 +0,0 @@
-<% @statuses.each do |status| %>
-  <%= render StatusTextComponent.new(
-    text: status[:text],
-    icon_name: status[:icon_name],
-    icon_color: status[:icon_color]
-  ) %>
-<% end %>
-
-<div class="mt-8" data-controller="modal" data-action="keydown.esc->modal#close">
-  <button data-action="click->modal#open" class="btn-md btn-blue w-full sm:w-auto">
-    <%= @button_text %>
-  </button>
-  <%= render ModalComponent.new(show_close_button: false) do %>
-    <%= render Settings::NostrEditRelaysComponent.new(
-      nip65_event: @nip65_event
-    ) %>
-  <% end %>
-</div>

app/components/settings/nostr_relay_status_component.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Settings
-  class NostrRelayStatusComponent < ViewComponent::Base
-    def initialize(nip65_event:, relay_url: Setting.nostr_relay_url)
-      @nip65_event = nip65_event
-      @relay_url = relay_url
-      @relay_host = relay_url.present? ? URI.parse(relay_url).host : nil
-      @statuses = []
-
-      if nip65_event.present?
-        @statuses.push({
-          text: "You have a relay list configured",
-          icon_name: "check-circle",
-          icon_color: "emerald-500"
-        })
-
-        if relay_urls(nip65_event).include?(@relay_url)
-          @statuses.push({
-            text: "The <strong>#{@relay_host}</strong> relay is part of your relay list",
-            icon_name: "check-circle",
-            icon_color: "emerald-500"
-          })
-        else
-          @statuses.push({
-            text: "The <strong>#{@relay_host}</strong> relay is missing from your relay list",
-            icon_name: "alert-octagon",
-            icon_color: "amber-500"
-          })
-        end
-      else
-        @statuses.push({
-          text: "We could not find a relay list for your public key",
-          icon_name: "alert-octagon",
-          icon_color: "amber-500"
-        })
-      end
-
-      @button_text = (nip65_event.present? ? "Edit relays" : "Set up relays")
-    end
-
-    private
-
-    def relay_urls(nip65_event)
-      nip65_event["tags"].select { |t| t[0] == "r" }.map { |t| t[1] }
-    end
-  end
-end

app/components/status_text_component.html.erb

@@ -1,8 +0,0 @@
-<p class="flex gap-x-4 items-center">
-  <span class="inline-block h-6 w-6 grow-0 text-<%= @icon_color %>">
-    <%= render "icons/#{@icon_name}" %>
-  </span>
-  <span>
-    <%= raw @text %>
-  </span>
-</p>

app/components/status_text_component.rb

@@ -1,7 +0,0 @@
-class StatusTextComponent < ViewComponent::Base
-  def initialize(text:, icon_name:, icon_color:)
-    @text = text
-    @icon_name = icon_name
-    @icon_color = icon_color
-  end
-end

app/controllers/admin/donations_controller.rb

@@ -4,22 +4,11 @@ class Admin::DonationsController < Admin::BaseController
 
   # GET /donations
   def index
-    @username = params[:username].presence
-
-    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)
+    @pagy, @donations = pagy(Donation.completed.order('paid_at desc'))
 
     @stats = {
-      overall_sats: completed_scope.sum("amount_sats"),
-      donor_count: completed_scope.distinct.count(:user_id)
+      overall_sats: @donations.sum("amount_sats"),
+      donor_count: Donation.completed.count(:user_id)
     }
   end
 

app/controllers/admin/editable_contents_controller.rb

@@ -1,45 +0,0 @@
-class Admin::EditableContentsController < Admin::BaseController
-  before_action :set_content, only: [:show, :edit, :update]
-  before_action :set_current_section, only: [:index, :show, :edit]
-
-  def index
-    @path = params[:path].presence
-    scope = EditableContent.order(path: :asc)
-    scope = scope.where(path: @path) if @path
-    @pagy, @contents = pagy(scope)
-  end
-
-  def show
-  end
-
-  def edit
-  end
-
-  def update
-    return_to = params[:editable_content][:redirect_to].presence
-
-    if @editable_content.update(content_params)
-      if return_to
-        redirect_to return_to
-      else
-        render status: :ok
-      end
-    else
-      render :edit, status: :unprocessable_entity
-    end
-  end
-
-  private
-
-  def set_content
-    @editable_content = EditableContent.find(params[:id])
-  end
-
-  def content_params
-    params.require(:editable_content).permit(:path, :key, :lang, :content, :rich_text)
-  end
-
-  def set_current_section
-    @current_section = :content
-  end
-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
-    accepted_scope = 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)
+    @current_section = :invitations
+    @pagy, @invitations_used = pagy(Invitation.used.order('used_at desc'))
 
     @stats = {
-      available: unused_scope.count,
-      accepted: accepted_scope.count,
-      users_with_referrals: accepted_scope.distinct.count(:user_id)
+      available: Invitation.unused.count,
+      accepted: @invitations_used.length,
+      users_with_referrals: Invitation.used.distinct.count(:user_id)
     }
   end
-
-  private
-
-    def set_current_section
-      @current_section = :invitations
-    end
 end

app/controllers/admin/users_controller.rb

@@ -12,11 +12,7 @@ class Admin::UsersController < Admin::BaseController
     @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)
-
-    @username = params[:username].presence
-    users_scope = User.where(ou: ou).order(cn: :asc)
-    users_scope = users_scope.where("cn LIKE ?", "%#{User.sanitize_sql_like(@username.downcase)}%") if @username
-    @pagy, @users = pagy(users_scope)
+    @pagy, @users = pagy(User.where(ou: ou).order(cn: :asc))
 
     @stats = {
       users_confirmed: User.where(ou: ou).confirmed.count,
@@ -28,10 +24,6 @@ class Admin::UsersController < Admin::BaseController
 
   # 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

app/controllers/application_controller.rb

@@ -39,7 +39,7 @@ class ApplicationController < ActionController::Base
   end
 
   def after_sign_in_path_for(user)
-    session.delete(:user_return_to) || root_path
+    session[:user_return_to] || root_path
   end
 
   def lndhub_authenticate(options={})

app/controllers/contributions/other_controller.rb

@@ -1,16 +0,0 @@
-class Contributions::OtherController < ApplicationController
-  before_action :authenticate_user!
-  before_action :set_content_editing
-
-  # GET /contributions/other
-  def index
-    @current_section = :contributions
-  end
-
-  private
-
-    def set_content_editing
-      return unless params[:edit] && current_user.is_admin?
-      @edit_content = true
-    end
-end

app/controllers/contributions/projects_controller.rb

@@ -0,0 +1,8 @@
+class Contributions::ProjectsController < ApplicationController
+  before_action :authenticate_user!
+
+  # GET /contributions
+  def index
+    @current_section = :contributions
+  end
+end

app/controllers/devise/passwords_controller.rb

@@ -55,12 +55,7 @@ class Devise::PasswordsController < DeviseController
 
   protected
     def after_resetting_password_path_for(resource)
-      session.delete(:user_return_to)
-      if Devise.sign_in_after_reset_password
-        root_path
-      else
-        new_session_path(resource_name)
-      end
+      Devise.sign_in_after_reset_password ? after_sign_in_path_for(resource) : new_session_path(resource_name)
     end
 
     # The path used after sending reset password instructions

app/controllers/pages_controller.rb

@@ -1,9 +0,0 @@
-class PagesController < ApplicationController
-  def privacy
-    @current_section = :privacy
-  end
-
-  def tos
-    @current_section = :tos
-  end
-end

app/controllers/rs/oauth_controller.rb

@@ -1,5 +1,4 @@
 class Rs::OauthController < ApplicationController
-  prepend_before_action :assert_redirect_uri, only: [:new, :create]
   before_action :require_signed_in_with_username, only: :new
   before_action :authenticate_user!, only: :create
 
@@ -17,6 +16,8 @@ class Rs::OauthController < ApplicationController
                         ["In 1 month", 1.month.from_now],
                         ["In 1 day", 1.day.from_now]]
 
+    http_status :bad_request and return unless @redirect_uri.present?
+
     unless current_user == @user
       sign_out :user
 
@@ -63,6 +64,8 @@ class Rs::OauthController < ApplicationController
     state        = params[:state].presence
     expire_at    = params[:expire_at].presence
 
+    http_status :bad_request and return unless redirect_uri.present?
+
     if permissions.empty?
       redirect_to(url_with_state("#{redirect_uri}#error=invalid_scope", state),
                   allow_other_host: true) and return
@@ -94,10 +97,6 @@ class Rs::OauthController < ApplicationController
 
   private
 
-  def assert_redirect_uri
-    http_status :bad_request unless params[:redirect_uri].present?
-  end
-
   def require_signed_in_with_username
     unless user_signed_in?
       session[:user_return_to] = request.url

app/controllers/settings_controller.rb

@@ -4,13 +4,8 @@ require "bcrypt"
 class SettingsController < ApplicationController
   before_action :authenticate_user!
   before_action :set_main_nav_section
-  before_action :set_settings_section, only: [
-    :show, :update, :update_email, :reset_email_password
-  ]
-  before_action :set_user, only: [
-    :show, :update, :update_email, :reset_email_password,
-    :fetch_nostr_metadata
-  ]
+  before_action :set_settings_section, only: [:show, :update, :update_email, :reset_email_password]
+  before_action :set_user, only: [:show, :update, :update_email, :reset_email_password]
 
   def index
     redirect_to setting_path(:profile)
@@ -148,63 +143,12 @@ class SettingsController < ApplicationController
     }
   end
 
-  def fetch_nostr_metadata
-    return render plain: "no pubkey", status: :bad_request if @user.nostr_pubkey.blank?
-
-    cache_key = "nostr_metadata:#{@user.id}"
-
-    case params[:step]
-    when "relays"
-      nip65_event = NostrManager::DiscoverUserRelays.call(pubkey: @user.nostr_pubkey)
-      write_relays = nip65_event ? extract_write_relays(nip65_event) : []
-
-      if nip65_event && write_relays.any? && stale?(nip65_event)
-        auth_event = NostrManager::DiscoverUserRelays.call(
-          pubkey: @user.nostr_pubkey, relays: write_relays
-        )
-        nip65_event = auth_event if auth_event
-        write_relays = extract_write_relays(nip65_event) if auth_event
-      end
-
-      Rails.cache.write("#{cache_key}:nip65", nip65_event, expires_in: 5.minutes)
-      Rails.cache.write("#{cache_key}:write_relays", write_relays, expires_in: 5.minutes)
-      render json: { next: "profile" }
-
-    when "profile"
-      write_relays = Rails.cache.read("#{cache_key}:write_relays") || []
-      relays = write_relays.any? ? write_relays : nil
-      profile = NostrManager::DiscoverUserProfile.call(
-        pubkey: @user.nostr_pubkey, relays: relays
-      )
-      Rails.cache.write("#{cache_key}:profile", profile, expires_in: 5.minutes)
-      render json: { next: "render" }
-
-    when "render", nil
-      @nip65_event = Rails.cache.read("#{cache_key}:nip65")
-      @profile     = Rails.cache.read("#{cache_key}:profile")
-      render partial: "nostr_metadata", formats: :html
-
-    else
-      render plain: "invalid step", status: :bad_request
-    end
-  end
-
   private
 
     def set_main_nav_section
       @current_section = :settings
     end
 
-    def extract_write_relays(nip65_event)
-      nip65_event["tags"]
-        .select { |t| t[0] == "r" && t[2] != "read" }
-        .map { |t| t[1] }
-    end
-
-    def stale?(event, threshold = 30.minutes)
-      Time.at(event["created_at"]) < threshold.ago
-    end
-
     def set_settings_section
       @settings_section = params[:section]
       allowed_sections = [

app/controllers/turbo_controller.rb

@@ -0,0 +1,18 @@
+class TurboController < ApplicationController
+  class Responder < ActionController::Responder
+    def to_turbo_stream
+      controller.render(options.merge(formats: :html))
+    rescue ActionView::MissingTemplate => error
+      if get?
+        raise error
+      elsif has_errors? && default_action
+        render rendering_options.merge(formats: :html, status: :unprocessable_entity)
+      else
+        redirect_to navigation_location
+      end
+    end
+  end
+
+  self.responder = Responder
+  respond_to :html, :turbo_stream
+end

app/controllers/users/devise_controller.rb

@@ -6,7 +6,7 @@ class Users::DeviseController < ApplicationController
       if get?
         raise error
       elsif has_errors? && default_action
-        render error_rendering_options.merge(formats: :html, status: :unprocessable_entity)
+        render rendering_options.merge(formats: :html, status: :unprocessable_entity)
       else
         redirect_to navigation_location
       end

app/helpers/application_helper.rb

@@ -15,12 +15,6 @@ module ApplicationHelper
     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 markdown_to_html(string)
-    raw Kramdown::Document.new(string, {
-      input: "GFM"
-    }).to_html
-  end
-
   def image_url_for(attachment)
     return s3_image_url(attachment) if Setting.s3_enabled?
 

app/javascript/controllers/nostr_metadata_controller.js

@@ -1,50 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = [ "status", "loading", "content" ]
-  static values  = { url: String }
-
-  connect () {
-    this.runStep("relays")
-  }
-
-  async runStep (step) {
-    const messages = {
-      relays:  "Looking up your relay list…",
-      profile: "Fetching your profile…",
-      blossom: "Fetching your media server list…",
-      render:  null
-    }
-
-    if (messages[step]) {
-      this.statusTarget.textContent = messages[step]
-    }
-
-    try {
-      const headers = (step === "render")
-        ? { "Accept": "text/html" }
-        : { "Accept": "application/json" }
-
-      const res = await fetch(`${this.urlValue}?step=${step}`, { headers })
-
-      if (!res.ok) {
-        throw new Error(`HTTP ${res.status}`)
-      }
-
-      if (step === "render") {
-        const html = await res.text()
-        this.loadingTarget.classList.add("hidden")
-        this.contentTarget.classList.remove("hidden")
-        this.contentTarget.innerHTML = html
-      } else {
-        const data = await res.json()
-        if (data.next) {
-          this.runStep(data.next)
-        }
-      }
-    } catch (error) {
-      console.warn("Nostr metadata fetch failed:", error.message)
-      this.statusTarget.textContent = "Something went wrong. Please reload."
-    }
-  }
-}

app/javascript/controllers/relay_list_editor_controller.js

@@ -1,17 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = [ "list", "template" ]
-
-  add (event) {
-    event.preventDefault()
-    const row = this.templateTarget.content.cloneNode(true)
-    this.listTarget.appendChild(row)
-  }
-
-  remove (event) {
-    event.preventDefault()
-    const row = event.target.closest("li")
-    row.remove()
-  }
-}

app/jobs/xmpp_exchange_contacts_job.rb

@@ -2,6 +2,21 @@ class XmppExchangeContactsJob < ApplicationJob
   queue_as :default
 
   def perform(inviter, invitee)
-    EjabberdManager::ExchangeContacts.call(inviter:, invitee:)
+    return unless inviter.service_enabled?(:ejabberd) &&
+                  invitee.service_enabled?(:ejabberd) &&
+                  inviter.preferences[:xmpp_exchange_contacts_with_invitees]
+
+    ejabberd = EjabberdApiClient.new
+
+    ejabberd.add_rosteritem({
+      "localuser": invitee.cn, "localhost": invitee.ou,
+      "user": inviter.cn, "host": inviter.ou,
+      "nick": inviter.cn, "group": Setting.ejabberd_buddy_roster, "subs": "both"
+    })
+    ejabberd.add_rosteritem({
+      "localuser": inviter.cn, "localhost": inviter.ou,
+      "user": invitee.cn, "host": invitee.ou,
+      "nick": invitee.cn, "group": Setting.ejabberd_buddy_roster, "subs": "both"
+    })
   end
 end

app/jobs/xmpp_send_message_job.rb

@@ -2,6 +2,7 @@ class XmppSendMessageJob < ApplicationJob
   queue_as :default
 
   def perform(payload)
-    EjabberdManager::SendMessage.call(payload:)
+    ejabberd = EjabberdApiClient.new
+    ejabberd.send_message payload
   end
 end

app/jobs/xmpp_set_avatar_job.rb

@@ -1,7 +1,97 @@
+require 'digest'
+require "image_processing/vips"
+
 class XmppSetAvatarJob < ApplicationJob
   queue_as :default
 
   def perform(user:, overwrite: false)
-    EjabberdManager::SetAvatar.call(user:, overwrite:)
+    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/jobs/xmpp_set_default_bookmarks_job.rb

@@ -2,6 +2,25 @@ class XmppSetDefaultBookmarksJob < ApplicationJob
   queue_as :default
 
   def perform(user)
-    EjabberdManager::SetDefaultBookmarks.call(user:)
+    return unless Setting.xmpp_default_rooms.any?
+    @user = user
+    ejabberd = EjabberdApiClient.new
+    ejabberd.private_set user, storage_content
+  end
+
+  def storage_content
+    bookmarks = ""
+    Setting.xmpp_default_rooms.each do |r|
+      bookmarks << conference_element(
+        jid: r[/<(.+)>/, 1], name: r[/^(.+)\s/, 1], nick: @user.cn,
+        autojoin: Setting.xmpp_autojoin_default_rooms
+      )
+    end
+
+    "<storage xmlns='storage:bookmarks'>#{bookmarks}</storage>"
+  end
+
+  def conference_element(jid:, name:, autojoin: false, nick:)
+    "<conference jid='#{jid}' name='#{name}' autojoin='#{autojoin.to_s}'><nick>#{nick}</nick></conference>"
   end
 end

app/models/concerns/settings/nostr_settings.rb

@@ -18,23 +18,8 @@ module Settings
       field :nostr_relay_url, type: :string,
         default: ENV["NOSTR_RELAY_URL"].presence
 
-      field :nostr_blossom_server_url, type: :string,
-        default: ENV["NOSTR_BLOSSOM_SERVER_URL"].presence
-
       field :nostr_zaps_relay_limit, type: :integer,
         default: 12
-
-      field :nostr_discovery_relays, type: :array, default: %w[
-        wss://nostr.kosmos.org
-        wss://relay.nostr.band
-        wss://njump.me
-        wss://relay.damus.io
-      ]
-
-      def self.nostr_relay_url_http
-        self.nostr_relay_url.gsub(/^ws:/, "http:")
-                            .gsub(/^wss:/, "https:")
-      end
     end
   end
 end

app/models/donation.rb

@@ -17,7 +17,6 @@ class Donation < ApplicationRecord
   scope :pending,    -> { where(payment_status: "pending") }
   scope :processing, -> { where(payment_status: "processing") }
   scope :completed,  -> { where(payment_status: "settled") }
-  scope :incomplete, -> { where.not(payment_status: "settled") }
 
   aasm column: :payment_status do
     state :pending, initial: true

app/models/editable_content.rb

@@ -1,12 +0,0 @@
-class EditableContent < ApplicationRecord
-  validates :key, presence: true,
-                  uniqueness: { scope: :context }
-
-  def has_content?
-    content.present?
-  end
-
-  def is_empty?
-    content.blank?
-  end
-end

app/models/lndhub_user.rb

@@ -10,18 +10,18 @@ class LndhubUser < LndhubBase
                     foreign_key: "login"
 
   def balance
-    accounts.current.order(:id).first.ledgers.sum("account_ledgers.amount").to_i.abs
+    accounts.current.first.ledgers.sum("account_ledgers.amount").to_i.abs
   end
 
   def sum_outgoing
-    accounts.outgoing.order(:id).first.ledgers.sum("account_ledgers.amount").to_i.abs
+    accounts.outgoing.first.ledgers.sum("account_ledgers.amount").to_i.abs
   end
 
   def sum_incoming
-    accounts.incoming.order(:id).first.ledgers.sum("account_ledgers.amount").to_i.abs
+    accounts.incoming.first.ledgers.sum("account_ledgers.amount").to_i.abs
   end
 
   def sum_fees
-    accounts.fees.order(:id).first.ledgers.sum("account_ledgers.amount").to_i.abs
+    accounts.fees.first.ledgers.sum("account_ledgers.amount").to_i.abs
   end
 end

app/models/user.rb

@@ -131,11 +131,11 @@ class User < ApplicationRecord
   end
 
   def is_admin?
-    @admin ||= if admin = Devise::LDAP::Adapter.get_ldap_param(self.cn, :admin)
-                 !!admin.first
-               else
-                 false
-               end
+    admin ||= if admin = Devise::LDAP::Adapter.get_ldap_param(self.cn, :admin)
+                !!admin.first
+              else
+                false
+              end
   end
 
   def address

app/services/ejabberd_api_client.rb

@@ -1,16 +1,11 @@
-class EjabberdManagerService < RestApiService
-  private
-
-  def base_url
-    @base_url ||= Setting.ejabberd_api_url
+class EjabberdApiClient
+  def initialize
+    @base_url = Setting.ejabberd_api_url
   end
 
-  def headers
-    { "Content-Type" => "application/json" }
-  end
-
-  def parse_responses?
-    false
+  def post(endpoint, payload)
+    Faraday.post "#{@base_url}/#{endpoint}", payload.to_json,
+                 "Content-Type" => "application/json"
   end
 
   #

app/services/ejabberd_manager/exchange_contacts.rb

@@ -1,25 +0,0 @@
-module EjabberdManager
-  class ExchangeContacts < EjabberdManagerService
-    def initialize(inviter:, invitee:)
-      @inviter = inviter
-      @invitee = invitee
-    end
-
-    def call
-      return unless @inviter.service_enabled?(:ejabberd) &&
-                    @invitee.service_enabled?(:ejabberd) &&
-                    @inviter.preferences[:xmpp_exchange_contacts_with_invitees]
-
-      add_rosteritem({
-        "localuser": @invitee.cn, "localhost": @invitee.ou,
-        "user": @inviter.cn, "host": @inviter.ou,
-        "nick": @inviter.cn, "group": Setting.ejabberd_buddy_roster, "subs": "both"
-      })
-      add_rosteritem({
-        "localuser": @inviter.cn, "localhost": @inviter.ou,
-        "user": @invitee.cn, "host": @invitee.ou,
-        "nick": @invitee.cn, "group": Setting.ejabberd_buddy_roster, "subs": "both"
-      })
-    end
-  end
-end

app/services/ejabberd_manager/get_avatar.rb

@@ -1,25 +0,0 @@
-module EjabberdManager
-  class GetAvatar < EjabberdManagerService
-    def initialize(user:)
-      @user = user
-    end
-
-    def call
-      res = get_vcard2 @user, "PHOTO", "BINVAL"
-
-      if res.status == 200
-        # VCARD PHOTO/BINVAL prop exists
-        img_base64 = JSON.parse(res.body)["content"]
-        ct_res = get_vcard2 @user, "PHOTO", "TYPE"
-        content_type = JSON.parse(ct_res.body)["content"]
-        { content_type:, img_base64: }
-      elsif res.status == 400
-        # VCARD or PHOTO/BINVAL prop does not exist
-        nil
-      else
-        # Unexpected error, let job fail
-        raise res.inspect
-      end
-    end
-  end
-end

app/services/ejabberd_manager/send_message.rb

@@ -1,11 +0,0 @@
-module EjabberdManager
-  class SendMessage < EjabberdManagerService
-    def initialize(payload:)
-      @payload = payload
-    end
-
-    def call
-      send_message @payload
-    end
-  end
-end

app/services/ejabberd_manager/set_avatar.rb

@@ -1,80 +0,0 @@
-require 'digest'
-require "image_processing/vips"
-
-module EjabberdManager
-  class SetAvatar < EjabberdManagerService
-    def initialize(user:, overwrite: false)
-      @user = user
-      @overwrite = overwrite
-    end
-
-    def call
-      unless @overwrite
-        current_avatar = EjabberdManager::GetAvatar.call(user: @user)
-        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 = send_stanza payload
-        raise res.inspect if res.status != 200
-      end
-    end
-
-    private
-
-    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
-end

app/services/ejabberd_manager/set_default_bookmarks.rb

@@ -1,31 +0,0 @@
-module EjabberdManager
-  class SetDefaultBookmarks < EjabberdManagerService
-    def initialize(user:)
-      @user = user
-    end
-
-    def call
-      return unless Setting.xmpp_default_rooms.any?
-
-      private_set @user, storage_content
-    end
-
-    private
-
-    def storage_content
-      bookmarks = ""
-      Setting.xmpp_default_rooms.each do |r|
-        bookmarks << conference_element(
-          jid: r[/<(.+)>/, 1], name: r[/^(.+)\s/, 1], nick: @user.cn,
-          autojoin: Setting.xmpp_autojoin_default_rooms
-        )
-      end
-
-      "<storage xmlns='storage:bookmarks'>#{bookmarks}</storage>"
-    end
-
-    def conference_element(jid:, name:, autojoin: false, nick:)
-      "<conference jid='#{jid}' name='#{name}' autojoin='#{autojoin.to_s}'><nick>#{nick}</nick></conference>"
-    end
-  end
-end

app/services/nostr_manager/discover_user_profile.rb

@@ -1,21 +0,0 @@
-module NostrManager
-  class DiscoverUserProfile < NostrManagerService
-    def initialize(pubkey:, relays: nil)
-      @pubkey = pubkey
-      @relays = relays.present? ? relays : Setting.nostr_discovery_relays
-    end
-
-    def call
-      filter = Nostr::Filter.new(
-        authors: [@pubkey],
-        kinds: [0],
-        limit: 1,
-      )
-
-      NostrManager::FetchLatestEvent.call(
-        relays: @relays,
-        filter: filter
-      )
-    end
-  end
-end

app/services/nostr_manager/discover_user_relays.rb

@@ -1,21 +0,0 @@
-module NostrManager
-  class DiscoverUserRelays < NostrManagerService
-    def initialize(pubkey:, relays: nil)
-      @pubkey = pubkey
-      @relays = relays.present? ? relays : Setting.nostr_discovery_relays
-    end
-
-    def call
-      filter = Nostr::Filter.new(
-        authors: [@pubkey],
-        kinds: [10002],
-        limit: 1,
-      )
-
-      NostrManager::FetchLatestEvent.call(
-        relays: @relays,
-        filter: filter
-      )
-    end
-  end
-end

app/services/nostr_manager/fetch_event.rb

@@ -1,61 +0,0 @@
-module NostrManager
-  class FetchEvent < NostrManagerService
-    TIMEOUT = 10
-
-    def initialize(filter:, relay_url:)
-      @filter = filter
-      @relay = new_relay(relay_url)
-      @client = Nostr::Client.new
-    end
-
-    def call
-      filter, client, relay = @filter, @client, @relay
-      event = nil
-      mutex = Mutex.new
-      received_event = ConditionVariable.new
-      log_prefix = "[nostr][#{@relay.name}]"
-
-      thread = Thread.new do
-        client.on :connect do
-          client.subscribe(filter: filter)
-        end
-
-        client.on :error do |e|
-          Rails.logger.info "#{log_prefix} Error: #{e}"
-          Thread.current.exit
-        end
-
-        client.on :message do |m|
-          msg = JSON.parse(m) rescue nil
-          if msg && msg[0] == "EVENT" && msg[2]
-            Rails.logger.debug "#{log_prefix} Event received: #{msg[2]["id"]}"
-            mutex.synchronize do
-              event = msg[2]
-              received_event.signal
-            end
-          elsif msg && msg[0] == "EOSE"
-            mutex.synchronize do
-              received_event.signal
-            end
-          end
-        end
-
-        client.connect relay
-      end
-
-      begin
-        Timeout.timeout(TIMEOUT) do
-          mutex.synchronize do
-            received_event.wait(mutex) if event.nil?
-          end
-        end
-      rescue Timeout::Error
-        Rails.logger.debug "#{log_prefix} Timeout: No event received within #{TIMEOUT} seconds"
-      ensure
-        thread.exit
-      end
-
-      event
-    end
-  end
-end

app/services/nostr_manager/fetch_latest_event.rb

@@ -1,32 +0,0 @@
-module NostrManager
-  class FetchLatestEvent < NostrManagerService
-    TIMEOUT = 20
-
-    def initialize(relays:, filter:, max_events: 2)
-      @relays = relays
-      @filter = filter
-      @max_events = max_events
-    end
-
-    def call
-      events = []
-
-      begin
-        Timeout.timeout(TIMEOUT) do
-          @relays.each do |url|
-            event = NostrManager::FetchEvent.call(filter: @filter, relay_url: url)
-
-            if event.present? && events.none? { |e| e["id"] == event["id"] }
-              events << event
-              break if events.size >= @max_events
-            end
-          end
-        end
-      rescue Timeout::Error
-        Rails.logger.debug "[nostr] Timeout after #{TIMEOUT}s, found #{events.size} events"
-      end
-
-      events.max_by { |e| e["created_at"] }
-    end
-  end
-end

app/services/nostr_manager/publish_event.rb

@@ -19,28 +19,28 @@ module NostrManager
 
       thread = Thread.new do
         client.on :connect do
-          Rails.logger.debug "#{log_prefix} Publishing #{event.id}..."
+          puts "#{log_prefix} Publishing #{event.id}..."
           client.publish event
         end
 
         client.on :error do |e|
-          Rails.logger.debug "#{log_prefix} Error: #{e}"
-          Rails.logger.debug "#{log_prefix} Closing thread..."
+          puts "#{log_prefix} Error: #{e}"
+          puts "#{log_prefix} Closing thread..."
           thread.exit
         end
 
         client.on :message do |m|
-          Rails.logger.debug "#{log_prefix} Message: #{m}"
+          puts "#{log_prefix} Message: #{m}"
           msg = JSON.parse(m) rescue []
           if msg[0] == "OK" && msg[1] == event.id && msg[2]
-            Rails.logger.debug "#{log_prefix} Event published. Closing thread..."
+            puts "#{log_prefix} Event published. Closing thread..."
           else
-            Rails.logger.debug "#{log_prefix} Unexpected message from relay. Closing thread..."
+            puts "#{log_prefix} Unexpected message from relay. Closing thread..."
           end
           thread.exit
         end
 
-        Rails.logger.debug "#{log_prefix} Connecting to #{relay.url}..."
+        puts "#{log_prefix} Connecting to #{relay.url}..."
         client.connect relay
       end
 

app/services/nostr_manager_service.rb

@@ -3,7 +3,6 @@ require "nostr"
 class NostrManagerService < ApplicationService
   def parse_tags(tags)
     out = {}
-    # TODO support more than 1 item for each tag type
     tags.each do |tag|
       out[tag[0].to_sym] = tag[1, tag.length]
     end
@@ -20,8 +19,4 @@ class NostrManagerService < ApplicationService
   def site_user
     Nostr::User.new(keypair: site_keypair)
   end
-
-  def new_relay(url)
-    Nostr::Relay.new(url: url, name: URI.parse(url).host)
-  end
 end

app/services/rest_api_service.rb

@@ -13,17 +13,15 @@ class RestApiService < ApplicationService
     "#{base_url}/#{path.gsub(/^\//, '')}"
   end
 
-  def parse_responses?
-    true
-  end
-
   def get(path, params = {})
     res = Faraday.get endpoint_url(path), params, headers
-    parse_responses? ? JSON.parse(res.body) : res
+    # 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
-    parse_responses? ? JSON.parse(res.body) : res
+    # TODO handle unsuccessful responses with no valid JSON body
+    JSON.parse(res.body)
   end
 end

app/services/user_manager/update_avatar.rb

@@ -8,7 +8,6 @@ module UserManager
       LdapManager::UpdateAvatar.call(user: @user)
 
       if Setting.ejabberd_enabled?
-        return if Rails.env.development?
         XmppSetAvatarJob.perform_later(user: @user)
       end
     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/app_catalog/web_apps/index.html.erb

@@ -38,7 +38,8 @@
             <tr>
               <td><%= web_app.name %></td>
               <td><%= link_to web_app.url, web_app.url,
-                              target: "_blank", rel: "nofollow noopener" %></td>
+                              target: "_blank", rel: "nofollow noopener",
+                              class: "ks-text-link" %></td>
               <td class="hidden md:table-cell"><%= web_app.remote_storage_authorizations.count %></td>
               <td class="hidden md:table-cell">
                 <span title="<%= web_app.created_at %>" class="cursor-help">

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) %></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",
-               locals: { path: admin_donations_path } %>
-  </section>
-
-  <% if @pending_donations.present? %>
-  <section>
-    <h3>Pending</h3>
-    <%= render partial: "admin/donations/list", locals: {
-          donations: @pending_donations
-        } %>
-  </section>
-  <% end %>
-
-  <section>
-  <% if @donations.present? %>
-    <h3>Received</h3>
-    <%= render partial: "admin/donations/list", locals: {
-          donations: @donations, pagy: @pagy
-        } %>
+  <% if @donations.any? %>
+    <h3>Recent Donations</h3>
+    <table class="divided mb-8">
+      <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)") : "" %></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

@@ -6,7 +6,7 @@
       <tbody>
         <tr>
           <th>User</th>
-          <td><%= link_to @donation.user.cn, admin_user_path(@donation.user.cn) %></td>
+          <td><%= link_to @donation.user.cn, admin_user_path(@donation.user.cn), class: 'ks-text-link' %></td>
         </tr>
         <tr>
           <th>Donation Method</th>
@@ -25,15 +25,7 @@
           <td><%= @donation.public_name %></td>
         </tr>
         <tr>
-          <th>Payment status</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>
+          <th>Date</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>
@@ -44,8 +38,8 @@
             <tr>
               <td class="overflow-ellipsis font-mono"><%= invitation.token %></td>
               <td><%= invitation.used_at.strftime("%Y-%m-%d (%H:%M UTC)") %></td>
-              <td><%= link_to invitation.user.cn, admin_user_path(invitation.user.cn) %></td>
-              <td><%= link_to invitation.invitee.cn, admin_user_path(invitation.invitee.cn) %></td>
+              <td><%= link_to invitation.user.cn, admin_user_path(invitation.user.cn), class: "ks-text-link" %></td>
+              <td><%= link_to invitation.invitee.cn, admin_user_path(invitation.invitee.cn), class: "ks-text-link" %></td>
             </tr>
           <% end %>
         </tbody>

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

@@ -36,7 +36,7 @@
             </td>
             <td>
               <% if user = @users.find{ |u| u[2] == account.login } %>
-                <%= link_to user[0], admin_user_path(user[0]) %>
+                <%= link_to user[0], admin_user_path(user[0]), class: "ks-text-link" %>
               <% end %>
             </td>
             <td><%= number_with_delimiter account.balance.to_i.to_s %></td>

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

@@ -29,35 +29,15 @@
         title: "Relay URL",
         description: "Websockets URL of a relay associated with #{Setting.primary_domain}"
       ) %>
-  <%= render FormElements::FieldsetResettableSettingComponent.new(
-        key: :nostr_blossom_server_url,
-        title: "Blossom server URL",
-        description: "HTTP URL of the Blossom media server to add to users' server lists during onboarding"
-      ) %>
 </ul>
 </section>
-
 <section>
 <h3>Zaps</h3>
 <ul role="list">
   <%= render FormElements::FieldsetResettableSettingComponent.new(
         key: :nostr_zaps_relay_limit,
         title: "Relay limit",
-        description: "The maximum number of sender-defined relays to try to publish zap receipts to"
+        description: "The maximum number of relays to publish zap receipts to"
       ) %>
 </ul>
-</section>
-
-<section>
-<h3>Onboarding</h3>
-<ul role="list">
-  <%= render FormElements::FieldsetComponent.new(
-        title: "Discovery relays",
-        description: "Used to discover a user's published relay list and/or profile"
-      ) do %>
-    <%= f.text_area :nostr_discovery_relays,
-      value: Setting.nostr_discovery_relays.join("\n"),
-      class: "h-44 w-80" %>
-  <% end %>
-</ul>
 <% end %>

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

@@ -30,11 +30,6 @@
     <% end %>
   </section>
 
-  <section>
-    <%= render partial: "admin/username_search_form",
-               locals: { path: admin_users_path } %>
-  </section>
-
   <section>
     <table class="divided mb-8">
       <thead>
@@ -47,7 +42,7 @@
       <tbody>
         <% @users.each do |user| %>
         <tr>
-          <td><%= link_to(user.cn, admin_user_path(user.cn)) %></td>
+          <td><%= link_to(user.cn, admin_user_path(user.cn), class: 'ks-text-link') %></td>
           <td>
             <%= user.confirmed_at.nil? ? badge("pending", :yellow) : "" %>
             <% if @show_contributors %><%= @contributors.include?(user.cn) ? badge("contributor", :green) : "" %><% end %>

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

@@ -35,32 +35,19 @@
           <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) do %>
-                <%= @user.donations.completed.count %> for
-                <%= number_with_delimiter @user.donations.completed.sum("amount_sats") %> sats
+              <% 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 %>
-            <% else %>
-              —
-            <% end %>
             </td>
           </tr>
           <tr>
             <th>Invited by</th>
             <td>
             <% if @user.inviter %>
-              <%= link_to @user.inviter.cn, admin_user_path(@user.inviter.cn) %>
+              <%= link_to @user.inviter.cn, admin_user_path(@user.inviter.cn), class: 'ks-text-link' %>
             <% else %>&mdash;<% end %>
             </td>
           </tr>
@@ -69,7 +56,7 @@
             <td data-controller="modal" data-action="keydown.esc->modal#close">
               <div class="flex justify-between">
                 <span>
-                  <%= @user.invitations.unused.count %>
+                  <%= @user.invitations.count %>
                 </span>
                 <span>
                   <button id="add-invitations" data-action="click->modal#open">
@@ -99,13 +86,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| %>
-                <li class="leading-none mb-2 last:mb-0"><%= link_to invitee.cn, admin_user_path(invitee.cn) %></li>
-              <% end %>
-              <% if @more_invitees > 0 %>
-                <li>and <%= link_to "#{@more_invitees} more", admin_invitations_path(username: @user.cn) %></li>
+              <% @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>
               <% end %>
               </ul>
             <% else %>&mdash;<% end %>
@@ -168,7 +152,7 @@
                 <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),
-                      target: "_blank" do %>
+                      class: "ks-text-link", target: "_blank" do %>
                       <%= "#{@user.pgp_fpr[0, 8]}…#{@user.pgp_fpr[-8..-1]}" %>
                     <% end %>
                   <% else %>
@@ -294,9 +278,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 %>

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

@@ -3,7 +3,7 @@
 <%= render MainWithTabnavComponent.new(tabnav_partial: "shared/tabnav_contributions") do %>
   <section>
     <p class="mb-12">
-      Your financial contributions to the development and upkeep of our
+      Your financial contributions to the development and upkeep of Kosmos
       software and services.
     </p>
   </section>

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

@@ -1,20 +0,0 @@
-<%= render HeaderComponent.new(title: "Contributions") %>
-
-<%= render MainWithTabnavComponent.new(tabnav_partial: "shared/tabnav_contributions") do %>
-  <section>
-    <%= render EditableContentComponent.new(
-      context: "contributions/other", key: "body", rich_text: true,
-      default: "No content yet") %>
-
-    <% if current_user.is_admin? %>
-    <div class="mt-8 pt-6 border-t border-gray-200 text-right">
-      <%= render EditContentButtonComponent.new(
-        context: "contributions/other", key: "title",
-        redirect_to: request.path) do %>Edit title<% end %>
-      <%= render EditContentButtonComponent.new(
-        context: "contributions/other", key: "body", rich_text: true,
-        redirect_to: request.path) do %>Edit content<% end %>
-    </div>
-    <% end %>
-  </section>
-<% end %>

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

@@ -0,0 +1,49 @@
+<%= render HeaderComponent.new(title: "Contributions") %>
+
+<%= render MainWithTabnavComponent.new(tabnav_partial: "shared/tabnav_contributions") do %>
+  <section>
+    <p class="mb-8">
+      Project contributions are how we develop and run all Kosmos software and
+      services. Everything we create and provide is free and open-source
+      software, even the page you're looking at right now!
+    </p>
+    <h3>Start contributing</h3>
+    <p>
+      Check out our
+      <a href="https://kosmos.org/projects/" target="_blank" class="ks-text-link">projects page</a>
+      for some (but not all) potential places that can use your help.
+    </p>
+    <p>
+      There's something to do for everyone, especially non-programmers! For
+      example, we need more help with graphics, UI/UX design, and
+      content/copywriting. Also, testing any of our software and reporting
+      issues you encounter along the way is very valuable.
+    </p>
+    <p>
+      A good way to get started is to join one of our
+      <a href="https://wiki.kosmos.org/Main_Page#Chat" target="_blank" class="ks-text-link">chat rooms</a>
+      and introduce yourself. Alternatively, you can also ping us on any other
+      medium, or even just grab an open issue on our
+      <a href="https://gitea.kosmos.org/kosmos/" target="_blank" class="ks-text-link">Gitea</a>
+      or on
+      <a href="https://github.com/67P/" target="_blank" class="ks-text-link">GitHub</a>
+      and dive right in.
+    </p>
+    <p class="mb-8">
+      Last but not least, if you want to help by proposing new features or
+      services, or by giving feedback on existing ones, head over to the
+      <a href="https://community.kosmos.org/" target="_blank" class="ks-text-link">community forums</a>,
+      where you can do just that.
+    </p>
+    <h3>Open Source Grants</h3>
+    <p>
+      Money coming in from financial contributions is first used to pay for our
+      bills. Additional funds are being paid out directly to our contributors,
+      including you, according to their rough share of contributions.
+    </p>
+    <p>
+      We have run two 6-month trials so far, with the next trial period
+      starting sometime soon. Watch your email for notifications about it!
+    </p>
+  </section>
+<% end %>

app/views/dashboard/index.html.erb

@@ -8,7 +8,7 @@
                     bg-[length:86%] bg-[center_top_-40px] bg-no-repeat
                     bg-[url(/img/logos/icon_xmpp.svg)]">
           <%= link_to services_chat_path,
-                class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>
+                class: "block h-full px-6 py-6 rounded-md" do %>
             <h3 class="mb-3.5">Chat</h3>
             <p class="text-gray-600">
               Federated chat rooms and instant messaging
@@ -20,8 +20,7 @@
         <div class="border border-gray-300 rounded-md hover:border-gray-400
                     bg-[length:88%] bg-[center_top_-40px] bg-no-repeat
                     bg-[url(/img/logos/icon_mastodon.svg)]">
-          <%= link_to services_mastodon_path,
-                class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>
+          <%= link_to services_mastodon_path, class: "block h-full px-6 py-6 rounded-md" do %>
             <h3 class="mb-3.5">Mastodon</h3>
             <p class="text-gray-600">
               Your account on the Open Social Web
@@ -34,8 +33,7 @@
         <div class="border border-gray-300 rounded-md hover:border-gray-400
                     bg-[length:90%] bg-[center_top_-160px] bg-no-repeat
                     bg-[url(/img/logos/icon_mail.svg)]">
-          <%= link_to services_email_path,
-                class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>
+          <%= link_to services_email_path, class: "block h-full px-6 py-6 rounded-md" do %>
             <h3 class="mb-3.5">E-Mail</h3>
             <p class="text-gray-600">
               A no-bullshit email account
@@ -49,7 +47,7 @@
                     bg-[length:80%] bg-[center_top_-156px] bg-no-repeat
                     bg-[url(/img/logos/icon_remotestorage.svg)]">
           <%= link_to services_storage_path,
-                class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>
+                class: "block h-full px-6 py-6 rounded-md" do %>
             <h3 class="mb-3.5">Storage</h3>
             <p class="text-gray-600">
               Sync your data between apps and devices
@@ -62,7 +60,7 @@
                     bg-cover bg-center sm:bg-[center_top_-140px] bg-no-repeat
                     bg-[url(/img/logos/icon_lightning.svg)]">
           <%= link_to services_lightning_index_path,
-                class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>
+                class: "block h-full px-6 py-6 rounded-md" do %>
             <h3 class="mb-3.5">Lightning Network</h3>
             <p class="text-gray-600">
               Send and receive sats over the Bitcoin Lightning Network
@@ -75,7 +73,7 @@
                     bg-[length:80%] bg-center bg-no-repeat
                     bg-[url(/img/logos/icon_discourse.svg)]">
           <%= link_to "#{Setting.discourse_public_url}/session/sso?return_path=/",
-                class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>
+                class: "block h-full px-6 py-6 rounded-md" do %>
             <h3 class="mb-3.5">Discourse</h3>
             <p class="text-gray-600">
               Community forums and support/help site
@@ -88,7 +86,7 @@
                     bg-[length:92%] bg-center bg-no-repeat
                     bg-[url(/img/logos/icon_gitea.png)]">
           <%= link_to Setting.gitea_public_url,
-                class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>
+                class: "block h-full px-6 py-6 rounded-md" do %>
             <h3 class="mb-3.5">Gitea</h3>
             <p class="text-gray-600">
               Code hosting and collaboration for software projects
@@ -101,7 +99,7 @@
                     bg-[length:86%] bg-[center_top_-60px] bg-no-repeat
                     bg-[url(/img/logos/icon_droneci.svg)]">
           <%= link_to Setting.droneci_public_url,
-                class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>
+                class: "block h-full px-6 py-6 rounded-md" do %>
             <h3 class="mb-3.5">Drone CI</h3>
             <p class="text-gray-600">
               Continuous integration for software projects on Gitea
@@ -114,10 +112,10 @@
                     bg-cover bg-[center_top_-20px] bg-no-repeat
                     bg-[url(/img/logos/icon_mediawiki.svg)]">
           <%= link_to Setting.mediawiki_public_url,
-                class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>
+                class: "block h-full px-6 py-6 rounded-md" do %>
             <h3 class="mb-3.5">Wiki</h3>
             <p class="text-gray-600">
-              Documentation and knowledge base
+              Kosmos documentation and knowledge base
             </p>
           <% end %>
         </div>

app/views/devise/sessions/new.html.erb

@@ -47,7 +47,7 @@
             data: { action: "click->settings--toggle#toggleSwitch" } %>
       <p class="grow text-sm text-right">
         <%= link_to "Forgot your password?", new_password_path(resource_name),
-              class: "text-gray-500 visited:text-gray-500 underline" %><br />
+              class: "text-gray-500 underline" %><br />
       </p>
     <% end %>
 

app/views/devise/shared/_error_messages.html.erb

@@ -1,5 +1,5 @@
 <% if resource.errors.any? %>
-  <div id="error_explanation" class="mb-6">
+  <div id="error_explanation">
     <ul>
       <% resource.errors.full_messages.each do |message| %>
         <li class="text-red-600"><%= message %></li>

app/views/devise/shared/_links.html.erb

@@ -2,28 +2,28 @@
   <%- if controller_name != 'sessions' %>
     <p class="mb-2">
       <%= link_to "Log in", new_session_path(resource_name),
-            class: "text-gray-500 visited:text-gray-500 underline" %>
+            class: "text-gray-500 underline" %>
     </p>
   <% end %>
 
   <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
     <p class="mb-2">
       <%= link_to "Forgot your password?", new_password_path(resource_name),
-            class: "text-gray-500 visited:text-gray-500 underline" %>
+            class: "text-gray-500 underline" %>
     </p>
   <% end %>
 
   <%- if devise_mapping.confirmable? && !controller_name.match(/^(confirmations|sessions)$/) %>
     <p class="mb-2">
       <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name),
-            class: "text-gray-500 visited:text-gray-500 underline" %>
+            class: "text-gray-500 underline" %>
     </p>
   <% end %>
 
   <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
     <p class="mb-2">
       <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name),
-            class: "text-gray-500 visited:text-gray-500 underline" %>
+            class: "text-gray-500 underline" %>
     </p>
   <% end %>
 </div>

app/views/icons/_activity.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-activity <%= local_assigns[:custom_class] %>"><polyline points="22 12 18 12 15 21 9 3 6 12 2 12"></polyline></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-activity"><polyline points="22 12 18 12 15 21 9 3 6 12 2 12"></polyline></svg>

app/views/icons/_airplay.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-airplay <%= local_assigns[:custom_class] %>"><path d="M5 17H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2h-1"></path><polygon points="12 15 17 21 7 21 12 15"></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-airplay"><path d="M5 17H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2h-1"></path><polygon points="12 15 17 21 7 21 12 15"></polygon></svg>

app/views/icons/_alert-circle.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-alert-circle <%= local_assigns[:custom_class] %>"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="12"></line><line x1="12" y1="16" x2="12.01" y2="16"></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-alert-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="12"></line><line x1="12" y1="16" x2="12.01" y2="16"></line></svg>

app/views/icons/_alert-octagon.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-alert-octagon <%= local_assigns[:custom_class] %>"><polygon points="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"></polygon><line x1="12" y1="8" x2="12" y2="12"></line><line x1="12" y1="16" x2="12.01" y2="16"></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-alert-octagon"><polygon points="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"></polygon><line x1="12" y1="8" x2="12" y2="12"></line><line x1="12" y1="16" x2="12.01" y2="16"></line></svg>

app/views/icons/_alert-triangle.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-alert-triangle <%= local_assigns[:custom_class] %>"><path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path><line x1="12" y1="9" x2="12" y2="13"></line><line x1="12" y1="17" x2="12.01" y2="17"></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-alert-triangle <%= custom_class %>"><path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path><line x1="12" y1="9" x2="12" y2="13"></line><line x1="12" y1="17" x2="12.01" y2="17"></line></svg>

app/views/icons/_align-center.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-align-center <%= local_assigns[:custom_class] %>"><line x1="18" y1="10" x2="6" y2="10"></line><line x1="21" y1="6" x2="3" y2="6"></line><line x1="21" y1="14" x2="3" y2="14"></line><line x1="18" y1="18" x2="6" 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-align-center"><line x1="18" y1="10" x2="6" y2="10"></line><line x1="21" y1="6" x2="3" y2="6"></line><line x1="21" y1="14" x2="3" y2="14"></line><line x1="18" y1="18" x2="6" y2="18"></line></svg>

app/views/icons/_align-justify.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-align-justify <%= local_assigns[:custom_class] %>"><line x1="21" y1="10" x2="3" y2="10"></line><line x1="21" y1="6" x2="3" y2="6"></line><line x1="21" y1="14" x2="3" y2="14"></line><line x1="21" y1="18" x2="3" 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-align-justify"><line x1="21" y1="10" x2="3" y2="10"></line><line x1="21" y1="6" x2="3" y2="6"></line><line x1="21" y1="14" x2="3" y2="14"></line><line x1="21" y1="18" x2="3" y2="18"></line></svg>

app/views/icons/_align-left.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-align-left <%= local_assigns[:custom_class] %>"><line x1="17" y1="10" x2="3" y2="10"></line><line x1="21" y1="6" x2="3" y2="6"></line><line x1="21" y1="14" x2="3" y2="14"></line><line x1="17" y1="18" x2="3" 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-align-left"><line x1="17" y1="10" x2="3" y2="10"></line><line x1="21" y1="6" x2="3" y2="6"></line><line x1="21" y1="14" x2="3" y2="14"></line><line x1="17" y1="18" x2="3" y2="18"></line></svg>