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

Some minor changes

Browse source
This commit is contained in:
SUMUKHA-PK 2019-08-02 14:32:30 +05:30
parent 6926685e54
commit cfeda08f1c
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clientapi/routing/room_tagging.go
View file

@ -66,12 +66,6 @@ func GetTags(
} }
} }
go func() {
if err := syncProducer.SendData(userID, roomID, "m.tag"); err != nil {
logrus.WithError(err).Error("Incremental sync operation failed")
}
}()
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusOK, Code: http.StatusOK,
JSON: data[0].Content, JSON: data[0].Content,
@ -80,7 +74,7 @@ func GetTags(
// PutTag implements PUT /_matrix/client/r0/user/{userID}/rooms/{roomID}/tags/{tag} // PutTag implements PUT /_matrix/client/r0/user/{userID}/rooms/{roomID}/tags/{tag}
// Put functionality works by getting existing data from the DB (if any), adding // Put functionality works by getting existing data from the DB (if any), adding
// the tag on to the "map" and saving the new "map" onto the DB // the tag to the "map" and saving the new "map" to the DB
func PutTag( func PutTag(
req *http.Request, req *http.Request,
accountDB *accounts.Database, accountDB *accounts.Database,
@ -108,11 +102,13 @@ func PutTag(
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
tagContent := newTag() var tagContent gomatrix.TagContent
if len(data) > 0 { if len(data) > 0 {
if err = json.Unmarshal(data[0].Content, &tagContent); err != nil { if err = json.Unmarshal(data[0].Content, &tagContent); err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
}else{
tagContent = newTag()
} }
tagContent.Tags[tag] = properties tagContent.Tags[tag] = properties
if err = saveTagData(req, localpart, roomID, accountDB, tagContent); err != nil { if err = saveTagData(req, localpart, roomID, accountDB, tagContent); err != nil {
@ -121,7 +117,7 @@ func PutTag(
go func() { go func() {
if err := syncProducer.SendData(userID, roomID, "m.tag"); err != nil { if err := syncProducer.SendData(userID, roomID, "m.tag"); err != nil {
logrus.WithError(err).Error("Incremental sync operation failed") logrus.WithError(err).Error("Failed to send m.tag account data update to syncapi")
} }
}() }()
@ -132,7 +128,7 @@ func PutTag(
} }
// DeleteTag implements DELETE /_matrix/client/r0/user/{userID}/rooms/{roomID}/tags/{tag} // DeleteTag implements DELETE /_matrix/client/r0/user/{userID}/rooms/{roomID}/tags/{tag}
// Delete functionality works by obtaining the saved Tags, removing the intended tag from // Delete functionality works by obtaining the saved tags, removing the intended tag from
// the "map" and then saving the new "map" in the DB // the "map" and then saving the new "map" in the DB
func DeleteTag( func DeleteTag(
req *http.Request, req *http.Request,
@ -158,7 +154,7 @@ func DeleteTag(
// If there are no tags in the database, exit // If there are no tags in the database, exit
if len(data) == 0 { if len(data) == 0 {
//Specifications mentions a 200 OK response is returned on finding no Tags, same policy is followed here. // Spec only defines 200 responses for this endpoint so we don't return anything else.
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusOK, Code: http.StatusOK,
JSON: struct{}{}, JSON: struct{}{},
@ -171,11 +167,11 @@ func DeleteTag(
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
// Check whether the Tag to be deleted exists // Check whether the tag to be deleted exists
if _, ok := tagContent.Tags[tag]; ok { if _, ok := tagContent.Tags[tag]; ok {
delete(tagContent.Tags, tag) delete(tagContent.Tags, tag)
} else { } else {
//Specifications mentions a 200 OK response is returned on finding no Tags, same policy is followed here. // Spec only defines 200 responses for this endpoint so we don't return anything else.
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusOK, Code: http.StatusOK,
JSON: struct{}{}, JSON: struct{}{},
@ -187,7 +183,7 @@ func DeleteTag(
go func() { go func() {
if err := syncProducer.SendData(userID, roomID, "m.tag"); err != nil { if err := syncProducer.SendData(userID, roomID, "m.tag"); err != nil {
logrus.WithError(err).Error("Incremental sync operation failed") logrus.WithError(err).Error("Failed to send m.tag account data update to syncapi")
} }
}() }()