From e9b6bbe1cf595232b9027ab5e3b5058bbf9b137b Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 17 Mar 2022 17:36:36 +0100 Subject: [PATCH 1/3] Remove origin from unsigned_pdu_base.yaml It doesn't serve a useful purpose, is not enforced to be present by Synapse and already being omitted by at least one homeserver implementation. --- data/api/server-server/definitions/unsigned_pdu_base.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/api/server-server/definitions/unsigned_pdu_base.yaml b/data/api/server-server/definitions/unsigned_pdu_base.yaml index a2bed9c3a..3eae5c3ce 100644 --- a/data/api/server-server/definitions/unsigned_pdu_base.yaml +++ b/data/api/server-server/definitions/unsigned_pdu_base.yaml @@ -25,10 +25,6 @@ properties: type: string description: The ID of the user sending the event. example: "@someone:matrix.org" - origin: - type: string - description: The `server_name` of the homeserver that created this event. - example: "matrix.org" origin_server_ts: type: integer format: int64 From 8c008c6217281f928612e48aa81d1ebf14d66008 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 17 Mar 2022 17:41:38 +0100 Subject: [PATCH 2/3] Add newsfragment for PDU origin field removal --- changelogs/server_server/newsfragments/998.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/server_server/newsfragments/998.clarification diff --git a/changelogs/server_server/newsfragments/998.clarification b/changelogs/server_server/newsfragments/998.clarification new file mode 100644 index 000000000..c285269ac --- /dev/null +++ b/changelogs/server_server/newsfragments/998.clarification @@ -0,0 +1 @@ +Remove `origin` field from PDUs which exists on many but not all PDUs in practice and doesn't serve an actual purpose. From ade5eb1b0b748af5e1f0bfaca5179beb1c44d64c Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Mon, 21 Mar 2022 11:01:10 +0100 Subject: [PATCH 3/3] fixup! Remove origin from unsigned_pdu_base.yaml --- data/api/server-server/definitions/unsigned_pdu_base.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/data/api/server-server/definitions/unsigned_pdu_base.yaml b/data/api/server-server/definitions/unsigned_pdu_base.yaml index 3eae5c3ce..20a3e83d7 100644 --- a/data/api/server-server/definitions/unsigned_pdu_base.yaml +++ b/data/api/server-server/definitions/unsigned_pdu_base.yaml @@ -124,7 +124,6 @@ required: - event_id - room_id - sender - - origin - origin_server_ts - type - content