mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-16 03:13:11 -06:00
Build issues resolved
This commit is contained in:
parent
1321c5cad6
commit
03e2de54cc
|
|
@ -85,8 +85,8 @@ func PutTag(
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(data) > 0 {
|
if len(data) > 0 {
|
||||||
dataByte, err := json.Marshal(data)
|
dataByte, _ := json.Marshal(data)
|
||||||
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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -111,8 +111,8 @@ func DeleteTag(
|
||||||
mtag := newMTag()
|
mtag := newMTag()
|
||||||
|
|
||||||
if len(data) > 0 {
|
if len(data) > 0 {
|
||||||
dataByte, err := json.Marshal(data)
|
dataByte, _ := json.Marshal(data)
|
||||||
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)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -164,7 +164,7 @@ func addDataToDB(req *http.Request, localpart string, roomID string, accountDB *
|
||||||
if err := accountDB.SaveAccountData(
|
if err := accountDB.SaveAccountData(
|
||||||
req.Context(), localpart, roomID, "m.tag", string(newTagData),
|
req.Context(), localpart, roomID, "m.tag", string(newTagData),
|
||||||
); err != nil {
|
); err != nil {
|
||||||
raiseError(req, err)
|
httputil.LogThenError(req, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue