From 1e29943cd6947a4302ddc29dd923653ea2ba9fc1 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Tue, 19 Dec 2023 11:24:18 +0000
Subject: [PATCH 01/14] update comparison for the next release

---
 content/en/docs/comparsion/misskey.md | 34 +++++++++++++++++++++------
 tools/get-new-changes                 | 10 ++++----
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/content/en/docs/comparsion/misskey.md b/content/en/docs/comparsion/misskey.md
index b13e1d0..5cb8e68 100644
--- a/content/en/docs/comparsion/misskey.md
+++ b/content/en/docs/comparsion/misskey.md
@@ -17,9 +17,13 @@ toc: true
   and other people's replies to your posts may not get imported)
 * admins can require approval for new users' signups
 * admins can silence users
-* admins can mark all of a user's media as NSFW
+* admins can mark all of a user's media, or a whole remote instance,
+  as NSFW
 * GDPR-style Data Subject Access Requests (users can export all data
   related to themselves)
+* "bubble" timeline, where admins can show notes from selected
+  instances
+* you can specify the visibility of each boost / renote
 
 ### Fun ones
 
@@ -28,9 +32,13 @@ toc: true
 * (federated) background image on user profiles
 * "speak as cat" separate from "is a cat" (both setting are federated
   with compatible software)
+* themes can specify a font, so you can use whatever font is most
+  legible for you
+* you can change the way note threads are show to be more like
+  Firefish (with lines connecting notes and their replies)
 
 ### UI/UX
-  
+
 * option to open a note's detailed view by clicking on the note (most
   useful on mobile)
 * images lacking alt text are marked as such
@@ -39,6 +47,8 @@ toc: true
 * user profile page has "notes" / "all" / "including files" tabs
 * attachments can be collapsed by default
 * buttons to show/hide all notes with CWs in a conversation
+* you can choose to always show long notes in their entirety
+* you can choose to always expand notes that have a CW
 * one-button "like" (plus custom reactions on a separate button)
 * animated MFM can be enabled/disabled on each note
 * supports longer alt text
@@ -46,6 +56,10 @@ toc: true
   approval, have a "open remote profile" option, and show custom
   fields (e.g. the user's website address)
 * MFM cheatsheet when composing notes
+* MFM won't create a search box just because a sentence ends in
+  "search"
+* usernames with dots (like `@some.one@example.com`) are correctly
+  recognised
 * emoji auto-complete is case-insensitive
 * it's always clear if a note has a poll (misskey sometimes hides
   that)
@@ -53,24 +67,27 @@ toc: true
 * boosts and quote-boost are accounted separately
 * only 1 boost per note per user is allowed
 * admins can remove bots from "trending"
-* users can hide bots from their timelines
+* you can hide bots from your timelines
 * translatable notes are shown translated regardless of where they're
   shown (e.g. when quoted, or when looking at their replies)
-* when searching, users can restrict results to notes with attachments
+* when searching, you can restrict results to notes with attachments
 * CSS class names are human-readable, to simplify browser-side
   customisation
-* users can disable indexing of their notes (the setting is federated)
+* you can disable indexing of your notes (the setting is federated)
 * "likes" and "reactions" federate correctly to Mastodon / Pleroma /
   Akkoma (Misskey sends them all as reactions)
 * different error icons
-* users can disable the "disconnected" warning (connection is usually
+* you can disable the "disconnected" warning (connection is usually
   re-established automatically, so the warning is rarely useful)
-* users can set a default emoji for their likes/reactions
+* you can set a default emoji for your likes/reactions
 * when the instance is using meilisearch to index notes, Sharkey will
   use it in more cases (e.g. when limiting results to notes containing
   images)
 * when showing a reply containing many mentions, they are shortened
+* the depth of the thread / detailed view of notes can be changed
+  (still defaults to 5)
 * there's a search widget
+* you can choose to add a "back" button at the top of each page
 
 ### Ones of interest to admins
 
@@ -84,3 +101,6 @@ toc: true
 * admins can set a default emoji for likes/reactions
 * the PWA icon matches the instance icon
 * deleted custom emoji are automatically removed from Drive
+* container images are much smaller (we don't ship unused
+  dependencies)
+* CWs can be up to 500 characters
diff --git a/tools/get-new-changes b/tools/get-new-changes
index 1b2d174..a1e4562 100755
--- a/tools/get-new-changes
+++ b/tools/get-new-changes
@@ -19,16 +19,16 @@
 
 # run this program from the root of that clone, update the comparison
 # document, edit each `last_commit_checked` to be the output of `git
-# rev-parse sharkey/stable` in the corresponding clone, commit all the
-# changes
+# rev-parse sharkey/develop` in the corresponding clone, commit all
+# the changes
 
 declare -A last_commit_checked=(
-  ["Sharkey"]=10222804655445e8c9f6be4203fd566132de2e50
-  ["sfm.js"]=0448eedb812fd300fbf12257c9960a914d48613c
+  ["Sharkey"]=cf3299312af107efb909c79b0e71ba496edb1a52
+  ["sfm.js"]=7ebad2484d28e33c4335f7ecabdb98fdd4e96b03
 )
 
 log_cmd=( git log -u -b --word-diff=color --word-diff-regex='[[:alnum:]_]+|[^[:space:]]' --no-merges )
 
 for repo in "${!last_commit_checked[@]}"; do
-  ( cd "$repo"; exec "${log_cmd[@]}" sharkey/stable ^misskey/develop ^"${last_commit_checked[$repo]}"; )
+  ( cd "$repo"; exec "${log_cmd[@]}" sharkey/develop ^misskey/develop ^"${last_commit_checked[$repo]}"; )
 done

From 68d13a5555590186b2f0412faea6344c971dc47b Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Tue, 19 Dec 2023 16:45:53 +0000
Subject: [PATCH 02/14] document how to write a theme

---
 config/_default/markup.toml      |   2 +-
 content/en/docs/themes/_index.md |   5 +
 content/en/docs/themes/themes.md | 176 +++++++++++++++++++++++++++++++
 3 files changed, 182 insertions(+), 1 deletion(-)
 create mode 100644 content/en/docs/themes/_index.md
 create mode 100644 content/en/docs/themes/themes.md

diff --git a/config/_default/markup.toml b/config/_default/markup.toml
index 2880e30..af29b0c 100644
--- a/config/_default/markup.toml
+++ b/config/_default/markup.toml
@@ -24,6 +24,6 @@ defaultMarkdownHandler = "goldmark"
   tabWidth = 4
 
 [tableOfContents]
-  endLevel = 3
+  endLevel = 4
   ordered = false
   startLevel = 2
diff --git a/content/en/docs/themes/_index.md b/content/en/docs/themes/_index.md
new file mode 100644
index 0000000..32b200d
--- /dev/null
+++ b/content/en/docs/themes/_index.md
@@ -0,0 +1,5 @@
+---
+title: "Themes"
+weight: 3000
+toc: true
+---
diff --git a/content/en/docs/themes/themes.md b/content/en/docs/themes/themes.md
new file mode 100644
index 0000000..01c4d60
--- /dev/null
+++ b/content/en/docs/themes/themes.md
@@ -0,0 +1,176 @@
+---
+title: "Themes"
+weight: 1000
+toc: true
+---
+
+## General structure
+
+```json
+{
+	id: "your-unique-identifier",
+
+	name: "The Name of Your Theme",
+	author: "your-name",
+	desc: "Describe your fabulous theme",
+	base: "light",
+
+	props: {
+    …
+  }
+}
+```
+
+The `id` must be unique across all the existing themes anywere. We
+suggest using a version 4 UUID (you may have a `uuidgen` command, or
+you may use [an online generator](https://www.uuidgenerator.net/))
+
+Name, author, and description are pretty much free-form.
+
+`base` must be either `light` or `dark`, and it marks your theme as a
+light theme or a dark theme, plus it pulls in the default values from
+the built-in base theme of that kind.
+
+### List of properties
+
+These are the keys you can set inside the `props` dictionary. A few of
+them are probably not used, and many are used in several places. The
+simplest way to see where a key is used is to set it to something
+obviously out of place (e.g. `#FF0000` full red) and see what happens.
+
+#### Colours
+
+`accent` `accentDarken` `accentLighten` `accentedBg` `focus` `bg`
+`acrylicBg` `fg` `fgTransparentWeak` `fgTransparent` `fgHighlighted`
+`fgOnAccent` `fgOnWhite` `divider` `indicator` `panel`
+`panelHighlight` `panelHeaderBg` `panelHeaderFg` `panelHeaderDivider`
+`acrylicPanel` `windowHeader` `popup` `shadow` `header` `navBg`
+`navFg` `navHoverFg` `navActive` `navIndicator` `link` `hashtag`
+`mention` `mentionMe` `renote` `modalBg` `scrollbarHandle`
+`scrollbarHandleHover` `dateLabelFg` `infoBg` `infoFg` `infoWarnBg`
+`infoWarnFg` `switchBg` `buttonBg` `buttonHoverBg` `buttonGradateA`
+`buttonGradateB` `switchOffBg` `switchOffFg` `switchOnBg` `switchOnFg`
+`inputBorder` `inputBorderHover` `listItemHoverBg` `driveFolderBg`
+`wallpaperOverlay` `badge` `messageBg` `success` `error` `warn`
+`codeString` `codeNumber` `codeBoolean` `deckBg` `htmlThemeColor` `X2`
+`X3` `X4` `X5` `X6` `X7` `X8` `X9` `X10` `X11` `X12` `X13` `X14` `X15`
+`X16` `X17`
+
+These can be specified in many ways:
+
+* `#112233` RGB hex codes
+* `rgb(0.5, 0.7, 1.0, 0.5)` RGB floating-point tuples (values between
+  0 and 1)
+* `rgba(0.5, 0.7, 1.0, 0.5)` RGBA floating-point tuples (values
+  between 0 and 1), the last component is transparency
+* `@fg` reference to another colour
+* `$something` reference to a constant (see below)
+* `:darken<0.5<@fg` a function call with one floating-point argument
+  and one colour argument
+
+The available functions are: `darken` `lighten` `alpha` `hue`
+`saturate`. The colour argument can be in any of the above forms (so
+yes `:darken<2<:alpha<0.4<@fg` is a valid colour specification: it
+takes the `fg` colour, makes it more transparent, then makes it
+darker).
+
+#### Borders
+
+`panelBorder` is the only property that's not used directly as a
+colour. The default value is something like `" solid 1px
+var(--divider)`. The value starts with a double-quote to tell the
+theme engine "don't try parsing this as a colour" (notice that it
+*doesn't end* with another quote!). `var(--divider)` here is CSS
+syntax, with an effect pretty much the same as `@divider` in the
+colour specifications described above.
+
+#### Fonts
+
+(This feature is currently only implemented by Sharkey)
+
+`fontFaceSrc` can be set to a string (no starting quote! this is never
+parsed as a colour) describing the source of a font. It can be
+anything that [the `FontFace` constructor can understand as a
+source](https://developer.mozilla.org/en-US/docs/Web/API/FontFace/FontFace#source):
+
+* `local(Arial)` a reference to a locally-installed font
+* `url(https://example.com/somefont.ttf)` a URL to a
+  network-accessible font file
+* `url(https://example.com/somefont.ttf) format('truetype')` a URL and
+  a specific format
+* `url(https://example.com/somefont.woff) format('woff'),
+  url(https://example.com/somefont.ttf) format('truetype'),
+  local(Arial)` a comma-separated list of any of the above (each
+  source is tried in order, the first one that the browser understands
+  and can fetch is used)
+
+`fontFaceOpts` can be set to a dictionary, that will be passed
+straight to [the `descriptors` argument to the `FontFace`
+constructor](https://developer.mozilla.org/en-US/docs/Web/API/FontFace/FontFace#descriptors). You
+very rarely need this.
+
+#### Constants
+
+You can also add extra values for colour specifications, using keys
+starting with `$`. For example:
+
+```json
+props: {
+  "$base": "#aa0044",
+  "fg": ":darken<3<$base",
+  "bg": ":lighten<4<$base",
+  "accent": "$base"
+}
+```
+
+The difference between `$foo` and `foo` is that the latter will be set
+as a CSS variable, so a user's custom CSS could refer to it, while the
+former won't escape the theme.
+
+## Example
+
+This is one of the built-in Misskey themes:
+
+```json
+{
+	id: "504debaf-4912-6a4c-5059-1db08a76b737",
+
+	name: "Mi Botanical Dark",
+	author: "syuilo",
+
+	base: "dark",
+
+	props: {
+		accent: "rgb(148, 179, 0)",
+		bg: "rgb(37, 38, 36)",
+		fg: "rgb(216, 212, 199)",
+		fgHighlighted: "#fff",
+		fgOnWhite: "@accent",
+		divider: "rgba(255, 255, 255, 0.14)",
+		panel: "rgb(47, 47, 44)",
+		panelHeaderDivider: "rgba(0, 0, 0, 0)",
+		header: ":alpha<0.7<@panel",
+		navBg: "#363636",
+		renote: "@accent",
+		mention: "rgb(212, 153, 76)",
+		mentionMe: "rgb(212, 210, 76)",
+		hashtag: "#5bcbb0",
+		link: "@accent",
+	},
+}
+```
+
+This is a minimal theme that just sets a font:
+
+```json
+{
+  id: "0fb6f73a-02ea-4722-8394-4b02188b7cfa",
+  name: "Prank,
+  author: "dakkar",
+  desc: "Sets a funny font",
+  base: "light",
+  props:{
+    fontFaceSrc: "url(https://fonts.gstatic.com/s/rubikbubbles/v3/JIA1UVdwbHFJtwA7Us1BPFbRNTE.ttf) format('truetype')",
+  }
+}
+```

From 1dc03f5a0fd0b172b0d0dc0ed50251925de02407 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Tue, 19 Dec 2023 16:45:58 +0000
Subject: [PATCH 03/14] better section name

thanks Marie!
---
 content/en/docs/{themes => customisation}/_index.md | 2 +-
 content/en/docs/{themes => customisation}/themes.md | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename content/en/docs/{themes => customisation}/_index.md (57%)
 rename content/en/docs/{themes => customisation}/themes.md (100%)

diff --git a/content/en/docs/themes/_index.md b/content/en/docs/customisation/_index.md
similarity index 57%
rename from content/en/docs/themes/_index.md
rename to content/en/docs/customisation/_index.md
index 32b200d..f63881e 100644
--- a/content/en/docs/themes/_index.md
+++ b/content/en/docs/customisation/_index.md
@@ -1,5 +1,5 @@
 ---
-title: "Themes"
+title: "Customisation"
 weight: 3000
 toc: true
 ---
diff --git a/content/en/docs/themes/themes.md b/content/en/docs/customisation/themes.md
similarity index 100%
rename from content/en/docs/themes/themes.md
rename to content/en/docs/customisation/themes.md

From c2e588f265eec51ebf246e286f8e11cda0f31ebb Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Tue, 19 Dec 2023 16:46:04 +0000
Subject: [PATCH 04/14] fix typo

---
 content/en/docs/customisation/themes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/en/docs/customisation/themes.md b/content/en/docs/customisation/themes.md
index 01c4d60..c97325c 100644
--- a/content/en/docs/customisation/themes.md
+++ b/content/en/docs/customisation/themes.md
@@ -165,7 +165,7 @@ This is a minimal theme that just sets a font:
 ```json
 {
   id: "0fb6f73a-02ea-4722-8394-4b02188b7cfa",
-  name: "Prank,
+  name: "Prank",
   author: "dakkar",
   desc: "Sets a funny font",
   base: "light",

From e8bdabbb953ee44fb678c482d087512bd642b2d9 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Tue, 19 Dec 2023 16:46:08 +0000
Subject: [PATCH 05/14] note about hosting fonts in drive

---
 content/en/docs/customisation/themes.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/content/en/docs/customisation/themes.md b/content/en/docs/customisation/themes.md
index c97325c..34f9155 100644
--- a/content/en/docs/customisation/themes.md
+++ b/content/en/docs/customisation/themes.md
@@ -109,6 +109,11 @@ straight to [the `descriptors` argument to the `FontFace`
 constructor](https://developer.mozilla.org/en-US/docs/Web/API/FontFace/FontFace#descriptors). You
 very rarely need this.
 
+If you want, you can even use a font from your drive: upload the file,
+then click on its icon in the drive, copy the URL, and use it in
+`fontFaceSrc`, like
+`url(https://instance.example.com/files/8b0cc94f-0307-4aef-867b-b2e9ee6fd79f)`.
+
 #### Constants
 
 You can also add extra values for colour specifications, using keys

From 6c321e2d664805afca6fdb2f91e450cfc4f68f7b Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Tue, 19 Dec 2023 16:50:24 +0000
Subject: [PATCH 06/14] reword a bit

---
 content/en/docs/comparsion/misskey.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/en/docs/comparsion/misskey.md b/content/en/docs/comparsion/misskey.md
index 5cb8e68..5afa948 100644
--- a/content/en/docs/comparsion/misskey.md
+++ b/content/en/docs/comparsion/misskey.md
@@ -21,8 +21,8 @@ toc: true
   as NSFW
 * GDPR-style Data Subject Access Requests (users can export all data
   related to themselves)
-* "bubble" timeline, where admins can show notes from selected
-  instances
+* "bubble" timeline, showing all known notes from an admin-configured
+  list of remote instances
 * you can specify the visibility of each boost / renote
 
 ### Fun ones

From 1c05c655a41c653c90fb54d6a1ff4a2786ea8a1a Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Tue, 19 Dec 2023 21:09:00 +0000
Subject: [PATCH 07/14] the "back" button is not optional

---
 content/en/docs/comparsion/misskey.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/en/docs/comparsion/misskey.md b/content/en/docs/comparsion/misskey.md
index 5afa948..33084ec 100644
--- a/content/en/docs/comparsion/misskey.md
+++ b/content/en/docs/comparsion/misskey.md
@@ -87,7 +87,7 @@ toc: true
 * the depth of the thread / detailed view of notes can be changed
   (still defaults to 5)
 * there's a search widget
-* you can choose to add a "back" button at the top of each page
+* there's a "back" button at the top of each page
 
 ### Ones of interest to admins
 

From e36004b46154ca312da287fe583bce6beff1c049 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sat, 23 Dec 2023 20:27:13 +0000
Subject: [PATCH 08/14] update

---
 content/en/docs/comparsion/misskey.md | 7 +++++++
 tools/get-new-changes                 | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/content/en/docs/comparsion/misskey.md b/content/en/docs/comparsion/misskey.md
index 33084ec..f6eb32d 100644
--- a/content/en/docs/comparsion/misskey.md
+++ b/content/en/docs/comparsion/misskey.md
@@ -24,6 +24,7 @@ toc: true
 * "bubble" timeline, showing all known notes from an admin-configured
   list of remote instances
 * you can specify the visibility of each boost / renote
+* thread view updates in real time
 
 ### Fun ones
 
@@ -55,6 +56,7 @@ toc: true
 * pop-up user profiles show if follow requests to the user require
   approval, have a "open remote profile" option, and show custom
   fields (e.g. the user's website address)
+* user profile pages always show the whole user description
 * MFM cheatsheet when composing notes
 * MFM won't create a search box just because a sentence ends in
   "search"
@@ -88,6 +90,9 @@ toc: true
   (still defaults to 5)
 * there's a search widget
 * there's a "back" button at the top of each page
+* timelines will show notes from users you follow, even if their
+  instance is muted
+* tag view respects blocks, mutes, suspensions
 
 ### Ones of interest to admins
 
@@ -99,8 +104,10 @@ toc: true
 * admins can disable achievements
 * admins can refresh remote user details
 * admins can set a default emoji for likes/reactions
+* admins can set a list of custom "message of the day"
 * the PWA icon matches the instance icon
 * deleted custom emoji are automatically removed from Drive
 * container images are much smaller (we don't ship unused
   dependencies)
+* we publish stable container images tagged by the release version
 * CWs can be up to 500 characters
diff --git a/tools/get-new-changes b/tools/get-new-changes
index a1e4562..fbca4be 100755
--- a/tools/get-new-changes
+++ b/tools/get-new-changes
@@ -23,7 +23,7 @@
 # the changes
 
 declare -A last_commit_checked=(
-  ["Sharkey"]=cf3299312af107efb909c79b0e71ba496edb1a52
+  ["Sharkey"]=53365159e824d738c0d59d448ae1f02649177ebc
   ["sfm.js"]=7ebad2484d28e33c4335f7ecabdb98fdd4e96b03
 )
 

From d1aa81de9c989cd4b2d88573d7cabc9fb742b81b Mon Sep 17 00:00:00 2001
From: Marie <marie@kaifa.ch>
Date: Sun, 24 Dec 2023 11:34:30 +0100
Subject: [PATCH 09/14] remove line

---
 content/en/docs/comparsion/misskey.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/content/en/docs/comparsion/misskey.md b/content/en/docs/comparsion/misskey.md
index f6eb32d..89c272d 100644
--- a/content/en/docs/comparsion/misskey.md
+++ b/content/en/docs/comparsion/misskey.md
@@ -109,5 +109,4 @@ toc: true
 * deleted custom emoji are automatically removed from Drive
 * container images are much smaller (we don't ship unused
   dependencies)
-* we publish stable container images tagged by the release version
 * CWs can be up to 500 characters

From a54c6c39fc80df96c6edbde14ba9ebc7eb575b84 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sun, 24 Dec 2023 11:29:22 +0000
Subject: [PATCH 10/14] update

---
 content/en/docs/comparsion/misskey.md | 2 ++
 tools/get-new-changes                 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/content/en/docs/comparsion/misskey.md b/content/en/docs/comparsion/misskey.md
index 89c272d..410bc09 100644
--- a/content/en/docs/comparsion/misskey.md
+++ b/content/en/docs/comparsion/misskey.md
@@ -25,6 +25,8 @@ toc: true
   list of remote instances
 * you can specify the visibility of each boost / renote
 * thread view updates in real time
+* check signature on ActivityPub GET requests, also known as "secure
+  mode" or "authorized fetch" (experimental)
 
 ### Fun ones
 
diff --git a/tools/get-new-changes b/tools/get-new-changes
index fbca4be..49b7927 100755
--- a/tools/get-new-changes
+++ b/tools/get-new-changes
@@ -23,7 +23,7 @@
 # the changes
 
 declare -A last_commit_checked=(
-  ["Sharkey"]=53365159e824d738c0d59d448ae1f02649177ebc
+  ["Sharkey"]=fd57c7e24caf936392440de3c063b5eaa9d588cb
   ["sfm.js"]=7ebad2484d28e33c4335f7ecabdb98fdd4e96b03
 )
 

From 9fc108b4f69fa6b0c15aebfdc9c1e4320877a28f Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Mon, 25 Dec 2023 20:33:47 +0000
Subject: [PATCH 11/14] more update

---
 content/en/docs/comparsion/misskey.md |  1 +
 tools/get-new-changes                 | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/content/en/docs/comparsion/misskey.md b/content/en/docs/comparsion/misskey.md
index 410bc09..25192d9 100644
--- a/content/en/docs/comparsion/misskey.md
+++ b/content/en/docs/comparsion/misskey.md
@@ -39,6 +39,7 @@ toc: true
   legible for you
 * you can change the way note threads are show to be more like
   Firefish (with lines connecting notes and their replies)
+* MFM renders mathematical formulas
 
 ### UI/UX
 
diff --git a/tools/get-new-changes b/tools/get-new-changes
index 49b7927..03c4f54 100755
--- a/tools/get-new-changes
+++ b/tools/get-new-changes
@@ -18,13 +18,12 @@
 # cd ..
 
 # run this program from the root of that clone, update the comparison
-# document, edit each `last_commit_checked` to be the output of `git
-# rev-parse sharkey/develop` in the corresponding clone, commit all
-# the changes
+# document, edit `last_commit_checked` to contain the lines that the
+# script printed at the end, commit all the changes
 
 declare -A last_commit_checked=(
-  ["Sharkey"]=fd57c7e24caf936392440de3c063b5eaa9d588cb
-  ["sfm.js"]=7ebad2484d28e33c4335f7ecabdb98fdd4e96b03
+  ["Sharkey"]=a67d31c963df2c9cde05bddf106bd8a95958f17e
+  ["sfm.js"]=4b44cf6021118520b3bd8d7fa8fe15b01b890c29
 )
 
 log_cmd=( git log -u -b --word-diff=color --word-diff-regex='[[:alnum:]_]+|[^[:space:]]' --no-merges )
@@ -32,3 +31,7 @@ log_cmd=( git log -u -b --word-diff=color --word-diff-regex='[[:alnum:]_]+|[^[:s
 for repo in "${!last_commit_checked[@]}"; do
   ( cd "$repo"; exec "${log_cmd[@]}" sharkey/develop ^misskey/develop ^"${last_commit_checked[$repo]}"; )
 done
+
+for repo in "${!last_commit_checked[@]}"; do
+  ( cd "$repo"; echo "[\"$repo\"]=$(git rev-parse HEAD)" )
+done

From cfe57b9a2ae83de9a74c98857291c0ce05adf87d Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Thu, 28 Dec 2023 12:13:50 +0000
Subject: [PATCH 12/14] updates

---
 content/en/docs/comparsion/misskey.md | 3 +++
 tools/get-new-changes                 | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/content/en/docs/comparsion/misskey.md b/content/en/docs/comparsion/misskey.md
index 25192d9..54b225d 100644
--- a/content/en/docs/comparsion/misskey.md
+++ b/content/en/docs/comparsion/misskey.md
@@ -55,6 +55,8 @@ toc: true
 * you can choose to always expand notes that have a CW
 * one-button "like" (plus custom reactions on a separate button)
 * animated MFM can be enabled/disabled on each note
+* italic, bold, hashtags accept more characters (so `#æîç` is a valid
+  hashtag)
 * supports longer alt text
 * pop-up user profiles show if follow requests to the user require
   approval, have a "open remote profile" option, and show custom
@@ -96,6 +98,7 @@ toc: true
 * timelines will show notes from users you follow, even if their
   instance is muted
 * tag view respects blocks, mutes, suspensions
+* you won't receive any notification for muted threads
 
 ### Ones of interest to admins
 
diff --git a/tools/get-new-changes b/tools/get-new-changes
index 03c4f54..0033a59 100755
--- a/tools/get-new-changes
+++ b/tools/get-new-changes
@@ -22,14 +22,14 @@
 # script printed at the end, commit all the changes
 
 declare -A last_commit_checked=(
-  ["Sharkey"]=a67d31c963df2c9cde05bddf106bd8a95958f17e
-  ["sfm.js"]=4b44cf6021118520b3bd8d7fa8fe15b01b890c29
+  ["Sharkey"]=870f70a6833f4dd9744fd1e6c356262d803c0d0c
+  ["sfm.js"]=3ab3ca1cfb675c97c58919b1ac4a8f1f694fd17c
 )
 
 log_cmd=( git log -u -b --word-diff=color --word-diff-regex='[[:alnum:]_]+|[^[:space:]]' --no-merges )
 
 for repo in "${!last_commit_checked[@]}"; do
-  ( cd "$repo"; exec "${log_cmd[@]}" sharkey/develop ^misskey/develop ^"${last_commit_checked[$repo]}"; )
+  ( cd "$repo"; exec "${log_cmd[@]}" sharkey/develop ^misskey/develop ^misskey/master ^"${last_commit_checked[$repo]}"; )
 done
 
 for repo in "${!last_commit_checked[@]}"; do

From a95c7961a73c5d519ce64755ef989c98b2035c73 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sun, 31 Dec 2023 18:50:05 +0000
Subject: [PATCH 13/14] final(?) updates

---
 content/en/docs/comparsion/misskey.md | 10 +++++++++-
 tools/get-new-changes                 |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/content/en/docs/comparsion/misskey.md b/content/en/docs/comparsion/misskey.md
index 54b225d..9edf666 100644
--- a/content/en/docs/comparsion/misskey.md
+++ b/content/en/docs/comparsion/misskey.md
@@ -90,10 +90,13 @@ toc: true
 * when the instance is using meilisearch to index notes, Sharkey will
   use it in more cases (e.g. when limiting results to notes containing
   images)
-* when showing a reply containing many mentions, they are shortened
 * the depth of the thread / detailed view of notes can be changed
   (still defaults to 5)
 * there's a search widget
+* the search functions (both the dedicated pages and the widget) also
+  cover the functionality of the "lookup" feature, so you can search
+  for a fully-qualified remote username and have their profile fetched
+  and shown
 * there's a "back" button at the top of each page
 * timelines will show notes from users you follow, even if their
   instance is muted
@@ -111,8 +114,13 @@ toc: true
 * admins can refresh remote user details
 * admins can set a default emoji for likes/reactions
 * admins can set a list of custom "message of the day"
+* admins can change the maximum note length
 * the PWA icon matches the instance icon
 * deleted custom emoji are automatically removed from Drive
 * container images are much smaller (we don't ship unused
   dependencies)
 * CWs can be up to 500 characters
+* admins can use multiple configuration files by setting the
+  `MISSKEY_CONFIG_YML` environment variable to a path with wildcards
+  (e.g. `MISSKEY_CONFIG_YML=/path/to/files/*.yml`, they'll be merged
+  in alphabetical order)
diff --git a/tools/get-new-changes b/tools/get-new-changes
index 0033a59..5d3429e 100755
--- a/tools/get-new-changes
+++ b/tools/get-new-changes
@@ -22,8 +22,8 @@
 # script printed at the end, commit all the changes
 
 declare -A last_commit_checked=(
-  ["Sharkey"]=870f70a6833f4dd9744fd1e6c356262d803c0d0c
-  ["sfm.js"]=3ab3ca1cfb675c97c58919b1ac4a8f1f694fd17c
+  ["Sharkey"]=7b04c6ade4dc11c604ccbf39b834988a16621e85
+  ["sfm.js"]=3eb78bc54ffc2fc22624b1a68ed650f2ab458d00
 )
 
 log_cmd=( git log -u -b --word-diff=color --word-diff-regex='[[:alnum:]_]+|[^[:space:]]' --no-merges )

From 2f4931098eec1f0209348b4a624a0bf6c6c37d67 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sun, 31 Dec 2023 22:33:10 +0000
Subject: [PATCH 14/14] fix docker example config

---
 content/en/docs/install/fresh.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/en/docs/install/fresh.md b/content/en/docs/install/fresh.md
index cf33ec5..bef31bd 100644
--- a/content/en/docs/install/fresh.md
+++ b/content/en/docs/install/fresh.md
@@ -29,7 +29,7 @@ Fetch all required examples and enter directory:
 
 ```bash
 wget -O Sharkey/docker-compose.yml https://git.joinsharkey.org/Sharkey/Sharkey/raw/branch/stable/docker-compose.yml.example
-wget -O Sharkey/.config/default.yml https://git.joinsharkey.org/Sharkey/Sharkey/raw/branch/stable/.config/example.yml
+wget -O Sharkey/.config/default.yml https://git.joinsharkey.org/Sharkey/Sharkey/raw/branch/stable/.config/docker_example.yml
 wget -O Sharkey/.config/docker.env https://git.joinsharkey.org/Sharkey/Sharkey/raw/branch/stable/.config/docker_example.env
 cd Sharkey
 ```