implement pronouns support

Signed-off-by: Xe Iaso <me@christine.website>

10 files changed, 90 insertions, 26 deletions

diff --git a/dhall/authors.dhall b/dhall/authors.dhall
index a921222..be71e14 100644
--- a/dhall/authors.dhall
+++ b/dhall/authors.dhall
@@ -21,7 +21,12 @@ let authors =
             "https://cdn.xeiaso.net/file/christine-static/img/FFVV1InX0AkDX3f_cropped_smol.jpg"
         , inSystem = True
         }
-      , Author::{ name = "Nicole", handle = "Twi", inSystem = True }
+      , Author::{
+        , name = "Nicole Brennan"
+        , handle = "Twi"
+        , url = Some "https://tech.lgbt/@twi"
+        , inSystem = True
+        }
       , Author::{ name = "Mai", handle = "Mai", inSystem = True }
       , Author::{ name = "Sephira", handle = "sephiraloveboo", inSystem = True }
       ]
diff --git a/dhall/authors/xe.dhall b/dhall/authors/xe.dhall
index 718de7f..6ea9540 100644
--- a/dhall/authors/xe.dhall
+++ b/dhall/authors/xe.dhall
@@ -1,6 +1,4 @@
-let xesite = ../types/package.dhall
-
-let Author = xesite.Author
+let Author = ../types/Author.dhall
 
 in  Author::{
     , name = "Xe Iaso"
diff --git a/dhall/package.dhall b/dhall/package.dhall
index 6a4d639..e1e6996 100644
--- a/dhall/package.dhall
+++ b/dhall/package.dhall
@@ -23,10 +23,11 @@ in  Config::{
         , title = "Aura"
         , description = "PonyvilleFM live DJ recording bot"
         }
-        , Link::{
+      , Link::{
         , url = "https://h.within.lgbt"
         , title = "The h Programming Language"
-        , description = "An esoteric programming language that compiles to WebAssembly"
+        , description =
+            "An esoteric programming language that compiles to WebAssembly"
         }
       , Link::{
         , url = "https://github.com/Xe/olin"
@@ -80,4 +81,5 @@ in  Config::{
       , Link::{ url = "https://t.me/miamorecadenza", title = "Telegram" }
       , Link::{ url = "irc://irc.libera.chat/#xeserv", title = "IRC" }
       ]
+    , pronouns = ./pronouns.dhall
     }
diff --git a/dhall/pronouns.dhall b/dhall/pronouns.dhall
new file mode 100644
index 0000000..1479cd2
--- /dev/null
+++ b/dhall/pronouns.dhall
@@ -0,0 +1,15 @@
+let xesite = ./types/package.dhall
+
+let Pronouns = xesite.PronounSet
+
+in  [ Pronouns::{
+      , nominative = "xe"
+      , accusative = "xer"
+      , possessiveDeterminer = "xer"
+      , possessive = "xers"
+      , reflexive = "xerself"
+      , singular = True
+      }
+    , ./pronouns/they.dhall
+    , ./pronouns/she.dhall
+    ]
diff --git a/dhall/pronouns/she.dhall b/dhall/pronouns/she.dhall
new file mode 100644
index 0000000..61d2021
--- /dev/null
+++ b/dhall/pronouns/she.dhall
@@ -0,0 +1,10 @@
+let Pronouns = ../types/PronounSet.dhall
+
+in  Pronouns::{
+    , nominative = "she"
+    , accusative = "her"
+    , possessiveDeterminer = "her"
+    , possessive = "hers"
+    , reflexive = "herself"
+    , singular = True
+    }
diff --git a/dhall/pronouns/they.dhall b/dhall/pronouns/they.dhall
new file mode 100644
index 0000000..efd2a08
--- /dev/null
+++ b/dhall/pronouns/they.dhall
@@ -0,0 +1,10 @@
+let Pronouns = ../types/PronounSet.dhall
+
+in  Pronouns::{
+    , nominative = "they"
+    , accusative = "them"
+    , possessiveDeterminer = "their"
+    , possessive = "theirs"
+    , reflexive = "themselves"
+    , singular = False
+    }
diff --git a/dhall/types/Author.dhall b/dhall/types/Author.dhall
index 79cab6c..47a850f 100644
--- a/dhall/types/Author.dhall
+++ b/dhall/types/Author.dhall
@@ -1,19 +1,23 @@
-{ Type =
-    { name : Text
-    , handle : Text
-    , image : Optional Text
-    , url : Optional Text
-    , sameAs : List Text
-    , jobTitle : Text
-    , inSystem : Bool
+let PronounSet = ./PronounSet.dhall
+
+in  { Type =
+        { name : Text
+        , handle : Text
+        , image : Optional Text
+        , url : Optional Text
+        , sameAs : List Text
+        , jobTitle : Text
+        , inSystem : Bool
+        , pronouns : PronounSet.Type
+        }
+    , default =
+      { name = ""
+      , handle = ""
+      , image = None Text
+      , url = None Text
+      , sameAs = [] : List Text
+      , jobTitle = ""
+      , inSystem = False
+      , pronouns = ../pronouns/she.dhall
+      }
     }
-, default =
-  { name = ""
-  , handle = ""
-  , image = None Text
-  , url = None Text
-  , sameAs = [] : List Text
-  , jobTitle = ""
-  , inSystem = False
-  }
-}
diff --git a/dhall/types/Config.dhall b/dhall/types/Config.dhall
index 914c89a..245c645 100644
--- a/dhall/types/Config.dhall
+++ b/dhall/types/Config.dhall
@@ -10,6 +10,8 @@ let NagMessage = ./NagMessage.dhall
 
 let SeriesDescription = ./SeriesDescription.dhall
 
+let PronounSet = ./PronounSet.dhall
+
 let Prelude = ../Prelude.dhall
 
 let defaultPort = env:PORT ? 3030
@@ -24,7 +26,6 @@ in  { Type =
         , authors : Prelude.Map.Type Text Author.Type
         , port : Natural
         , clackSet : List Text
-        , resumeFname : Text
         , webMentionEndpoint : Text
         , miToken : Text
         , jobHistory : List Job.Type
@@ -32,6 +33,7 @@ in  { Type =
         , seriesDescMap : Prelude.Map.Type Text Text
         , notableProjects : List Link.Type
         , contactLinks : List Link.Type
+        , pronouns : List PronounSet.Type
         }
     , default =
       { signalboost = [] : List Person.Type
@@ -39,7 +41,6 @@ in  { Type =
       , authors = [] : List Author.Type
       , port = defaultPort
       , clackSet = [ "Ashlynn" ]
-      , resumeFname = "./static/resume/resume.md"
       , webMentionEndpoint = defaultWebMentionEndpoint
       , miToken = "${env:MI_TOKEN as Text ? ""}"
       , jobHistory = [] : List Job.Type
@@ -47,5 +48,6 @@ in  { Type =
       , seriesDescMap = [] : Prelude.Map.Type Text Text
       , notableProjects = [] : List Link.Type
       , contactLinks = [] : List Link.Type
+      , pronouns = [] : List PronounSet.Type
       }
     }
diff --git a/dhall/types/PronounSet.dhall b/dhall/types/PronounSet.dhall
new file mode 100644
index 0000000..13384b3
--- /dev/null
+++ b/dhall/types/PronounSet.dhall
@@ -0,0 +1,17 @@
+{ Type =
+    { nominative : Text
+    , accusative : Text
+    , possessiveDeterminer : Text
+    , possessive : Text
+    , reflexive : Text
+    , singular : Bool
+    }
+, default =
+  { nominative = "xe"
+  , accusative = "xer"
+  , possessiveDeterminer = "xer"
+  , possessive = "xers"
+  , reflexive = "xerself"
+  , singular = True
+  }
+}
diff --git a/dhall/types/package.dhall b/dhall/types/package.dhall
index 4f4166e..4226d77 100644
--- a/dhall/types/package.dhall
+++ b/dhall/types/package.dhall
@@ -6,6 +6,7 @@
 , Location = ./Location.dhall
 , NagMessage = ./NagMessage.dhall
 , Person = ./Person.dhall
+, PronounSet = ./PronounSet.dhall
 , Resume = ./Resume.dhall
 , Salary = ./Salary.dhall
 , SeriesDescription = ./SeriesDescription.dhall