Merge branch 'feature/ejabberd_pep' into live

Gemfile

@@ -32,7 +32,6 @@ gem 'devise_ldap_authenticatable'
 gem 'net-ldap'
 
 # Utilities
-gem 'aasm'
 gem "image_processing", "~> 1.12.2"
 gem "rqrcode", "~> 2.0"
 gem 'rails-settings-cached', '~> 2.8.3'
@@ -42,7 +41,6 @@ gem 'flipper-active_record'
 gem 'flipper-ui'
 gem 'gpgme', '~> 2.0.24'
 gem 'zbase32', '~> 0.1.1'
-gem 'kramdown'
 
 # HTTP requests
 gem 'faraday'

Gemfile.lock

@@ -1,8 +1,6 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    aasm (5.5.0)
-      concurrent-ruby (~> 1.0)
     actioncable (8.0.2)
       actionpack (= 8.0.2)
       activesupport (= 8.0.2)
@@ -528,7 +526,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  aasm
   aws-sdk-s3
   bcrypt (~> 3.1)
   capybara
@@ -549,7 +546,6 @@ DEPENDENCIES
   image_processing (~> 1.12.2)
   importmap-rails
   jbuilder (~> 2.7)
-  kramdown
   letter_opener
   letter_opener_web
   listen (~> 3.2)

README.md

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

app/assets/stylesheets/application.tailwind.css

@@ -7,6 +7,7 @@
 @import "components/buttons";
 @import "components/dashboard_services";
 @import "components/forms";
+@import "components/links";
 @import "components/notifications";
 @import "components/pagination";
 @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 text-white
-    @apply bg-blue-500 hover:bg-blue-600
            focus:ring-blue-400 focus:ring-opacity-75;
   }
 
   .btn-emerald {
-    @apply btn-text-light;
+    @apply bg-emerald-500 hover:bg-emerald-600 text-white
-    @apply bg-emerald-500 hover:bg-emerald-600
            focus:ring-emerald-400 focus:ring-opacity-75;
   }
 
   .btn-red {
-    @apply btn-text-light;
+    @apply bg-red-600 hover:bg-red-700 text-white
-    @apply bg-red-600 hover:bg-red-700
            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/components/app_catalog/web_app_icon_component.rb

@@ -2,8 +2,6 @@
 
 module AppCatalog
   class WebAppIconComponent < ViewComponent::Base
-    include ApplicationHelper
-
     def initialize(web_app:)
       if web_app&.icon&.attached?
         @image_url = image_url_for(web_app.icon)

app/components/dropdown_link_component.html.erb

@@ -1,4 +1,4 @@
-<%= link_to @href, class: @class, target: @target, data: {
+<%= link_to @href, class: @class, data: {
       'dropdown-target': "menuItem",
       'action': "keydown.up->dropdown#previousItem:prevent keydown.down->dropdown#nextItem:prevent"
     } do %>

app/components/dropdown_link_component.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 class DropdownLinkComponent < ViewComponent::Base
-  def initialize(href:, open_in_new_tab: false, separator: false, add_class: nil)
+  def initialize(href:, separator: false, add_class: nil)
     @href = href
-    @target = open_in_new_tab ? "_blank" : nil
     @class = class_str(separator, add_class)
   end
 

app/components/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,9 +0,0 @@
-<% if @editable_content.has_content? %>
-  <% if @editable_content.rich_text %>
-    <%= helpers.markdown_to_html @editable_content.content %>
-  <% 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/rs_auth_component.html.erb

@@ -12,8 +12,7 @@
   </div>
   <%= render DropdownComponent.new do %>
     <%= render DropdownLinkComponent.new(
-          href: launch_app_services_storage_rs_auth_url(@auth),
+          href: launch_app_services_storage_rs_auth_url(@auth)
-          open_in_new_tab: true
         ) do %>
       Launch app
     <% end %>

app/components/sidenav_link_component.rb

@@ -29,7 +29,7 @@ class SidenavLinkComponent < ViewComponent::Base
 
   def class_names_icon(path)
     if @active
-      "text-teal-600 group-hover:text-teal-600 flex-shrink-0 -ml-1 mr-3 h-6 w-6"
+      "text-teal-500 group-hover:text-teal-500 flex-shrink-0 -ml-1 mr-3 h-6 w-6"
     elsif @disabled
       "text-gray-300 group-hover:text-gray-300 flex-shrink-0 -ml-1 mr-3 h-6 w-6"
     else

app/controllers/admin/donations_controller.rb

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

app/controllers/admin/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
+    @current_section = :invitations
-    accepted_scope = Invitation.used.order('used_at desc')
+    @pagy, @invitations_used = pagy(Invitation.used.order('used_at desc'))
-    unused_scope = Invitation.unused
-
-    if @username
-      accepted_scope = accepted_scope.joins(:user).where(users: { cn: @username })
-      unused_scope = unused_scope.joins(:user).where(users: { cn: @username })
-    end
-
-    @pagy, @invitations_used = pagy(accepted_scope)
 
     @stats = {
-      available: unused_scope.count,
+      available: Invitation.unused.count,
-      accepted: accepted_scope.count,
+      accepted: @invitations_used.length,
-      users_with_referrals: accepted_scope.distinct.count(:user_id)
+      users_with_referrals: Invitation.used.distinct.count(:user_id)
     }
   end
-
-  private
-
-    def set_current_section
-      @current_section = :invitations
-    end
 end

app/controllers/admin/settings/membership_controller.rb

@@ -1,23 +0,0 @@
-class Admin::Settings::MembershipController < Admin::SettingsController
-  def show
-  end
-
-  def update
-    update_settings
-
-    redirect_to admin_settings_membership_path, flash: {
-      success: "Settings saved"
-    }
-  end
-
-  private
-
-    def setting_params
-      params.require(:setting).permit([
-        :member_status_contributor,
-        :member_status_sustainer,
-        :user_index_show_contributors,
-        :user_index_show_sustainers
-      ])
-    end
-end

app/controllers/admin/users_controller.rb

@@ -4,30 +4,18 @@ class Admin::UsersController < Admin::BaseController
 
   # GET /admin/users
   def index
-    ldap = LdapService.new
+    ldap   = LdapService.new
-    ou   = Setting.primary_domain
+    @ou    = Setting.primary_domain
-    @show_contributors = Setting.user_index_show_contributors
+    @pagy, @users = pagy(User.where(ou: @ou).order(cn: :asc))
-    @show_sustainers = Setting.user_index_show_sustainers
-
-    @contributors = ldap.search_users(:memberStatus, :contributor, :cn) if @show_contributors
-    @sustainers   = ldap.search_users(:memberStatus, :sustainer, :cn) if @show_sustainers
-    @admins       = ldap.search_users(:admin, true, :cn)
-    @pagy, @users = pagy(User.where(ou: ou).order(cn: :asc))
 
     @stats = {
-      users_confirmed: User.where(ou: ou).confirmed.count,
+      users_confirmed: User.where(ou: @ou).confirmed.count,
-      users_pending: User.where(ou: ou).pending.count
+      users_pending: User.where(ou: @ou).pending.count
     }
-    @stats[:users_contributing] = @contributors.size if @show_contributors
-    @stats[:users_paying] = @sustainers.size if @show_sustainers
   end
 
   # GET /admin/users/:username
   def show
-    @invitees = @user.invitees
-    @recent_invitees = @user.invitees.order(created_at: :desc).limit(5)
-    @more_invitees = (@invitees - @recent_invitees).count
-
     if Setting.lndhub_admin_enabled?
       @lndhub_user = @user.lndhub_user
     end

app/controllers/contributions/donations_controller.rb

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

app/controllers/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/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/services/rs_auths_controller.rb

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

app/controllers/settings_controller.rb

@@ -35,7 +35,7 @@ class SettingsController < ApplicationController
 
       if @user.avatar_new.present?
         if store_user_avatar
-          UserManager::UpdateAvatar.call(user: @user)
+          LdapManager::UpdateAvatar.call(user: @user)
         else
           @validation_errors = @user.errors
           render :show, status: :unprocessable_entity and return
@@ -192,11 +192,7 @@ class SettingsController < ApplicationController
 
     def store_user_avatar
       io = @user.avatar_new.tempfile
-      img_data = UserManager::ProcessAvatar.call(io: io)
+      img_data = process_avatar(io)
-      if img_data.blank?
-        @user.errors.add(:avatar, "failed to process file")
-        false
-      end
       tempfile = Tempfile.create
       tempfile.binmode
       tempfile.write(img_data)
@@ -215,4 +211,18 @@ class SettingsController < ApplicationController
         @user.save
       end
     end
+
+    def process_avatar(io)
+      processed = ImageProcessing::Vips
+        .source(io)
+        .resize_to_fill(400, 400)
+        .saver(strip: true)
+        .call
+      io.rewind
+      processed.read
+    rescue Vips::Error => e
+      Sentry.capture_exception(e) if Setting.sentry_enabled?
+      Rails.logger.error { "Image processing failed for avatar: #{e.message}" }
+      nil
+    end
 end

app/controllers/web_key_directory_controller.rb

@@ -1,16 +1,8 @@
 class WebKeyDirectoryController < WellKnownController
   before_action :allow_cross_origin_requests
 
-  # /.well-known/openpgpkey/hu/:hashed_username(.txt)?l=username
+  # /.well-known/openpgpkey/hu/:hashed_username(.txt)
   def show
-    if params[:l].blank?
-      # TODO store hashed username in db if existing implementations trigger
-      # this a lot
-      msg = "WKD request with \"l\" param omitted for hu: #{params[:hashed_username]}"
-      Sentry.capture_message(msg) if Setting.sentry_enabled?
-      http_status :bad_request and return
-    end
-
     @user = User.find_by(cn: params[:l].downcase)
 
     if @user.nil? ||

app/helpers/application_helper.rb

@@ -15,10 +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/jobs/btcpay_check_donation_job.rb

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

app/jobs/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 +0,0 @@
-class XmppSetAvatarJob < ApplicationJob
-  queue_as :default
-
-  def perform(user:, overwrite: false)
-    EjabberdManager::SetAvatar.call(user:, overwrite:)
-  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/mastodon_settings.rb

@@ -11,9 +11,6 @@ module Settings
 
       field :mastodon_address_domain, type: :string,
         default: ENV["MASTODON_ADDRESS_DOMAIN"].presence || self.primary_domain
-
-      field :mastodon_auth_token, type: :string,
-        default: ENV["MASTODON_AUTH_TOKEN"].presence
     end
   end
 end

app/models/concerns/settings/membership_settings.rb

@@ -1,18 +0,0 @@
-module Settings
-  module MembershipSettings
-    extend ActiveSupport::Concern
-
-    included do
-      field :member_status_contributor, type: :string,
-        default: "Contributor"
-      field :member_status_sustainer, type: :string,
-        default: "Sustainer"
-
-      # Admin panel
-      field :user_index_show_contributors, type: :boolean,
-        default: false
-      field :user_index_show_sustainers, type: :boolean,
-        default: false
-    end
-  end
-end

app/models/donation.rb

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

app/models/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/setting.rb

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

app/models/user.rb

@@ -131,11 +131,11 @@ class User < ApplicationRecord
   end
 
   def is_admin?
-    @admin ||= if admin = Devise::LDAP::Adapter.get_ldap_param(self.cn, :admin)
+    admin ||= if admin = Devise::LDAP::Adapter.get_ldap_param(self.cn, :admin)
-                 !!admin.first
+                !!admin.first
-               else
+              else
-                 false
+                false
-               end
+              end
   end
 
   def address
@@ -163,21 +163,7 @@ class User < ApplicationRecord
 
   def ldap_entry(reload: false)
     return @ldap_entry if defined?(@ldap_entry) && !reload
-    @ldap_entry = ldap.fetch_users(cn: self.cn).first
+    @ldap_entry = ldap.fetch_users(uid: self.cn, ou: self.ou).first
-  end
-
-  def add_to_ldap_array(attr_key, ldap_attr, value)
-    current_entries = ldap_entry[attr_key.to_sym] || []
-    new_entries = Array(value).map(&:to_s)
-    entries = (current_entries + new_entries).uniq.sort
-    ldap.replace_attribute(dn, ldap_attr.to_sym, entries)
-  end
-
-  def remove_from_ldap_array(attr_key, ldap_attr, value)
-    current_entries = ldap_entry[attr_key.to_sym] || []
-    entries_to_remove = Array(value).map(&:to_s)
-    entries = (current_entries - entries_to_remove).uniq.sort
-    ldap.replace_attribute(dn, ldap_attr.to_sym, entries)
   end
 
   def display_name
@@ -234,39 +220,21 @@ class User < ApplicationRecord
   end
 
   def enable_service(service)
-    add_to_ldap_array :services_enabled, :serviceEnabled, service
+    current_services = services_enabled
-    ldap_entry(reload: true)[:services_enabled]
+    new_services = Array(service).map(&:to_s)
+    services = (current_services + new_services).uniq.sort
+    ldap.replace_attribute(dn, :serviceEnabled, services)
   end
 
   def disable_service(service)
-    remove_from_ldap_array :services_enabled, :serviceEnabled, service
+    current_services = services_enabled
-    ldap_entry(reload: true)[:services_enabled]
+    disabled_services = Array(service).map(&:to_s)
+    services = (current_services - disabled_services).uniq.sort
+    ldap.replace_attribute(dn, :serviceEnabled, services)
   end
 
   def disable_all_services
-    ldap.delete_attribute(dn, :serviceEnabled)
+    ldap.delete_attribute(dn,:service)
-  end
-
-  def member_status
-    ldap_entry[:member_status] || []
-  end
-
-  def add_member_status(status)
-    add_to_ldap_array :member_status, :memberStatus, status
-    ldap_entry(reload: true)[:member_status]
-  end
-
-  def remove_member_status(status)
-    remove_from_ldap_array :member_status, :memberStatus, status
-    ldap_entry(reload: true)[:member_status]
-  end
-
-  def is_contributing_member?
-    member_status.map(&:to_sym).include?(:contributor)
-  end
-
-  def is_paying_member?
-    member_status.map(&:to_sym).include?(:sustainer)
   end
 
   private

app/services/btcpay_manager_service.rb

@@ -1,22 +1,36 @@
 #
 # API Docs: https://docs.btcpayserver.org/API/Greenfield/v1/
 #
-class BtcpayManagerService < RestApiService
+class BtcpayManagerService < ApplicationService
   private
 
-  def base_url
+    def base_url
-    @base_url ||= "#{Setting.btcpay_api_url}/stores/#{Setting.btcpay_store_id}"
+      @base_url ||= "#{Setting.btcpay_api_url}/stores/#{Setting.btcpay_store_id}"
-  end
+    end
 
-  def auth_token
+    def auth_token
-    @auth_token ||= Setting.btcpay_auth_token
+      @auth_token ||= Setting.btcpay_auth_token
-  end
+    end
 
-  def headers
+    def headers
-    {
+      {
-      "Content-Type" => "application/json",
+        "Content-Type" => "application/json",
-      "Accept" => "application/json",
+        "Accept" => "application/json",
-      "Authorization" => "token #{auth_token}"
+        "Authorization" => "token #{auth_token}"
-    }
+      }
-  end
+    end
+
+    def endpoint_url(path)
+      "#{base_url}/#{path.gsub(/^\//, '')}"
+    end
+
+    def get(path, params = {})
+      res = Faraday.get endpoint_url(path), params, headers
+      JSON.parse(res.body)
+    end
+
+    def post(path, payload)
+      res = Faraday.post endpoint_url(path), payload.to_json, headers
+      JSON.parse(res.body)
+    end
 end

app/services/ejabberd_api_client.rb

@@ -1,16 +1,19 @@
-class EjabberdManagerService < RestApiService
+class EjabberdApiClient
-  private
+  def initialize
-
+    @base_url = Setting.ejabberd_api_url
-  def base_url
-    @base_url ||= Setting.ejabberd_api_url
   end
 
-  def headers
+  def post(endpoint, payload)
-    { "Content-Type" => "application/json" }
+    res = Faraday.post("#{@base_url}/#{endpoint}", payload.to_json,
-  end
+                       "Content-Type" => "application/json")
 
-  def parse_responses?
+    if res.status != 200
-    false
+      #TODO Send custom event to Sentry
+      Rails.logger.error "[ejabberd] API request failed:"
+      Rails.logger.error res.body
+    end
+
+    res
   end
 
   #
@@ -21,14 +24,6 @@ class EjabberdManagerService < RestApiService
     post "add_rosteritem", payload
   end
 
-  def send_message(payload)
-    post "send_message", payload
-  end
-
-  def send_stanza(payload)
-    post "send_stanza", payload
-  end
-
   def get_vcard2(user, name, subname)
     payload = {
       user: user.cn, host: user.ou,
@@ -52,4 +47,8 @@ class EjabberdManagerService < RestApiService
     }
     post "private_set", payload
   end
+
+  def send_message(payload)
+    post "send_message", payload
+  end
 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
-  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

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/ldap_manager/update_display_name.rb

@@ -6,11 +6,7 @@ module LdapManager
     end
 
     def call
-      if @display_name.present?
+      replace_attribute @dn, :displayName, @display_name
-        replace_attribute @dn, :displayName, @display_name
-      else
-        delete_attribute @dn, :displayName
-      end
     end
   end
 end

app/services/ldap_service.rb

@@ -50,17 +50,19 @@ class LdapService < ApplicationService
   end
 
   def fetch_users(args={})
+    if args[:ou]
+      treebase = "ou=#{args[:ou]},cn=users,#{ldap_suffix}"
+    else
+      treebase = ldap_config["base"]
+    end
+
     attributes = %w[
-      dn cn uid mail displayName admin serviceEnabled memberStatus
+      dn cn uid mail displayName admin serviceEnabled
       mailRoutingAddress mailpassword nostrKey pgpKey
     ]
-    filter = Net::LDAP::Filter.eq('objectClass', 'person') &
+    filter = Net::LDAP::Filter.eq("uid", args[:uid] || "*")
-             Net::LDAP::Filter.eq("cn", args[:cn] || "*")
 
-    entries = client.search(
+    entries = client.search(base: treebase, filter: filter, attributes: attributes)
-      base: ldap_config["base"], filter: filter,
-      attributes: attributes
-    )
     entries.sort_by! { |e| e.cn[0] }
     entries = entries.collect do |e|
       {
@@ -69,7 +71,6 @@ class LdapService < ApplicationService
         display_name: e.try(:displayName) ? e.displayName.first : nil,
         admin: e.try(:admin) ? 'admin' : nil,
         services_enabled: e.try(:serviceEnabled),
-        member_status: e.try(:memberStatus),
         email_maildrop: e.try(:mailRoutingAddress),
         email_password: e.try(:mailpassword),
         nostr_key: e.try(:nostrKey) ? e.nostrKey.first : nil,
@@ -78,20 +79,10 @@ class LdapService < ApplicationService
     end
   end
 
-  def search_users(search_attr, value, return_attr)
-    filter = Net::LDAP::Filter.eq('objectClass', 'person') &
-             Net::LDAP::Filter.eq(search_attr.to_s, value.to_s) &
-             Net::LDAP::Filter.present('cn')
-    entries = client.search(
-      base: ldap_config["base"], filter: filter,
-      attributes: [return_attr]
-    )
-    entries.map { |entry| entry[return_attr].first }.compact
-  end
-
   def fetch_organizations
     attributes = %w{dn ou description}
     filter     = Net::LDAP::Filter.eq("objectClass", "organizationalUnit")
+    # filter     = Net::LDAP::Filter.eq("objectClass", "*")
     treebase   = "cn=users,#{ldap_suffix}"
 
     entries = client.search(base: treebase, filter: filter, attributes: attributes)

app/services/mastodon_manager/fetch_user.rb

@@ -1,12 +0,0 @@
-module MastodonManager
-  class FetchUser < MastodonManagerService
-    def initialize(mastodon_id:)
-      @mastodon_id = mastodon_id
-    end
-
-    def call
-      user = get "v1/admin/accounts/#{@mastodon_id}"
-      user.with_indifferent_access
-    end
-  end
-end

app/services/mastodon_manager/find_user.rb

@@ -1,14 +0,0 @@
-module MastodonManager
-  class FindUser < MastodonManagerService
-    def initialize(username:)
-      @username = username
-    end
-
-    def call
-      users = get "v2/admin/accounts?username=#{@username}&origin=local"
-      users = users.map { |u| u.with_indifferent_access }
-      # Results may contain partial matches
-      users.find { |u| u.dig(:username).downcase == @username.downcase }
-    end
-  end
-end

app/services/mastodon_manager/sync_account_profiles.rb

@@ -1,64 +0,0 @@
-module MastodonManager
-  class SyncAccountProfiles < MastodonManagerService
-    def initialize(direction: "down", overwrite: false, user: nil)
-      @direction = direction
-      @overwrite = overwrite
-      @user = user
-
-      if @direction != "down"
-        raise NotImplementedError
-      end
-    end
-
-    def call
-      if @user
-        Rails.logger.debug { "Syncing account profile for user #{@user.cn} (direction: #{@direction}, overwrite: #{@overwrite})"}
-        users = User.where(cn: @user.cn)
-      else
-        Rails.logger.debug { "Syncing account profiles (direction: #{@direction}, overwrite: #{@overwrite})"}
-        users = User
-      end
-
-      users.find_each do |user|
-        if user.mastodon_id.blank?
-          mastodon_user = MastodonManager::FindUser.call username: user.cn
-          if mastodon_user
-            Rails.logger.debug { "Setting mastodon_id for user #{user.cn}" }
-            user.update! mastodon_id: mastodon_user.dig(:account, :id).to_i
-          else
-            Rails.logger.debug { "No Mastodon user found for username #{user.cn}" }
-            next
-          end
-        end
-
-        next if user.avatar.attached? && user.display_name.present?
-
-        unless mastodon_user
-          Rails.logger.debug { "Fetching Mastodon account with ID #{user.mastodon_id} for #{user.cn}" }
-          mastodon_user = MastodonManager::FetchUser.call mastodon_id: user.mastodon_id
-        end
-
-        if user.display_name.blank?
-          if mastodon_display_name = mastodon_user.dig(:account, :display_name)
-            Rails.logger.debug { "Setting display name for user #{user.cn} from Mastodon" }
-            LdapManager::UpdateDisplayName.call(
-              dn: user.dn, display_name: mastodon_display_name
-            )
-          end
-        end
-
-        if !user.avatar.attached?
-          if avatar_url = mastodon_user.dig(:account, :avatar_static)
-            Rails.logger.debug { "Importing Mastodon avatar for user #{user.cn}" }
-            UserManager::ImportRemoteAvatar.call(
-              user: user, avatar_url: avatar_url
-            )
-          end
-        end
-      rescue => e
-        Sentry.capture_exception(e) if Setting.sentry_enabled?
-        Rails.logger.error e
-      end
-    end
-  end
-end

app/services/mastodon_manager_service.rb

@@ -1,22 +0,0 @@
-#
-# API Docs: https://docs.joinmastodon.org/methods/
-#
-class MastodonManagerService < RestApiService
-  private
-
-  def base_url
-    @base_url ||= "#{Setting.mastodon_public_url}/api"
-  end
-
-  def auth_token
-    @auth_token ||= Setting.mastodon_auth_token
-  end
-
-  def headers
-    {
-      "Content-Type" => "application/json",
-      "Accept" => "application/json",
-      "Authorization" => "Bearer #{auth_token}"
-    }
-  end
-end

app/services/rest_api_service.rb

@@ -1,29 +0,0 @@
-class RestApiService < ApplicationService
-  private
-
-  def base_url
-    raise NotImplementedError
-  end
-
-  def headers
-    raise NotImplementedError
-  end
-
-  def endpoint_url(path)
-    "#{base_url}/#{path.gsub(/^\//, '')}"
-  end
-
-  def parse_responses?
-    true
-  end
-
-  def get(path, params = {})
-    res = Faraday.get endpoint_url(path), params, headers
-    parse_responses? ? JSON.parse(res.body) : res
-  end
-
-  def post(path, payload)
-    res = Faraday.post endpoint_url(path), payload.to_json, headers
-    parse_responses? ? JSON.parse(res.body) : res
-  end
-end

app/services/user_manager/import_remote_avatar.rb

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

app/services/user_manager/process_avatar.rb

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

app/services/user_manager/update_avatar.rb

@@ -1,16 +0,0 @@
-module UserManager
-  class UpdateAvatar < UserManagerService
-    def initialize(user:)
-      @user = user
-    end
-
-    def call
-      LdapManager::UpdateAvatar.call(user: @user)
-
-      if Setting.ejabberd_enabled?
-        return if Rails.env.development?
-        XmppSetAvatarJob.perform_later(user: @user)
-      end
-    end
-  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",
+  <% if @donations.any? %>
-               locals: { path: admin_donations_path } %>
+    <h3>Recent Donations</h3>
-  </section>
+    <table class="divided mb-8">
-
+      <thead>
-  <% if @pending_donations.present? %>
+        <tr>
-  <section>
+          <th>User</th>
-    <h3>Pending</h3>
+          <th class="text-right">Sats</th>
-    <%= render partial: "admin/donations/list", locals: {
+          <th class="text-right">Fiat Amount</th>
-          donations: @pending_donations
+          <th class="pl-2">Public name</th>
-        } %>
+          <th>Date</th>
-  </section>
+          <th></th>
-  <% end %>
+        </tr>
-
+      </thead>
-  <section>
+      <tbody>
-  <% if @donations.present? %>
+        <% @donations.each do |donation| %>
-    <h3>Received</h3>
+          <tr>
-    <%= render partial: "admin/donations/list", locals: {
+            <td><%= link_to donation.user.cn, admin_user_path(donation.user.cn), class: 'ks-text-link' %></td>
-          donations: @donations, pagy: @pagy
+            <td class="text-right"><% if donation.amount_sats.present? %><%= number_with_delimiter donation.amount_sats %><% end %></td>
-        } %>
+            <td class="text-right"><% if donation.fiat_amount.present? %><%= number_to_currency donation.fiat_amount.to_f / 100, unit: "" %> <%= donation.fiat_currency %><% end %></td>
+            <td class="pl-2"><%= donation.public_name %></td>
+            <td><%= donation.paid_at ? donation.paid_at.strftime("%Y-%m-%d (%H:%M UTC)") : "" %></td>
+            <td class="text-right">
+              <%= link_to 'Show', admin_donation_path(donation), class: 'btn btn-sm btn-gray' %>
+              <%= link_to 'Edit', edit_admin_donation_path(donation), class: 'btn btn-sm btn-gray' %>
+              <%= link_to 'Destroy', admin_donation_path(donation), class: 'btn btn-sm btn-red',
+                data: { turbo_method: :delete, turbo_confirm: 'Are you sure?' } %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+    <%== pagy_nav @pagy %>
   <% else %>
     <p>
-      No donations received yet.
+      No donations yet.
     </p>
   <% end %>
   </section>

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

@@ -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>
+          <th>Date</th>
-          <td><%= @donation.payment_status %></td>
-        </tr>
-        <tr>
-          <th>Created at</th>
-          <td><%= @donation.created_at&.strftime("%Y-%m-%d (%H:%M UTC)") %></td>
-        </tr>
-        <tr>
-          <th>Paid at</th>
           <td><%= @donation.paid_at&.strftime("%Y-%m-%d (%H:%M UTC)") %></td>
         </tr>
       </tbody>

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

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

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

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

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

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

@@ -13,20 +13,6 @@
           title: 'Pending',
           value: @stats[:users_pending],
       ) %>
-      <% if @show_contributors %>
-      <%= render QuickstatsItemComponent.new(
-          type: :number,
-          title: Setting.member_status_contributor.pluralize,
-          value: @stats[:users_contributing],
-      ) %>
-      <% end %>
-      <% if @show_sustainers %>
-      <%= render QuickstatsItemComponent.new(
-          type: :number,
-          title: Setting.member_status_sustainer.pluralize,
-          value: @stats[:users_paying],
-      ) %>
-      <% end %>
     <% end %>
   </section>
 
@@ -42,13 +28,9 @@
       <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>
+          <td><%= user.confirmed_at.nil? ? badge("pending", :yellow) : "" %></td>
-            <%= user.confirmed_at.nil? ? badge("pending", :yellow) : "" %>
+          <td><%= user.is_admin? ? badge("admin", :red) : "" %></td>
-            <% if @show_contributors %><%= @contributors.include?(user.cn) ? badge("contributor", :green) : "" %><% end %>
-            <% if @show_sustainers %><%= @sustainers.include?(user.cn) ? badge("sustainer", :green) : "" %><% end %>
-          </td>
-          <td><%= @admins.include?(user.cn) ? badge("admin", :red) : "" %></td>
         </tr>
         <% end %>
       </tbody>

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

@@ -32,35 +32,11 @@
             <th>Roles</th>
             <td><%= @user.is_admin? ? badge("admin", :red) : "—" %></td>
           </tr>
-          <tr>
-            <th>Status</th>
-            <td>
-            <% if @user.is_contributing_member? || @user.is_paying_member? %>
-              <%= @user.is_contributing_member? ? badge("contributor", :green) : "" %>
-              <%= @user.is_paying_member? ? badge("sustainer", :green) : "" %>
-            <% else %>
-              —
-            <% end %>
-            </td>
-          </tr>
-          <tr>
-            <th>Donations</th>
-            <td>
-            <% if @user.donations.any? %>
-              <%= link_to admin_donations_path(username: @user.cn) do %>
-                <%= @user.donations.completed.count %> for
-                <%= number_with_delimiter @user.donations.completed.sum("amount_sats") %> sats
-              <% end %>
-            <% else %>
-              —
-            <% end %>
-            </td>
-          </tr>
           <tr>
             <th>Invited by</th>
             <td>
             <% 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 +45,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 +75,10 @@
           <tr>
             <th class="align-top">Invited users</th>
             <td class="align-top">
-            <% if @invitees.any? %>
+            <% if @user.invitees.length > 0 %>
               <ul class="mb-0">
-              <% @recent_invitees.each do |invitee| %>
+              <% @user.invitees.order(cn: :asc).each do |invitee| %>
-                <li class="leading-none mb-2 last:mb-0"><%= link_to invitee.cn, admin_user_path(invitee.cn) %></li>
+                <li class="leading-none mb-2 last:mb-0"><%= link_to invitee.cn, admin_user_path(invitee.cn), class: 'ks-text-link' %></li>
-              <% end %>
-              <% if @more_invitees > 0 %>
-                <li>and <%= link_to "#{@more_invitees} more", admin_invitations_path(username: @user.cn) %></li>
               <% end %>
               </ul>
             <% else %>&mdash;<% end %>
@@ -116,42 +89,14 @@
     </section>
 
     <section class="sm:flex-1 sm:pt-0">
-      <h3>Avatar</h3>
+      <h3>LDAP</h3>
-      <% if @user.avatar.attached? %>
-      <table class="divided">
-        <tbody>
-          <tr>
-            <th class="align-top">Image</th>
-            <td class="align-top">
-              <%= image_tag image_url_for(@user.avatar), class: "h-20 w-20 rounded-lg" %>
-            </td>
-          </tr>
-          <tr>
-            <th>Content type</th>
-            <td>
-              <%= @user.avatar.content_type %>
-            </td>
-          </tr>
-          <tr>
-            <th>Size</th>
-            <td>
-              <%= number_to_human_size(@user.avatar.blob.byte_size) %>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <% else %>
-      <p class="text-gray-500">No avatar uploaded</p>
-      <% end %>
-
-      <h3 class="mt-12">LDAP</h3>
       <table class="divided">
         <tbody>
           <tr>
             <th>Avatar</th>
             <td>
               <% if @ldap_avatar.present? %>
-                JPEG size: <%= number_to_human_size(@ldap_avatar.size) %>
+                JPEG size: <%= @ldap_avatar.size %>
               <% else %>
                 &mdash;
               <% end %>
@@ -168,7 +113,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 %>

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

app/views/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,
+          <%= link_to services_mastodon_path, class: "block h-full px-6 py-6 rounded-md" do %>
-                class: "block h-full px-6 py-6 rounded-md btn-text-dark" 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,
+          <%= link_to services_email_path, class: "block h-full px-6 py-6 rounded-md" do %>
-                class: "block h-full px-6 py-6 rounded-md btn-text-dark" 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/_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>

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

app/views/icons/_anchor.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-anchor <%= local_assigns[:custom_class] %>"><circle cx="12" cy="5" r="3"></circle><line x1="12" y1="22" x2="12" y2="8"></line><path d="M5 12H2a10 10 0 0 0 20 0h-3"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-anchor"><circle cx="12" cy="5" r="3"></circle><line x1="12" y1="22" x2="12" y2="8"></line><path d="M5 12H2a10 10 0 0 0 20 0h-3"></path></svg>

app/views/icons/_aperture.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-aperture <%= local_assigns[:custom_class] %>"><circle cx="12" cy="12" r="10"></circle><line x1="14.31" y1="8" x2="20.05" y2="17.94"></line><line x1="9.69" y1="8" x2="21.17" y2="8"></line><line x1="7.38" y1="12" x2="13.12" y2="2.06"></line><line x1="9.69" y1="16" x2="3.95" y2="6.06"></line><line x1="14.31" y1="16" x2="2.83" y2="16"></line><line x1="16.62" y1="12" x2="10.88" y2="21.94"></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-aperture"><circle cx="12" cy="12" r="10"></circle><line x1="14.31" y1="8" x2="20.05" y2="17.94"></line><line x1="9.69" y1="8" x2="21.17" y2="8"></line><line x1="7.38" y1="12" x2="13.12" y2="2.06"></line><line x1="9.69" y1="16" x2="3.95" y2="6.06"></line><line x1="14.31" y1="16" x2="2.83" y2="16"></line><line x1="16.62" y1="12" x2="10.88" y2="21.94"></line></svg>

app/views/icons/_archive.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-archive <%= local_assigns[:custom_class] %>"><polyline points="21 8 21 21 3 21 3 8"></polyline><rect x="1" y="3" width="22" height="5"></rect><line x1="10" y1="12" x2="14" y2="12"></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-archive"><polyline points="21 8 21 21 3 21 3 8"></polyline><rect x="1" y="3" width="22" height="5"></rect><line x1="10" y1="12" x2="14" y2="12"></line></svg>

app/views/icons/_arrow-down-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-arrow-down-circle <%= local_assigns[:custom_class] %>"><circle cx="12" cy="12" r="10"></circle><polyline points="8 12 12 16 16 12"></polyline><line x1="12" y1="8" x2="12" 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-arrow-down-circle"><circle cx="12" cy="12" r="10"></circle><polyline points="8 12 12 16 16 12"></polyline><line x1="12" y1="8" x2="12" y2="16"></line></svg>

app/views/icons/_arrow-down-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-arrow-down-left <%= local_assigns[:custom_class] %>"><line x1="17" y1="7" x2="7" y2="17"></line><polyline points="17 17 7 17 7 7"></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-arrow-down-left"><line x1="17" y1="7" x2="7" y2="17"></line><polyline points="17 17 7 17 7 7"></polyline></svg>

app/views/icons/_arrow-down-right.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-arrow-down-right <%= local_assigns[:custom_class] %>"><line x1="7" y1="7" x2="17" y2="17"></line><polyline points="17 7 17 17 7 17"></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-arrow-down-right"><line x1="7" y1="7" x2="17" y2="17"></line><polyline points="17 7 17 17 7 17"></polyline></svg>

app/views/icons/_arrow-down.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-arrow-down <%= local_assigns[:custom_class] %>"><line x1="12" y1="5" x2="12" y2="19"></line><polyline points="19 12 12 19 5 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-arrow-down"><line x1="12" y1="5" x2="12" y2="19"></line><polyline points="19 12 12 19 5 12"></polyline></svg>

app/views/icons/_arrow-left-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-arrow-left-circle <%= local_assigns[:custom_class] %>"><circle cx="12" cy="12" r="10"></circle><polyline points="12 8 8 12 12 16"></polyline><line x1="16" y1="12" x2="8" y2="12"></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-arrow-left-circle"><circle cx="12" cy="12" r="10"></circle><polyline points="12 8 8 12 12 16"></polyline><line x1="16" y1="12" x2="8" y2="12"></line></svg>

app/views/icons/_arrow-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-arrow-left <%= local_assigns[:custom_class] %>"><line x1="19" y1="12" x2="5" y2="12"></line><polyline points="12 19 5 12 12 5"></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-arrow-left"><line x1="19" y1="12" x2="5" y2="12"></line><polyline points="12 19 5 12 12 5"></polyline></svg>

app/views/icons/_arrow-right-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-arrow-right-circle <%= local_assigns[:custom_class] %>"><circle cx="12" cy="12" r="10"></circle><polyline points="12 16 16 12 12 8"></polyline><line x1="8" y1="12" x2="16" y2="12"></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-arrow-right-circle"><circle cx="12" cy="12" r="10"></circle><polyline points="12 16 16 12 12 8"></polyline><line x1="8" y1="12" x2="16" y2="12"></line></svg>

app/views/icons/_arrow-right.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-arrow-right <%= local_assigns[:custom_class] %>"><line x1="5" y1="12" x2="19" y2="12"></line><polyline points="12 5 19 12 12 19"></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-arrow-right"><line x1="5" y1="12" x2="19" y2="12"></line><polyline points="12 5 19 12 12 19"></polyline></svg>

app/views/icons/_arrow-up-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-arrow-up-circle <%= local_assigns[:custom_class] %>"><circle cx="12" cy="12" r="10"></circle><polyline points="16 12 12 8 8 12"></polyline><line x1="12" y1="16" x2="12" y2="8"></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-arrow-up-circle"><circle cx="12" cy="12" r="10"></circle><polyline points="16 12 12 8 8 12"></polyline><line x1="12" y1="16" x2="12" y2="8"></line></svg>