Merge branch 'master' into live

app/models/setting.rb

@@ -222,6 +222,6 @@ class Setting < RailsSettings::Base
 
   def self.default_services
     # TODO Make configurable from respective service settings page
-    %w[ discourse gitea mastodon mediawiki xmpp ]
+    %w[ discourse gitea mastodon mediawiki remotestorage xmpp ]
   end
 end

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

@@ -205,7 +205,9 @@
             ) %>
           </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/services/remotestorage/show.html.erb

@@ -14,7 +14,8 @@
     <p class="mb-6">
       In order to connect an app to your storage account, give it your address:
     </p>
-    <p data-controller="clipboard" class="flex gap-1 sm:w-2/5">
+    <p data-controller="clipboard" class="flex items-center gap-1 sm:w-2/5">
+      <img src="/img/logos/icon_remotestorage.svg" class="inline-block h-6 w-6 mr-1">
       <input type="text" id="user_address" class="grow"
              value=<%= current_user.address %> disabled="disabled"
              data-clipboard-target="source" />
@@ -31,6 +32,24 @@
     </p>
   </section>
 
+  <section>
+    <h3>Compatible Apps</h3>
+    <p>
+      Your Storage account is based on a new open standard called
+      <a href="https://remotestorage.io" target="_blank">
+        <img src="/img/logos/icon_remotestorage.svg" class="h-4 w-4 inline">
+        <strong>remoteStorage</strong>
+      </a>, which is not yet widely supported.  Look
+      for the remoteStorage icon, or check the Sync settings in apps.
+    </p>
+    <p>
+      If you want your favorite apps to support syncing data with your own
+      Storage account, let the developers know! All relevant information is
+      available on the <a href="https://remotestorage.io"
+        target="_blank" class="ks-text-link">remoteStorage website</a>.
+    </p>
+  </section>
+
   <section>
     <h3>Recommended Apps</h3>
     <div data-controller="tabs"

config/sidekiq.yml

@@ -1,4 +1,6 @@
 :concurrency: 2
+production:
+  :concurrency: 10
 :queues:
   - default
   - mailers

doc/integrations/strfry.md

@@ -1,29 +0,0 @@
-# strfry (nostr relay)
-
-## LDAP policy
-
-...
-
-## Useful scripts
-
-### Syncing events for all local nostr users from a remote relay
-
-You can sync all events of all local users with a pubkey stored in LDAP from a
-specified remote relay to the local relay with the `strfry-sync.ts` script:
-
-    deno run -A /opt/strfry-sync.ts wss://relay.example.com
-
-Doing the same with Docker Compose (great for seeding data to your local relay
-in development):
-
-    docker compose run strfry deno run -A /opt/strfry-sync.ts wss://relay.example.com
-
-## Docker image
-
-In order to use the LDAP policy with Docker, you will need
-[Deno](https://deno.com/) installed in your strfry container. We provide a
-custom Docker image for strfry with Deno included (which we use in
-development):
-
-* Registry: https://gitea.kosmos.org/kosmos/-/packages/container/strfry-deno/1.1.1
-* Source: https://github.com/raucao/strfry/blob/docker_deno/ubuntu.Dockerfile