From bf5a3a95c43837552d17c91aac2610456deb2342 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel@bitbadger.solutions>
Date: Fri, 8 Jul 2022 14:46:29 -0400
Subject: [PATCH] Add ability to disabled instances (#33)

---
 src/JobsJobsJobs/App/src/api/types.ts         |  4 +++
 .../App/src/views/citizen/LogOn.vue           |  5 +++-
 .../Domain/JobsJobsJobs.Domain.fsproj         |  7 ++---
 src/JobsJobsJobs/Domain/SharedTypes.fs        | 26 ++++++++++++-------
 src/JobsJobsJobs/Server/App.fs                |  2 +-
 src/JobsJobsJobs/Server/Handlers.fs           | 12 +++++----
 .../Server/JobsJobsJobs.Server.fsproj         |  4 ++-
 src/JobsJobsJobs/Server/appsettings.json      | 12 ++++++---
 8 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/src/JobsJobsJobs/App/src/api/types.ts b/src/JobsJobsJobs/App/src/api/types.ts
index 2c98c89..8a67533 100644
--- a/src/JobsJobsJobs/App/src/api/types.ts
+++ b/src/JobsJobsJobs/App/src/api/types.ts
@@ -43,6 +43,10 @@ export interface Instance {
   abbr : string
   /** The client ID (assigned by the Mastodon server) */
   clientId : string
+  /** Whether this instance is enabled */
+  isEnabled : boolean
+  /** If disabled, the reason why it is disabled */
+  reason : string
 }
 
 /** A job listing */
diff --git a/src/JobsJobsJobs/App/src/views/citizen/LogOn.vue b/src/JobsJobsJobs/App/src/views/citizen/LogOn.vue
index 959abaa..438328e 100644
--- a/src/JobsJobsJobs/App/src/views/citizen/LogOn.vue
+++ b/src/JobsJobsJobs/App/src/views/citizen/LogOn.vue
@@ -5,7 +5,10 @@ article
   template(v-else)
     p.text-center Please select your No Agenda-affiliated Mastodon instance
     p.text-center(v-for="it in instances" :key="it.abbr")
-      button.btn.btn-primary(@click.prevent="select(it.abbr)") {{it.name}}
+      template(v-if="it.isEnabled")
+        button.btn.btn-primary(@click.prevent="select(it.abbr)") {{it.name}}
+      template(v-else).
+        #[button.btn.btn-secondary(disabled="disabled") {{it.name}}]#[br]#[em {{it.reason}}]
 </template>
 
 <script setup lang="ts">
diff --git a/src/JobsJobsJobs/Domain/JobsJobsJobs.Domain.fsproj b/src/JobsJobsJobs/Domain/JobsJobsJobs.Domain.fsproj
index caeb399..9d14916 100644
--- a/src/JobsJobsJobs/Domain/JobsJobsJobs.Domain.fsproj
+++ b/src/JobsJobsJobs/Domain/JobsJobsJobs.Domain.fsproj
@@ -13,9 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Markdig" Version="0.25.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
-    <PackageReference Include="NodaTime" Version="3.0.5" />
+    <PackageReference Include="Markdig" Version="0.30.2" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageReference Include="NodaTime" Version="3.1.0" />
+    <PackageReference Update="FSharp.Core" Version="6.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/src/JobsJobsJobs/Domain/SharedTypes.fs b/src/JobsJobsJobs/Domain/SharedTypes.fs
index ff1ad27..81a60fa 100644
--- a/src/JobsJobsJobs/Domain/SharedTypes.fs
+++ b/src/JobsJobsJobs/Domain/SharedTypes.fs
@@ -79,15 +79,19 @@ type Count =
 /// An instance of a Mastodon server which is configured to work with Jobs, Jobs, Jobs
 type MastodonInstance () =
     /// The name of the instance
-    member val Name     = "" with get, set
+    member val Name      = ""   with get, set
     /// The URL for this instance
-    member val Url      = "" with get, set
+    member val Url       = ""   with get, set
     /// The abbreviation used in the URL to distinguish this instance's return codes
-    member val Abbr     = "" with get, set
+    member val Abbr      = ""   with get, set
     /// The client ID (assigned by the Mastodon server)
-    member val ClientId = "" with get, set
+    member val ClientId  = ""   with get, set
     /// The cryptographic secret (provided by the Mastodon server)
-    member val Secret   = "" with get, set
+    member val Secret    = ""   with get, set
+    /// Whether the instance is currently enabled
+    member val IsEnabled = true with get, set
+    /// If an instance is disabled, the reason for it being disabled
+    member val Reason    = ""   with get, set
 
 
 /// The authorization options for Jobs, Jobs, Jobs
@@ -105,13 +109,17 @@ type AuthOptions () =
 /// The Mastodon instance data provided via the Jobs, Jobs, Jobs API
 type Instance =
     {   /// The name of the instance
-        name     : string
+        name      : string
         /// The URL for this instance
-        url      : string
+        url       : string
         /// The abbreviation used in the URL to distinguish this instance's return codes
-        abbr     : string
+        abbr      : string
         /// The client ID (assigned by the Mastodon server)
-        clientId : string
+        clientId  : string
+        /// Whether this instance is currently enabled
+        isEnabled : bool
+        /// If not enabled, the reason the instance is disabled
+        reason    : string
     }
 
 
diff --git a/src/JobsJobsJobs/Server/App.fs b/src/JobsJobsJobs/Server/App.fs
index b9265c6..cfa9fe4 100644
--- a/src/JobsJobsJobs/Server/App.fs
+++ b/src/JobsJobsJobs/Server/App.fs
@@ -63,7 +63,7 @@ let configureServices (svc : IServiceCollection) =
     svc.Configure<AuthOptions> (cfg.GetSection "Auth") |> ignore
     
     let dbCfg = cfg.GetSection "Rethink"
-    let log   = svcs.GetRequiredService<ILoggerFactory>().CreateLogger (nameof Data.Startup)
+    let log   = svcs.GetRequiredService<ILoggerFactory>().CreateLogger "JobsJobsJobs.Api.Data.Startup"
     let conn  = Data.Startup.createConnection dbCfg log
     svc.AddSingleton conn |> ignore
     Data.Startup.establishEnvironment dbCfg log conn |> Data.awaitIgnore
diff --git a/src/JobsJobsJobs/Server/Handlers.fs b/src/JobsJobsJobs/Server/Handlers.fs
index 5761f32..89617e3 100644
--- a/src/JobsJobsJobs/Server/Handlers.fs
+++ b/src/JobsJobsJobs/Server/Handlers.fs
@@ -182,11 +182,13 @@ module Instances =
 
     /// Convert a Mastodon instance to the one we use in the API
     let private toInstance (inst : MastodonInstance) =
-        { name     = inst.Name
-          url      = inst.Url
-          abbr     = inst.Abbr
-          clientId = inst.ClientId
-          }
+        { name      = inst.Name
+          url       = inst.Url
+          abbr      = inst.Abbr
+          clientId  = inst.ClientId
+          isEnabled = inst.IsEnabled
+          reason    = inst.Reason
+        }
 
     // GET: /api/instances
     let all : HttpHandler = fun next ctx -> task {
diff --git a/src/JobsJobsJobs/Server/JobsJobsJobs.Server.fsproj b/src/JobsJobsJobs/Server/JobsJobsJobs.Server.fsproj
index 422f8b4..9f23c41 100644
--- a/src/JobsJobsJobs/Server/JobsJobsJobs.Server.fsproj
+++ b/src/JobsJobsJobs/Server/JobsJobsJobs.Server.fsproj
@@ -28,7 +28,9 @@
     <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" />
     <PackageReference Include="Polly" Version="7.2.2" />
     <PackageReference Include="RethinkDb.Driver" Version="2.3.150" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.11.1" />
+    <PackageReference Include="RethinkDb.Driver.FSharp" Version="0.9.0-beta-05" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.21.0" />
+    <PackageReference Update="FSharp.Core" Version="6.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/src/JobsJobsJobs/Server/appsettings.json b/src/JobsJobsJobs/Server/appsettings.json
index 209fc02..5242c54 100644
--- a/src/JobsJobsJobs/Server/appsettings.json
+++ b/src/JobsJobsJobs/Server/appsettings.json
@@ -5,17 +5,23 @@
       "0": {
         "Name": "No Agenda Social",
         "Url": "https://noagendasocial.com",
-        "Abbr": "nas"
+        "Abbr": "nas",
+        "IsEnabled": true,
+        "Reason": ""
       },
       "1": {
         "Name": "ITM Slaves!",
         "Url": "https://itmslaves.com",
-        "Abbr": "itm"
+        "Abbr": "itm",
+        "IsEnabled": false,
+        "Reason": "This site has changed platforms, and its integration is not yet restored"
       },
       "2": {
         "Name": "Liberty Woof",
         "Url": "https://libertywoof.com",
-        "Abbr": "lw"
+        "Abbr": "lw",
+        "IsEnabled": false,
+        "Reason": "This site may have gone away; it is currently inaccessible"
       }
     }
   }