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

Split update of string or boolean attribute in two separate functions

Browse source
This commit is contained in:
Brendan Abolivier 2017-08-17 15:12:54 +01:00
parent ed86011704
commit ab2aae2862
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/github.com/matrix-org/dendrite/publicroomsapi/storage/storage.go
View file

@ -130,34 +130,34 @@ func (d *PublicRoomsServerDatabase) UpdateRoomFromEvent(
var content common.CanonicalAliasContent var content common.CanonicalAliasContent
field := &(content.Alias) field := &(content.Alias)
attrName := "canonical_alias" attrName := "canonical_alias"
return d.updateStringOrBooleanAttribute(attrName, event, &content, field, "", roomID) return d.updateStringAttribute(attrName, event, &content, field, roomID)
case "m.room.name": case "m.room.name":
var content common.NameContent var content common.NameContent
field := &(content.Name) field := &(content.Name)
attrName := "name" attrName := "name"
return d.updateStringOrBooleanAttribute(attrName, event, &content, field, "", roomID) return d.updateStringAttribute(attrName, event, &content, field, roomID)
case "m.room.topic": case "m.room.topic":
var content common.TopicContent var content common.TopicContent
field := &(content.Topic) field := &(content.Topic)
attrName := "topic" attrName := "topic"
return d.updateStringOrBooleanAttribute(attrName, event, &content, field, "", roomID) return d.updateStringAttribute(attrName, event, &content, field, roomID)
case "m.room.avatar": case "m.room.avatar":
var content common.AvatarContent var content common.AvatarContent
field := &(content.URL) field := &(content.URL)
attrName := "avatar_url" attrName := "avatar_url"
return d.updateStringOrBooleanAttribute(attrName, event, &content, field, "", roomID) return d.updateStringAttribute(attrName, event, &content, field, roomID)
case "m.room.history_visibility": case "m.room.history_visibility":
var content common.HistoryVisibilityContent var content common.HistoryVisibilityContent
field := &(content.HistoryVisibility) field := &(content.HistoryVisibility)
attrName := "world_readable" attrName := "world_readable"
strForTrue := "world_readable" strForTrue := "world_readable"
return d.updateStringOrBooleanAttribute(attrName, event, &content, field, strForTrue, roomID) return d.updateBooleanAttribute(attrName, event, &content, field, strForTrue, roomID)
case "m.room.guest_access": case "m.room.guest_access":
var content common.GuestAccessContent var content common.GuestAccessContent
field := &(content.GuestAccess) field := &(content.GuestAccess)
attrName := "guest_can_join" attrName := "guest_can_join"
strForTrue := "can_join" strForTrue := "can_join"
return d.updateStringOrBooleanAttribute(attrName, event, &content, field, strForTrue, roomID) return d.updateBooleanAttribute(attrName, event, &content, field, strForTrue, roomID)
} }
// If the event type didn't match, return with no error // If the event type didn't match, return with no error
@ -192,17 +192,29 @@ func (d *PublicRoomsServerDatabase) updateNumJoinedUsers(
} }
} }
// updateStringOrBooleanAttribute updates a given string or boolean attribute in // updateStringAttribute updates a given string attribute in the database
// the database representation of the room identified by a given ID, using a given // representation of the room identified by a given ID, using a given string data
// string data field from content of the Matrix event triggering the update. // field from content of the Matrix event triggering the update.
// It determines the attribute's type by checking the length of the given strForTrue
// parameter: If it's a non-empty string, it means that the attribute is a boolean
// which will be set to true if the given data field matches it, and to false in
// any other case. If the string is empty, it means that the attribute is a string
// and will be updated with the field's value.
// Returns an error if decoding the Matrix event's content or updating the attribute // Returns an error if decoding the Matrix event's content or updating the attribute
// failed. // failed.
func (d *PublicRoomsServerDatabase) updateStringOrBooleanAttribute( func (d *PublicRoomsServerDatabase) updateStringAttribute(
attrName string, event gomatrixserverlib.Event, content interface{},
field *string, roomID string,
) error {
if err := json.Unmarshal(event.Content(), content); err != nil {
return err
}
return d.statements.updateRoomAttribute(attrName, *field, roomID)
}
// updateBooleanAttribute updates a given boolean attribute in the database
// representation of the room identified by a given ID, using a given string data
// field from content of the Matrix event triggering the update.
// The attribute is set to true if the field matches a given string, false if not.
// Returns an error if decoding the Matrix event's content or updating the attribute
// failed.
func (d *PublicRoomsServerDatabase) updateBooleanAttribute(
attrName string, event gomatrixserverlib.Event, content interface{}, attrName string, event gomatrixserverlib.Event, content interface{},
field *string, strForTrue string, roomID string, field *string, strForTrue string, roomID string,
) error { ) error {
@ -210,18 +222,12 @@ func (d *PublicRoomsServerDatabase) updateStringOrBooleanAttribute(
return err return err
} }
var attrValue attributeValue var attrValue bool
if len(strForTrue) > 0 {
// We're processing a boolean attribute
if *field == strForTrue { if *field == strForTrue {
attrValue = true attrValue = true
} else { } else {
attrValue = false attrValue = false
} }
} else {
// We're processing a string attribute
attrValue = *field
}
return d.statements.updateRoomAttribute(attrName, attrValue, roomID) return d.statements.updateRoomAttribute(attrName, attrValue, roomID)
} }