From c9bc5e29af417a25c140985ed865e3502fd92bb2 Mon Sep 17 00:00:00 2001
From: Fabio <fabrix.xm@gmail.com>
Date: Fri, 27 Mar 2020 11:31:43 +0100
Subject: [PATCH 1/3] document all possible values in me.sample.yml

---
 config/me.sample.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/config/me.sample.yml b/config/me.sample.yml
index 56e37b0..4b5112f 100644
--- a/config/me.sample.yml
+++ b/config/me.sample.yml
@@ -1,6 +1,15 @@
 username: 'username'
 name: 'You Name'
-icon_url: 'https://you-avatar-url'
 domain: 'your-domain.tld'
-summary: 'your summary'
 https: true
+summary: 'your summary'
+icon_url: 'https://you-avatar-url'
+#pass: '<bcrypt password hash>'
+#profile_metadata:
+#    name1: 'value'
+#    name2: 'value2'
+hide_following: true
+#theme:
+#    style: "light" #or "dark"
+#    color: "#1d781d" # (green, default for light)
+          # "#33ff00"   (purple, default for dark)

From 32964a413bedaa60ba9223755e4e46eb82d5b05e Mon Sep 17 00:00:00 2001
From: Fabio <fabrix.xm@gmail.com>
Date: Fri, 27 Mar 2020 12:03:55 +0100
Subject: [PATCH 2/3] Add favicon, configurable in me.yml, with default

---
 config.py             |   1 +
 config/me.sample.yml  |   1 +
 static/favicon.png    | Bin 0 -> 877 bytes
 templates/layout.html |   1 +
 4 files changed, 3 insertions(+)
 create mode 100644 static/favicon.png

diff --git a/config.py b/config.py
index 2d278dd..01c9651 100644
--- a/config.py
+++ b/config.py
@@ -67,6 +67,7 @@ with open(os.path.join(KEY_DIR, "me.yml")) as f:
     ID = BASE_URL
     SUMMARY = conf["summary"]
     ICON_URL = conf["icon_url"]
+    FAVICON_URL = conf.get("favicon_url", "/static/favicon.png")
     PASS = conf["pass"]
 
     PROFILE_METADATA = conf.get("profile_metadata", {})
diff --git a/config/me.sample.yml b/config/me.sample.yml
index 4b5112f..00901b9 100644
--- a/config/me.sample.yml
+++ b/config/me.sample.yml
@@ -4,6 +4,7 @@ domain: 'your-domain.tld'
 https: true
 summary: 'your summary'
 icon_url: 'https://you-avatar-url'
+#favicon_url: '/static/favicon.png'
 #pass: '<bcrypt password hash>'
 #profile_metadata:
 #    name1: 'value'
diff --git a/static/favicon.png b/static/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..644d6e8fa1a1e091c65beccec27436ac944d3213
GIT binary patch
literal 877
zcmV-z1CsoSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv00000
z008+zyMF)x10qR8K~z}7?UzqT+i(=ezeywht1Pi=>!0<YLj(mkCMsG)ya{@qqZdKE
zIdV`~)sx_12NA@B9%KhmthX@~yjcV%qMiSWtW3qJ8^+R2ol8qK=I!9jmeKl$4!eOb
z{0{F=e)*91^4>2D5fNgL7;guM7=>Y&nBZB&S>g^5a|$*-Z(w?9TGMm0a#8)H`t|^V
z;UETA2I2kYg^4wxwY2p{05PYaD7Of+9kUp%8;xHLunY^%!2Rb%7!HSVczF1WjAdaq
zn>9TU2;l7OOw)OuM`B`P)Qz{KE$r^^f>c7r{S4$i$OFr;(E+x%w~?QpuQ}@L>oGPq
zrs<+6!sT*ly3gm+#b1bgDx>#xFS_Tu!Th`wQqWk?h>oWnNKHzOoC2%Wipj}IIGs)i
zf&hcTpbHd55ko^m$jQmM^p*B6^<!#%3M2I+n0`Kuk!K?)=8G}>ei(gk`XaVNoh&RY
zkRS-;a5(;SQ79B5yWLIz$mjFvd=qac$kt|~(#}%yANqB^o&6o+ojlpvY_$GqU9+pI
zO6*OC%T<0ykpt#?W}VGuv7zNr3jo0L!4sdapzL880AO`zH9i1o#x$r<aq#^B1iF0y
zmSF(`PSsOg8lwV)!{NUQ5DW#uGAz<l(slhHD!|^}9u!5naS;Yjf)VX=8*>1FLR;bW
zYQXFDVr6ATXY+VGnl0K%sCT&+OB+i%+uFx9^epxO04fSAt~ZW3j)TMDfGCQ{%*@2{
z@-n)*x?r(bz;PS~1_n@BS&7=(T3t)7vQ(k&RUMiiH=`h{0Gs|z^e^@!nMp>wy&ZYk
zd6ze$`T2Pg1cB^!J2f>mk<n-*08~;^LT<O48X6i1fVPf~j);h8d}f^Z7d*M&xoO5b
zLp3jJ$l7KllhZ`yo#iy@9wp^W(LGC5Rf-C5(Fy&2KS`2AvMdu3Q6LZ?Ns_dsDCe6V
z%f}>rkw^}m$DJrA<UjD!{?~ny!!kt@RaNQAA^!VB1OSuC6fw@2VuUfpsObrY1ekgA
zzkeS1_fEyx+1YTpTu4evx)lH>)?c$&f9vjQ;11vi-xv8lH6C@q00000NkvXXu0mjf
DLVc70

literal 0
HcmV?d00001

diff --git a/templates/layout.html b/templates/layout.html
index 7f386c6..3b084ee 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -5,6 +5,7 @@
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 <title>{% block title %}{{ config.NAME }}'s microblog{% endblock %}</title>
+<link rel="icon" type="image/png" href="{{ config.FAVICON_URL }}">
 <link rel="stylesheet" href="/static/pure.css">
 <link rel="authorization_endpoint" href="{{ config.ID }}/indieauth">
 <link rel="token_endpoint" href="{{ config.ID }}/token">

From 7ec61e9b7ff374797ddee944567ae74f28ca95eb Mon Sep 17 00:00:00 2001
From: Fabio <fabrix.xm@gmail.com>
Date: Fri, 27 Mar 2020 13:11:52 +0100
Subject: [PATCH 3/3] add support to "alsoKnownAs" property

add "aliases" config option in me.yml
---
 config.py            | 3 +++
 config/me.sample.yml | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/config.py b/config.py
index 01c9651..205be92 100644
--- a/config.py
+++ b/config.py
@@ -73,6 +73,8 @@ with open(os.path.join(KEY_DIR, "me.yml")) as f:
     PROFILE_METADATA = conf.get("profile_metadata", {})
     HIDE_FOLLOWING = conf.get("hide_following", True)
 
+    ALIASES = conf.get('aliases', [])
+
     # Theme-related config
     theme_conf = conf.get("theme", {})
     THEME_STYLE = ThemeStyle(theme_conf.get("style", DEFAULT_THEME_STYLE))
@@ -162,6 +164,7 @@ ME = {
         "url": ICON_URL,
     },
     "publicKey": KEY.to_dict(),
+    "alsoKnownAs": ALIASES,
 }
 
 # Default emojis, space-separated, update `me.yml` to customize emojis
diff --git a/config/me.sample.yml b/config/me.sample.yml
index 00901b9..54e64eb 100644
--- a/config/me.sample.yml
+++ b/config/me.sample.yml
@@ -4,12 +4,16 @@ domain: 'your-domain.tld'
 https: true
 summary: 'your summary'
 icon_url: 'https://you-avatar-url'
+pass: '<bcrypt password hash>'
 #favicon_url: '/static/favicon.png'
-#pass: '<bcrypt password hash>'
 #profile_metadata:
 #    name1: 'value'
 #    name2: 'value2'
-hide_following: true
+#hide_following: true
+#manually_approves_followers: false
+#aliases:
+#    - "http://example.com/users/name"
+#    - ...
 #theme:
 #    style: "light" #or "dark"
 #    color: "#1d781d" # (green, default for light)