Merge 70f6749c92 into 2f6867348f

Replace Twitter link in footer with Masto/Bluesky (#2282 )
changelogs/s2s: add minimum_valid_until_ts clarification
2026-05-01 14:44:09 +02:00 · 2025-12-21 15:27:24 +00:00 · 2025-12-19 15:59:08 +00:00 · 2025-09-11 02:19:33 +02:00 · 2025-09-11 02:19:33 +02:00
4 changed files with 24 additions and 18 deletions
--- a/changelogs/internal/newsfragments/2282.clarification
+++ b/changelogs/internal/newsfragments/2282.clarification
@ -0,0 +1 @@
 Replace the Twitter link in the footer with our BlueSky and Mastodon socials.
--- a/changelogs/server_server/newsfragments/2191.clarification
+++ b/changelogs/server_server/newsfragments/2191.clarification
@ -0,0 +1 @@
 Clarify what the minimum_valid_until_ts field means when it is set in key queries.
--- a/config/_default/hugo.toml
+++ b/config/_default/hugo.toml
@ -121,10 +121,15 @@ sidebar_menu_compact = true
  icon = "fab fa-youtube"
  desc = "Matrix YouTube channel"
 [[params.links.bottom]]
-	name = "Twitter"
+  name = "Mastodon"
-	url = "https://twitter.com/matrixdotorg"
+  url = "https://mastodon.matrix.org/@matrix"
-	icon = "fab fa-x-twitter"
+  icon = "fab fa-mastodon"
-  desc = "Matrix on Twitter"
+  desc = "Matrix on Mastodon"
 [[params.links.bottom]]
  name = "Bluesky"
  url = "https://bsky.app/profile/matrix.org"
  icon = "fab fa-bluesky"
  desc = "Matrix on Bluesky"
 # configuration for the hugo development server
--- a/data/api/server-server/keys_query.yaml
+++ b/data/api/server-server/keys_query.yaml
@ -34,8 +34,8 @@ paths:
        - in: query
          name: minimum_valid_until_ts
          description: |-
-            A millisecond POSIX timestamp in milliseconds indicating when the returned
+            A millisecond POSIX timestamp. The returned keys MUST be valid
-            certificates will need to be valid until to be useful to the requesting server.
+            until at least this timestamp.
            If not supplied, the current time as determined by the notary server is used.
          required: false
@ -98,9 +98,8 @@ paths:
                          type: integer
                          format: int64
                          description: |-
-                            A millisecond POSIX timestamp in milliseconds indicating when
+                            A millisecond POSIX timestamp. The returned keys
-                            the returned certificates will need to be valid until to be
+                            MUST be valid until at least this timestamp.
                            useful to the requesting server.
                            If not supplied, the current time as determined by the notary
                            server is used.
Author	SHA1	Message	Date
famfo	0d41e54d84	Merge `70f6749c92` into `2f6867348f`	2025-12-21 15:27:24 +00:00
Andrew Morgan	2f6867348f	Replace Twitter link in footer with Masto/Bluesky (#2282 ) Some checks failed Spec / 🔎 Validate OpenAPI specifications (push) Has been cancelled Details Spec / 🔎 Check Event schema examples (push) Has been cancelled Details Spec / 🔎 Check OpenAPI definitions examples (push) Has been cancelled Details Spec / 🔎 Check JSON Schemas inline examples (push) Has been cancelled Details Spec / ⚙️ Calculate baseURL for later jobs (push) Has been cancelled Details Spec / 📢 Run towncrier for changelog (push) Has been cancelled Details Spell Check / Spell Check with Typos (push) Has been cancelled Details Spec / 🐍 Build OpenAPI definitions (push) Has been cancelled Details Spec / 📖 Build the spec (push) Has been cancelled Details Spec / 🔎 Validate generated HTML (push) Has been cancelled Details Spec / 📖 Build the historical backup spec (push) Has been cancelled Details	2025-12-19 15:59:08 +00:00
famfo	70f6749c92	changelogs/s2s: add minimum_valid_until_ts clarification	2025-09-11 02:19:33 +02:00
famfo	1583a12cec	s2s/keys: clarify minimum_valid_until_ts query Signed-off-by: famfo <famfo@famfo.xyz>	2025-09-11 02:19:33 +02:00
		`@ -0,0 +1 @@`
							`Replace the Twitter link in the footer with our BlueSky and Mastodon socials.`
		`@ -0,0 +1 @@`
							`Clarify what the minimum_valid_until_ts field means when it is set in key queries.`