@@ -308,8 +308,8 @@ route ClientApi where
308308
309309route FederationApi where
310310 POST {events: [GossipEventType], fromServer: ServerName} /federation/gossip -> {} = RecvGossip
311− POST {toKey: PubkeyHex, encryptedBlob: BlobHex, fromServer: ServerName} /federation/forward -> {} = ForwardMessage
312− POST {forwards: [{toKey: PubkeyHex, encryptedBlob: BlobHex}], fromServer: ServerName} /federation/forward-batch -> {results: [{ok: Bool}]} = FederationBatchForward
311+ POST {toKey: PubkeyHex, encryptedBlob: BlobHex} /federation/forward -> {} = ForwardMessage
312+ POST {forwards: [{toKey: PubkeyHex, encryptedBlob: BlobHex}]} /federation/forward-batch -> {results: [{ok: Bool}]} = FederationBatchForward
313313
314314route Api = AuthApi | ClientApi | FederationApi
315315
@@ -728,8 +728,7 @@ retryPendingForwards = do
728728 forEach (filter (collectPeers fwds (\f -> f.toServer)) (\s -> shouldRetryServer s t failures)) (\server -> forEach (takeRelation maxBatchSize (filter fwds (\f -> f.toServer == server))) (\f -> do
729729 result <- fetch (federationUrl server) (ForwardMessage {
730730 f.toKey,
731− f.encryptedBlob,
732− fromServer: serverHost
731+ f.encryptedBlob
733732 })
734733 success <- case result of
735734 Err _ -> do
@@ -1051,8 +1050,7 @@ forkForwardsTo = \to encryptedBlob servers -> forEach servers (\server -> do
10511050 t <- now
10521051 result <- fetch (federationUrl server) (ForwardMessage {
10531052 toKey: to,
1054− encryptedBlob,
1055− fromServer: serverHost
1053+ encryptedBlob
10561054 })
10571055 case result of
10581056 Err _ -> recordFailure server
@@ -1145,8 +1143,8 @@ storeFederated = \toKey encryptedBlob checkRecvRate t -> do
11451143-- POST /federation/forward: receive a single federated message destined for
11461144-- a local key. Delegates the actual store decision to `storeFederated`,
11471145-- which returns "" on success.
1148−handleForwardMessage : PubkeyHex -> BlobHex -> Text -> IO {rw *messages, rw *pollWakeup, r *presence, rw *recvRates, rw *seqCounter, clock} (Result HttpError {})
1149−handleForwardMessage = \toKey encryptedBlob _ -> do
1146+handleForwardMessage : PubkeyHex -> BlobHex -> IO {rw *messages, rw *pollWakeup, r *presence, rw *recvRates, rw *seqCounter, clock} (Result HttpError {})
1147+handleForwardMessage = \toKey encryptedBlob -> do
11501148 t <- now
11511149 result <- atomic storeFederated toKey encryptedBlob (True {}) t
11521150 if result == ""
@@ -1155,8 +1153,8 @@ handleForwardMessage = \toKey encryptedBlob _ -> do
11551153
11561154-- POST /federation/forward-batch: bulk variant of `handleForwardMessage`.
11571155-- Skips per-entry recv-rate charging.
1158−handleFederationBatchForward : [{encryptedBlob: BlobHex, toKey: PubkeyHex | a}] -> Text -> IO {clock} (Result HttpError {results: [{ok: Bool}]})
1159−handleFederationBatchForward = \forwards _ -> do
1156+handleFederationBatchForward : [{encryptedBlob: BlobHex, toKey: PubkeyHex | a}] -> IO {clock} (Result HttpError {results: [{ok: Bool}]})
1157+handleFederationBatchForward = \forwards -> do
11601158 t <- now
11611159 if count forwards > maxBatchSize
11621160 then yield (Err {error: {status: 400, message: "invalid_request"}})
@@ -1182,8 +1180,8 @@ api = serve Api where
11821180 Poll = \{cursor, authorization, xForwardedFor} -> handlePoll cursor authorization (clientIpOf xForwardedFor)
11831181 SendMessages = \{messages, authorization, xForwardedFor} -> handleSendMessages messages authorization (clientIpOf xForwardedFor)
11841182 RecvGossip = \{events, fromServer} -> handleRecvGossip events fromServer
1185− ForwardMessage = \{toKey, encryptedBlob, fromServer} -> handleForwardMessage toKey encryptedBlob fromServer
1186− FederationBatchForward = \{forwards, fromServer} -> handleFederationBatchForward forwards fromServer
1183+ ForwardMessage = \{toKey, encryptedBlob} -> handleForwardMessage toKey encryptedBlob
1184+ FederationBatchForward = \{forwards} -> handleFederationBatchForward forwards
11871185
11881186-- ============================================
11891187-- Background loops