@@ -308,8 +308,8 @@ route ClientApi where
309route FederationApi where
309route FederationApi where
310 POST {events: [GossipEventType], fromServer: ServerName} /federation/gossip -> {} = RecvGossip
310 POST {events: [GossipEventType], fromServer: ServerName} /federation/gossip -> {} = RecvGossip
311− POST {toKey: PubkeyHex, encryptedBlob: BlobHex, fromServer: ServerName} /federation/forward -> {} = ForwardMessage
311+ POST {toKey: PubkeyHex, encryptedBlob: BlobHex} /federation/forward -> {} = ForwardMessage
312− POST {forwards: [{toKey: PubkeyHex, encryptedBlob: BlobHex}], fromServer: ServerName} /federation/forward-batch -> {results: [{ok: Bool}]} = FederationBatchForward
312+ POST {forwards: [{toKey: PubkeyHex, encryptedBlob: BlobHex}]} /federation/forward-batch -> {results: [{ok: Bool}]} = FederationBatchForward
314route Api = AuthApi | ClientApi | FederationApi
314route Api = AuthApi | ClientApi | FederationApi
@@ -728,8 +728,7 @@ retryPendingForwards = do
728 forEach (filter (collectPeers fwds (\f -> f.toServer)) (\s -> shouldRetryServer s t failures)) (\server -> forEach (takeRelation maxBatchSize (filter fwds (\f -> f.toServer == server))) (\f -> do
728 forEach (filter (collectPeers fwds (\f -> f.toServer)) (\s -> shouldRetryServer s t failures)) (\server -> forEach (takeRelation maxBatchSize (filter fwds (\f -> f.toServer == server))) (\f -> do
729 result <- fetch (federationUrl server) (ForwardMessage {
729 result <- fetch (federationUrl server) (ForwardMessage {
731− f.encryptedBlob,
731+ f.encryptedBlob
732− fromServer: serverHost
734 success <- case result of
733 success <- case result of
735 Err _ -> do
734 Err _ -> do
@@ -1051,8 +1050,7 @@ forkForwardsTo = \to encryptedBlob servers -> forEach servers (\server -> do
1051 t <- now
1050 t <- now
1052 result <- fetch (federationUrl server) (ForwardMessage {
1051 result <- fetch (federationUrl server) (ForwardMessage {
1053 toKey: to,
1052 toKey: to,
1054− encryptedBlob,
1053+ encryptedBlob
1055− fromServer: serverHost
1057 case result of
1055 case result of
1058 Err _ -> recordFailure server
1056 Err _ -> recordFailure server
@@ -1145,8 +1143,8 @@ storeFederated = \toKey encryptedBlob checkRecvRate t -> do
1145-- POST /federation/forward: receive a single federated message destined for
1143-- POST /federation/forward: receive a single federated message destined for
1146-- a local key. Delegates the actual store decision to `storeFederated`,
1144-- a local key. Delegates the actual store decision to `storeFederated`,
1147-- which returns "" on success.
1145-- which returns "" on success.
1148−handleForwardMessage : PubkeyHex -> BlobHex -> Text -> IO {rw *messages, rw *pollWakeup, r *presence, rw *recvRates, rw *seqCounter, clock} (Result HttpError {})
1146+handleForwardMessage : PubkeyHex -> BlobHex -> IO {rw *messages, rw *pollWakeup, r *presence, rw *recvRates, rw *seqCounter, clock} (Result HttpError {})
1149−handleForwardMessage = \toKey encryptedBlob _ -> do
1147+handleForwardMessage = \toKey encryptedBlob -> do
1150 t <- now
1148 t <- now
1151 result <- atomic storeFederated toKey encryptedBlob (True {}) t
1149 result <- atomic storeFederated toKey encryptedBlob (True {}) t
1152 if result == ""
1150 if result == ""
@@ -1155,8 +1153,8 @@ handleForwardMessage = \toKey encryptedBlob _ -> do
1156-- POST /federation/forward-batch: bulk variant of `handleForwardMessage`.
1154-- POST /federation/forward-batch: bulk variant of `handleForwardMessage`.
1157-- Skips per-entry recv-rate charging.
1155-- Skips per-entry recv-rate charging.
1158−handleFederationBatchForward : [{encryptedBlob: BlobHex, toKey: PubkeyHex | a}] -> Text -> IO {clock} (Result HttpError {results: [{ok: Bool}]})
1156+handleFederationBatchForward : [{encryptedBlob: BlobHex, toKey: PubkeyHex | a}] -> IO {clock} (Result HttpError {results: [{ok: Bool}]})
1159−handleFederationBatchForward = \forwards _ -> do
1157+handleFederationBatchForward = \forwards -> do
1160 t <- now
1158 t <- now
1161 if count forwards > maxBatchSize
1159 if count forwards > maxBatchSize
1162 then yield (Err {error: {status: 400, message: "invalid_request"}})
1160 then yield (Err {error: {status: 400, message: "invalid_request"}})
@@ -1182,8 +1180,8 @@ api = serve Api where
1182 Poll = \{cursor, authorization, xForwardedFor} -> handlePoll cursor authorization (clientIpOf xForwardedFor)
1180 Poll = \{cursor, authorization, xForwardedFor} -> handlePoll cursor authorization (clientIpOf xForwardedFor)
1183 SendMessages = \{messages, authorization, xForwardedFor} -> handleSendMessages messages authorization (clientIpOf xForwardedFor)
1181 SendMessages = \{messages, authorization, xForwardedFor} -> handleSendMessages messages authorization (clientIpOf xForwardedFor)
1184 RecvGossip = \{events, fromServer} -> handleRecvGossip events fromServer
1182 RecvGossip = \{events, fromServer} -> handleRecvGossip events fromServer
1185− ForwardMessage = \{toKey, encryptedBlob, fromServer} -> handleForwardMessage toKey encryptedBlob fromServer
1183+ ForwardMessage = \{toKey, encryptedBlob} -> handleForwardMessage toKey encryptedBlob
1186− FederationBatchForward = \{forwards, fromServer} -> handleFederationBatchForward forwards fromServer
1184+ FederationBatchForward = \{forwards} -> handleFederationBatchForward forwards
1188-- ============================================
1186-- ============================================
1189-- Background loops
1187-- Background loops