mirror of
https://github.com/hoernschen/dendrite.git
synced 2025-07-31 13:22:46 +00:00
Use new gmsl to use new String() API
This commit is contained in:
parent
9e9617ff84
commit
b00e272e6f
7 changed files with 11 additions and 13 deletions
|
@ -34,7 +34,7 @@ func GetTransactionFromRelay(
|
|||
relayAPI api.RelayInternalAPI,
|
||||
userID spec.UserID,
|
||||
) util.JSONResponse {
|
||||
logrus.Infof("Processing relay_txn for %s", userID.Raw())
|
||||
logrus.Infof("Processing relay_txn for %s", userID.String())
|
||||
|
||||
var previousEntry fclient.RelayEntry
|
||||
if err := json.Unmarshal(fedReq.Content(), &previousEntry); err != nil {
|
||||
|
|
|
@ -35,7 +35,7 @@ func createQuery(
|
|||
prevEntry fclient.RelayEntry,
|
||||
) fclient.FederationRequest {
|
||||
var federationPathPrefixV1 = "/_matrix/federation/v1"
|
||||
path := federationPathPrefixV1 + "/relay_txn/" + userID.Raw()
|
||||
path := federationPathPrefixV1 + "/relay_txn/" + userID.String()
|
||||
request := fclient.NewFederationRequest("GET", userID.Domain(), "relay", path)
|
||||
request.SetContent(prevEntry)
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ func SendTransactionToRelay(
|
|||
txnID gomatrixserverlib.TransactionID,
|
||||
userID spec.UserID,
|
||||
) util.JSONResponse {
|
||||
logrus.Infof("Processing send_relay for %s", userID.Raw())
|
||||
logrus.Infof("Processing send_relay for %s", userID.String())
|
||||
|
||||
var txnEvents fclient.RelayEvents
|
||||
if err := json.Unmarshal(fedReq.Content(), &txnEvents); err != nil {
|
||||
|
|
|
@ -52,7 +52,7 @@ func createFederationRequest(
|
|||
content interface{},
|
||||
) fclient.FederationRequest {
|
||||
var federationPathPrefixV1 = "/_matrix/federation/v1"
|
||||
path := federationPathPrefixV1 + "/send_relay/" + string(txnID) + "/" + userID.Raw()
|
||||
path := federationPathPrefixV1 + "/send_relay/" + string(txnID) + "/" + userID.String()
|
||||
request := fclient.NewFederationRequest("PUT", origin, destination, path)
|
||||
request.SetContent(content)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue