From 492980e09850da9b925963d967140d876474967b Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Mon, 16 Mar 2020 15:20:23 +0000 Subject: [PATCH] Drop Get from version package --- roomserver/query/query.go | 4 ++-- roomserver/version/version.go | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/roomserver/query/query.go b/roomserver/query/query.go index d0be18e72..83f89777f 100644 --- a/roomserver/query/query.go +++ b/roomserver/query/query.go @@ -732,9 +732,9 @@ func (r *RoomserverQueryAPI) QueryRoomVersionCapabilities( request *api.QueryRoomVersionCapabilitiesRequest, response *api.QueryRoomVersionCapabilitiesResponse, ) error { - response.DefaultRoomVersion = string(version.GetDefaultRoomVersion()) + response.DefaultRoomVersion = string(version.DefaultRoomVersion()) response.AvailableRoomVersions = make(map[string]string) - for v, desc := range version.GetSupportedRoomVersions() { + for v, desc := range version.SupportedRoomVersions() { sv := string(v) if desc.Stable { response.AvailableRoomVersions[sv] = "stable" diff --git a/roomserver/version/version.go b/roomserver/version/version.go index 6d6e0338b..90bfc0a2c 100644 --- a/roomserver/version/version.go +++ b/roomserver/version/version.go @@ -51,23 +51,23 @@ var roomVersions = map[gomatrixserverlib.RoomVersion]RoomVersionDescription{ }, } -// GetDefaultRoomVersion contains the room version that will, by +// DefaultRoomVersion contains the room version that will, by // default, be used to create new rooms on this server. -func GetDefaultRoomVersion() gomatrixserverlib.RoomVersion { +func DefaultRoomVersion() gomatrixserverlib.RoomVersion { return gomatrixserverlib.RoomVersionV1 } -// GetRoomVersions returns a map of all known room versions to this +// RoomVersions returns a map of all known room versions to this // server. -func GetRoomVersions() map[gomatrixserverlib.RoomVersion]RoomVersionDescription { +func RoomVersions() map[gomatrixserverlib.RoomVersion]RoomVersionDescription { return roomVersions } -// GetSupportedRoomVersions returns a map of descriptions for room +// SupportedRoomVersions returns a map of descriptions for room // versions that are supported by this homeserver. -func GetSupportedRoomVersions() map[gomatrixserverlib.RoomVersion]RoomVersionDescription { +func SupportedRoomVersions() map[gomatrixserverlib.RoomVersion]RoomVersionDescription { versions := make(map[gomatrixserverlib.RoomVersion]RoomVersionDescription) - for id, version := range GetRoomVersions() { + for id, version := range RoomVersions() { if version.Supported { versions[id] = version } @@ -75,22 +75,22 @@ func GetSupportedRoomVersions() map[gomatrixserverlib.RoomVersion]RoomVersionDes return versions } -// GetRoomVersion returns information about a specific room version. +// RoomVersion returns information about a specific room version. // An UnknownVersionError is returned if the version is not known // to the server. -func GetRoomVersion(version gomatrixserverlib.RoomVersion) (RoomVersionDescription, error) { +func RoomVersion(version gomatrixserverlib.RoomVersion) (RoomVersionDescription, error) { if version, ok := roomVersions[version]; ok { return version, nil } return RoomVersionDescription{}, UnknownVersionError{version} } -// GetSupportedRoomVersion returns information about a specific room +// SupportedRoomVersion returns information about a specific room // version. An UnknownVersionError is returned if the version is not // known to the server, or an UnsupportedVersionError is returned if // the version is known but specifically marked as unsupported. -func GetSupportedRoomVersion(version gomatrixserverlib.RoomVersion) (RoomVersionDescription, error) { - result, err := GetRoomVersion(version) +func SupportedRoomVersion(version gomatrixserverlib.RoomVersion) (RoomVersionDescription, error) { + result, err := RoomVersion(version) if err != nil { return RoomVersionDescription{}, err }