From f5039ee40a82cdfa18d7a8cd2b2d593353c53cb1 Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Fri, 21 Apr 2023 10:14:20 -0600 Subject: [PATCH] Remove direct access to httpClient in fedclient --- cmd/dendrite-demo-pinecone/users/users.go | 2 +- cmd/furl/main.go | 2 +- setup/base/base.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/dendrite-demo-pinecone/users/users.go b/cmd/dendrite-demo-pinecone/users/users.go index 5de8b8e95..079df328d 100644 --- a/cmd/dendrite-demo-pinecone/users/users.go +++ b/cmd/dendrite-demo-pinecone/users/users.go @@ -127,7 +127,7 @@ func bulkFetchUserDirectoriesFromServers( ) } res := &userapi.QuerySearchProfilesResponse{} - if err = fedClient.InternalClient().DoRequestAndParseResponse(reqctx, httpReq, res); err != nil { + if err = fedClient.DoRequestAndParseResponse(reqctx, httpReq, res); err != nil { util.GetLogger(reqctx).WithError(err).WithField("hs", homeserverDomain).Warn( "bulkFetchUserDirectoriesFromServers: failed to query hs", ) diff --git a/cmd/furl/main.go b/cmd/furl/main.go index b775359c3..cdfef09f7 100644 --- a/cmd/furl/main.go +++ b/cmd/furl/main.go @@ -111,7 +111,7 @@ func main() { } var res interface{} - err = client.InternalClient().DoRequestAndParseResponse( + err = client.DoRequestAndParseResponse( context.TODO(), httpReq, &res, diff --git a/setup/base/base.go b/setup/base/base.go index f595d8d35..d96365cf0 100644 --- a/setup/base/base.go +++ b/setup/base/base.go @@ -92,7 +92,7 @@ func CreateFederationClient(cfg *config.Dendrite, dnsCache *fclient.DNSCache) fc client := fclient.NewFederationClient( identities, opts..., ) - client.InternalClient().SetUserAgent(fmt.Sprintf("Dendrite/%s", internal.VersionString())) + client.WithUserAgent(fmt.Sprintf("Dendrite/%s", internal.VersionString())) return client }