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

Build issues resolved

Browse source
This commit is contained in:
SUMUKHA-PK 2019-03-16 18:05:51 +05:30
parent 1321c5cad6
commit 03e2de54cc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,8 +85,8 @@ func PutTag(
}
if len(data) > 0 {
dataByte, err := json.Marshal(data)
if err = json.Unmarshal(dataByte, &mtag); err != nil {
dataByte, _ := json.Marshal(data)
if err := json.Unmarshal(dataByte, &mtag); err != nil {
return httputil.LogThenError(req, err)
}
}
@ -111,8 +111,8 @@ func DeleteTag(
mtag := newMTag()
if len(data) > 0 {
dataByte, err := json.Marshal(data)
if err = json.Unmarshal(dataByte, &mtag); err != nil {
dataByte, _ := json.Marshal(data)
if err := json.Unmarshal(dataByte, &mtag); err != nil {
return httputil.LogThenError(req, err)
}
} else {
@ -164,7 +164,7 @@ func addDataToDB(req *http.Request, localpart string, roomID string, accountDB *
if err := accountDB.SaveAccountData(
req.Context(), localpart, roomID, "m.tag", string(newTagData),
); err != nil {
raiseError(req, err)
httputil.LogThenError(req, err)
}
}