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

Suggested changes made

Browse source
This commit is contained in:
SUMUKHA-PK 2019-03-21 17:38:44 +05:30
parent 9ac994cdb7
commit 88dd800762
2 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/github.com/matrix-org/dendrite/clientapi/routing/room_tagging.go
View file

@ -26,7 +26,7 @@ import (
"github.com/matrix-org/util" "github.com/matrix-org/util"
) )
// newMTag creates and returns a new MTag type variable // newMTag creates and returns a new MTag type
func newMTag() common.MTag { func newMTag() common.MTag {
return common.MTag{ return common.MTag{
Tags: make(map[string]common.TagProperties), Tags: make(map[string]common.TagProperties),
@ -55,7 +55,10 @@ func GetTag(
httputil.LogThenError(req, err) httputil.LogThenError(req, err)
} }
dataByte, _ := json.Marshal(data) dataByte, err := json.Marshal(data)
if err != nil {
httputil.LogThenError(req, err)
}
err = json.Unmarshal(dataByte, &mtag) err = json.Unmarshal(dataByte, &mtag)
if err != nil { if err != nil {
@ -89,8 +92,11 @@ func PutTag(
} }
if len(data) > 0 { if len(data) > 0 {
dataByte, _ := json.Marshal(data) dataByte, err := json.Marshal(data)
if err := json.Unmarshal(dataByte, &mtag); err != nil { if err != nil {
httputil.LogThenError(req, err)
}
if err = json.Unmarshal(dataByte, &mtag); err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
} }
@ -119,7 +125,10 @@ func DeleteTag(
mtag := newMTag() mtag := newMTag()
if len(data) > 0 { if len(data) > 0 {
dataByte, _ := json.Marshal(data) dataByte, err := json.Marshal(data)
if err != nil {
httputil.LogThenError(req, err)
}
if err := json.Unmarshal(dataByte, &mtag); err != nil { if err := json.Unmarshal(dataByte, &mtag); err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
@ -149,7 +158,12 @@ func DeleteTag(
} }
// obtainSavedTags is a utility function to get all the tags saved in the DB // obtainSavedTags is a utility function to get all the tags saved in the DB
func obtainSavedTags(req *http.Request, userID string, roomID string, accountDB *accounts.Database) (string, []gomatrixserverlib.ClientEvent, error) { func obtainSavedTags(
req *http.Request,
userID string,
roomID string,
accountDB *accounts.Database,
) (string, []gomatrixserverlib.ClientEvent, error) {
localpart, _, err := gomatrixserverlib.SplitID('@', userID) localpart, _, err := gomatrixserverlib.SplitID('@', userID)
if err != nil { if err != nil {
return "", []gomatrixserverlib.ClientEvent{}, err return "", []gomatrixserverlib.ClientEvent{}, err
@ -166,10 +180,18 @@ func obtainSavedTags(req *http.Request, userID string, roomID string, accountDB
} }
// addDataToDB is a utility function to save the tag data into the DB // addDataToDB is a utility function to save the tag data into the DB
func addDataToDB(req *http.Request, localpart string, roomID string, accountDB *accounts.Database, mtag common.MTag) { func addDataToDB(
newTagData, _ := json.Marshal(mtag) req *http.Request,
localpart string,
if err := accountDB.SaveAccountData( roomID string,
accountDB *accounts.Database,
mtag common.MTag,
) {
newTagData, err := json.Marshal(mtag)
if err != nil {
httputil.LogThenError(req, err)
}
if err = accountDB.SaveAccountData(
req.Context(), localpart, roomID, "m.tag", string(newTagData), req.Context(), localpart, roomID, "m.tag", string(newTagData),
); err != nil { ); err != nil {
httputil.LogThenError(req, err) httputil.LogThenError(req, err)

2
src/github.com/matrix-org/dendrite/common/types.go
View file

@ -51,7 +51,7 @@ type MTag struct {
Tags map[string]TagProperties `json:"tags"` Tags map[string]TagProperties `json:"tags"`
} }
// TagProperties contains the properties of an MTag datatype // TagProperties contains the properties of an MTag
type TagProperties struct { type TagProperties struct {
Order float32 `json:"order,omitempty"` // Empty values must be neglected Order float32 `json:"order,omitempty"` // Empty values must be neglected
} }