aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-05-26 14:41:16 +0100
committerGitHub <noreply@github.com>2020-05-26 14:41:16 +0100
commit6d50212f29f2ce3231097833de7686e3237359b4 (patch)
tree918e8badc8e9eb6f34fc16a206099669dd1f58a3 /internal
parent492af0f2ec3850d41dd02c9c512de8361d50d271 (diff)
Miscellaneous fixes (#1060)
* Add missing routing for PerformDirectoryLookupRequest * Tweak output * Fix some bugs in devices * Don't default to federated room joins in response to invite * Update sytest-whitelist * Update comments * Return correct room ID from PerformJoin * Fix appservice and EDU server API setup, update sytest-whitelist * Update sytest-whitelist
Diffstat (limited to 'internal')
-rw-r--r--internal/http/http.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/http/http.go b/internal/http/http.go
index da90b375..2b189140 100644
--- a/internal/http/http.go
+++ b/internal/http/http.go
@@ -60,9 +60,9 @@ func PostJSON(
Message string `json:"message"`
}
if msgerr := json.NewDecoder(res.Body).Decode(&errorBody); msgerr == nil {
- return fmt.Errorf("api: %d from %s: %s", res.StatusCode, apiURL, errorBody.Message)
+ return fmt.Errorf("Internal API: %d from %s: %s", res.StatusCode, apiURL, errorBody.Message)
}
- return fmt.Errorf("api: %d from %s", res.StatusCode, apiURL)
+ return fmt.Errorf("Internal API: %d from %s", res.StatusCode, apiURL)
}
return json.NewDecoder(res.Body).Decode(response)
}