mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-18 12:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Drop Get from version package

Browse source
This commit is contained in:
Neil Alexander 2020-03-16 15:20:23 +00:00
parent eee88ba2ac
commit 492980e098
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roomserver/query/query.go
View file

@ -732,9 +732,9 @@ func (r *RoomserverQueryAPI) QueryRoomVersionCapabilities(
request *api.QueryRoomVersionCapabilitiesRequest, request *api.QueryRoomVersionCapabilitiesRequest,
response *api.QueryRoomVersionCapabilitiesResponse, response *api.QueryRoomVersionCapabilitiesResponse,
) error { ) error {
response.DefaultRoomVersion = string(version.GetDefaultRoomVersion()) response.DefaultRoomVersion = string(version.DefaultRoomVersion())
response.AvailableRoomVersions = make(map[string]string) response.AvailableRoomVersions = make(map[string]string)
for v, desc := range version.GetSupportedRoomVersions() { for v, desc := range version.SupportedRoomVersions() {
sv := string(v) sv := string(v)
if desc.Stable { if desc.Stable {
response.AvailableRoomVersions[sv] = "stable" response.AvailableRoomVersions[sv] = "stable"

24
roomserver/version/version.go
View file

@ -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. // default, be used to create new rooms on this server.
func GetDefaultRoomVersion() gomatrixserverlib.RoomVersion { func DefaultRoomVersion() gomatrixserverlib.RoomVersion {
return gomatrixserverlib.RoomVersionV1 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. // server.
func GetRoomVersions() map[gomatrixserverlib.RoomVersion]RoomVersionDescription { func RoomVersions() map[gomatrixserverlib.RoomVersion]RoomVersionDescription {
return roomVersions 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. // 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) versions := make(map[gomatrixserverlib.RoomVersion]RoomVersionDescription)
for id, version := range GetRoomVersions() { for id, version := range RoomVersions() {
if version.Supported { if version.Supported {
versions[id] = version versions[id] = version
} }
@ -75,22 +75,22 @@ func GetSupportedRoomVersions() map[gomatrixserverlib.RoomVersion]RoomVersionDes
return versions 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 // An UnknownVersionError is returned if the version is not known
// to the server. // to the server.
func GetRoomVersion(version gomatrixserverlib.RoomVersion) (RoomVersionDescription, error) { func RoomVersion(version gomatrixserverlib.RoomVersion) (RoomVersionDescription, error) {
if version, ok := roomVersions[version]; ok { if version, ok := roomVersions[version]; ok {
return version, nil return version, nil
} }
return RoomVersionDescription{}, UnknownVersionError{version} 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 // version. An UnknownVersionError is returned if the version is not
// known to the server, or an UnsupportedVersionError is returned if // known to the server, or an UnsupportedVersionError is returned if
// the version is known but specifically marked as unsupported. // the version is known but specifically marked as unsupported.
func GetSupportedRoomVersion(version gomatrixserverlib.RoomVersion) (RoomVersionDescription, error) { func SupportedRoomVersion(version gomatrixserverlib.RoomVersion) (RoomVersionDescription, error) {
result, err := GetRoomVersion(version) result, err := RoomVersion(version)
if err != nil { if err != nil {
return RoomVersionDescription{}, err return RoomVersionDescription{}, err
} }