0.8.0

Reviewed-on: #143
Reviewed-by: galfert <garret.alfert@gmail.com>

.env.example

@@ -22,6 +22,8 @@ WEBHOOKS_ALLOWED_IPS='10.1.1.163'
 DISCOURSE_PUBLIC_URL='https://community.kosmos.org'
 DISCOURSE_CONNECT_SECRET='discourse_connect_ftw'
 
+DRONECI_PUBLIC_URL='https://drone.kosmos.org'
+
 GITEA_PUBLIC_URL='https://gitea.kosmos.org'
 MASTODON_PUBLIC_URL='https://kosmos.social'
 MEDIAWIKI_PUBLIC_URL='https://wiki.kosmos.org'

.gitignore

@@ -39,6 +39,7 @@ yarn-debug.log*
 
 # Ignore local dotenv config file
 .env
+.env.development
 
 # Ignore redis dumps from sidekiq
 dump.rdb

app/controllers/services/mastodon_controller.rb

@@ -9,6 +9,6 @@ class Services::MastodonController < Services::BaseController
   private
 
     def require_service_available
-      http_status :not_found unless Setting.ejabberd_enabled?
+      http_status :not_found unless Setting.mastodon_enabled?
     end
 end

app/models/setting.rb

@@ -51,6 +51,16 @@ class Setting < RailsSettings::Base
   field :discourse_connect_secret, type: :string,
     default: ENV["DISCOURSE_CONNECT_SECRET"].presence
 
+  #
+  # Drone CI
+  #
+
+  field :droneci_public_url, type: :string,
+    default: ENV["DRONECI_PUBLIC_URL"].presence
+
+  field :droneci_enabled, type: :boolean,
+    default: (ENV["DRONECI_PUBLIC_URL"].present?.to_s || false)
+
   #
   # ejabberd
   #
@@ -106,6 +116,9 @@ class Setting < RailsSettings::Base
   field :mastodon_enabled, type: :boolean,
     default: (ENV["MASTODON_PUBLIC_URL"].present?.to_s || false)
 
+  field :mastodon_address_domain, type: :string,
+    default: ENV["MASTODON_ADDRESS_DOMAIN"].presence || self.primary_domain
+
   #
   # MediaWiki
   #

app/models/user.rb

@@ -110,6 +110,11 @@ class User < ApplicationRecord
     "#{self.cn}@#{self.ou}"
   end
 
+  def mastodon_address
+    return nil unless Setting.mastodon_enabled?
+    "#{self.cn}@#{Setting.mastodon_address_domain}"
+  end
+
   def valid_attribute?(attribute_name)
     self.valid?
     self.errors[attribute_name].blank?

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

@@ -0,0 +1,16 @@
+<h3>Drone CI</h3>
+<ul role="list">
+  <%= render FormElements::FieldsetToggleComponent.new(
+    form: f,
+    attribute: :droneci_enabled,
+    enabled: Setting.droneci_enabled?,
+    title: "Enable Drone CI integration",
+    description: "Drone CI configuration present and features enabled"
+  ) %>
+  <% if Setting.droneci_enabled? %>
+    <%= render FormElements::FieldsetResettableSettingComponent.new(
+          key: :droneci_public_url,
+          title: "Public URL"
+        ) %>
+  <% end %>
+</ul>

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

@@ -12,5 +12,9 @@
           key: :mastodon_public_url,
           title: "Public URL"
         ) %>
+    <%= render FormElements::FieldsetResettableSettingComponent.new(
+          key: :mastodon_address_domain,
+          title: "User address domain"
+        ) %>
   <% end %>
 </ul>

app/views/dashboard/index.html.erb

@@ -7,6 +7,7 @@
       services:
     </p>
     <div class="services grid grid-cols-1 sm:grid-cols-2 gap-4 sm:gap-6">
+      <% if Setting.ejabberd_enabled? %>
         <div class="border border-gray-300 rounded-md hover:border-gray-400
                     bg-cover bg-[center_top_-50px] bg-no-repeat
                     bg-[url(/img/logos/icon_xmpp.svg)]">
@@ -18,6 +19,20 @@
             </p>
           <% end %>
         </div>
+      <% end %>
+      <% if Setting.mastodon_enabled? %>
+        <div class="border border-gray-300 rounded-md hover:border-gray-400
+                    bg-[length:80%] bg-[right_top_-30px] bg-no-repeat
+                    bg-[url(/img/logos/icon_mastodon.svg)]">
+          <%= link_to services_mastodon_path, class: "block h-full px-6 py-6 rounded-md" do %>
+            <h3 class="mb-3.5">Mastodon</h3>
+            <p class="text-gray-600">
+              Your account on the Open Social Web
+            </p>
+          <% end %>
+        </div>
+      <% end %>
+      <% if Setting.discourse_enabled? %>
         <div class="border border-gray-300 rounded-md hover:border-gray-400
                     bg-[length:95%] bg-center bg-no-repeat
                     bg-[url(/img/logos/icon_discourse.svg)]">
@@ -29,17 +44,8 @@
             </p>
           <% end %>
         </div>
-      <div class="border border-gray-300 rounded-md hover:border-gray-400
-                  bg-cover bg-[center_top_-20px] bg-no-repeat
-                  bg-[url(/img/logos/icon_mediawiki.svg)]">
-        <%= link_to "https://wiki.kosmos.org",
-              class: "block h-full px-6 py-6 rounded-md" do %>
-          <h3 class="mb-3.5">Wiki</h3>
-          <p class="text-gray-600">
-            Kosmos documentation and knowledge base
-          </p>
       <% end %>
-      </div>
+      <% if Setting.lndhub_enabled? %>
         <div class="border border-gray-300 rounded-md hover:border-gray-400
                     bg-cover bg-center sm:bg-[center_top_-140px] bg-no-repeat
                     bg-[url(/img/logos/icon_lightning.svg)]">
@@ -51,10 +57,12 @@
             </p>
           <% end %>
         </div>
+      <% end %>
+      <% if Setting.gitea_enabled? %>
         <div class="border border-gray-300 rounded-md hover:border-gray-400
                     bg-cover bg-center bg-no-repeat
                     bg-[url(/img/logos/icon_gitea.png)]">
-        <%= link_to "https://gitea.kosmos.org",
+          <%= link_to Setting.gitea_public_url,
                 class: "block h-full px-6 py-6 rounded-md" do %>
             <h3 class="mb-3.5">Gitea</h3>
             <p class="text-gray-600">
@@ -62,10 +70,12 @@
             </p>
           <% end %>
         </div>
+      <% end %>
+      <% if Setting.droneci_enabled? %>
         <div class="border border-gray-300 rounded-md hover:border-gray-400
                     bg-cover bg-[center_top_-70px] bg-no-repeat
                     bg-[url(/img/logos/icon_droneci.svg)]">
-        <%= link_to "https://drone.kosmos.org",
+          <%= link_to Setting.droneci_public_url,
                 class: "block h-full px-6 py-6 rounded-md" do %>
             <h3 class="mb-3.5">Drone CI</h3>
             <p class="text-gray-600">
@@ -73,7 +83,9 @@
             </p>
           <% end %>
         </div>
-      <% if Setting.remotestorage_enabled? && Flipper.enabled?(:remotestorage, current_user) %>
+      <% end %>
+      <% if Setting.remotestorage_enabled? &&
+            Flipper.enabled?(:remotestorage, current_user) %>
         <div class="border border-gray-300 rounded-md hover:border-gray-400">
           <%= link_to services_storage_path,
                 class: "block h-full px-6 py-6 rounded-md" do %>
@@ -84,16 +96,19 @@
           <% end %>
         </div>
       <% end %>
-      <!-- <div class="border border&#45;gray&#45;300 rounded&#45;md hover:border&#45;gray&#45;400 -->
+      <% if Setting.mediawiki_enabled? %>
-      <!--             bg&#45;[length:80%] bg&#45;[right_top_&#45;30px] bg&#45;no&#45;repeat -->
+        <div class="border border-gray-300 rounded-md hover:border-gray-400
-      <!--             bg&#45;[url(/img/logos/icon_mastodon.svg)]"> -->
+                    bg-cover bg-[center_top_-20px] bg-no-repeat
-      <!--   <%= link_to "https://kosmos.social", class: "block h&#45;full px&#45;6 py&#45;6 rounded&#45;md" do %> -->
+                    bg-[url(/img/logos/icon_mediawiki.svg)]">
-      <!--     <h3 class="mb&#45;3.5">Mastodon</h3> -->
+          <%= link_to Setting.mediawiki_public_url,
-      <!--     <p class="text&#45;gray&#45;400"> -->
+                class: "block h-full px-6 py-6 rounded-md" do %>
-      <!--       Your account on the Open Social Web -->
+            <h3 class="mb-3.5">Wiki</h3>
-      <!--     </p> -->
+            <p class="text-gray-600">
-      <!--   <% end %> -->
+              Kosmos documentation and knowledge base
-      <!-- </div> -->
+            </p>
+          <% end %>
+        </div>
+      <% end %>
     </div>
   </section>
 <% end %>

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

@@ -13,7 +13,7 @@
     </p>
     <p data-controller="clipboard" class="flex gap-1 sm:w-2/5">
       <input type="text" id="user_address" class="grow"
-             value=<%= current_user.address %> disabled="disabled"
+             value=<%= current_user.mastodon_address %> disabled="disabled"
              data-clipboard-target="source" />
       <button id="copy-user-address" class="btn-md btn-icon btn-outline shrink-0"
               data-clipboard-target="trigger" data-action="clipboard#copy"
@@ -36,8 +36,8 @@
     <h3>Social Apps</h3>
     <p>
       Use your Mastodon account with many different apps, and on any devices
-      you wish! When adding your account to an app, you will log in via <a
+      you wish! When adding your account to an app, you will log in via
-        href="https://kosmos.social">kosmos.social</a>.
+      <a href="https://kosmos.social" target="_blank" class="ks-text-link">kosmos.social</a>.
     </p>
   </section>
   <section>

app/views/shared/_admin_sidenav_settings_services.html.erb

@@ -5,6 +5,13 @@
   icon: Setting.discourse_enabled? ? "check" : "x",
   active: current_page?(admin_settings_services_path(params: { s: "discourse" })),
 ) %>
+<%= render SidenavLinkComponent.new(
+  level: 2,
+  name: "Drone CI",
+  path: admin_settings_services_path(params: { s: "droneci" }),
+  icon: Setting.droneci_enabled? ? "check" : "x",
+  active: current_page?(admin_settings_services_path(params: { s: "droneci" })),
+) %>
 <%= render SidenavLinkComponent.new(
   level: 2,
   name: "ejabberd",

package.json

@@ -11,7 +11,7 @@
     "postcss-preset-env": "^7.8.3",
     "tailwindcss": "^3.2.4"
   },
-  "version": "0.7.0",
+  "version": "0.8.0",
   "scripts": {
     "build:css:tailwind": "tailwindcss --postcss -i ./app/assets/stylesheets/application.tailwind.css -o ./app/assets/builds/application.css",
     "build:css": "yarn run build:css:tailwind"

spec/models/user_spec.rb

@@ -12,6 +12,38 @@ RSpec.describe User, type: :model do
     end
   end
 
+  describe "#mastodon_address" do
+    let(:user) { build :user, cn: "jimmy", ou: "kosmos.org" }
+
+    context "Mastodon service not configured" do
+      it "returns nil" do
+        expect(user.mastodon_address).to be_nil
+      end
+    end
+
+    context "Mastodon service configured" do
+      before do
+        Setting.mastodon_enabled = true
+      end
+
+      describe "domain is the same as primary domain" do
+        it "returns the user address" do
+          expect(user.mastodon_address).to eq("jimmy@kosmos.org")
+        end
+      end
+
+      describe "domain is different from primary domain" do
+        before do
+          Setting.mastodon_address_domain = "kosmos.social"
+        end
+
+        it "returns the user address" do
+          expect(user.mastodon_address).to eq("jimmy@kosmos.social")
+        end
+      end
+    end
+  end
+
   describe "#is_admin?" do
     it "returns true when admin flag is set in LDAP" do
       expect(Devise::LDAP::Adapter).to receive(:get_ldap_param)