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

Some changes

Browse source
This commit is contained in:
SUMUKHA-PK 2019-07-31 19:21:38 +05:30
parent 97e7729021
commit 6ace5d0737
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
clientapi/routing/room_tagging.go
View file

@ -32,7 +32,7 @@ import (
// newTag creates and returns a new Tag type // newTag creates and returns a new Tag type
func newTag() gomatrix.TagContent { func newTag() gomatrix.TagContent {
return gomatrix.TagContent{ return gomatrix.TagContent{
Map: make(map[string]gomatrix.TagProperties), Tags: make(map[string]gomatrix.TagProperties),
} }
} }
@ -74,14 +74,23 @@ func GetTags(
var tagData []gomatrix.TagData var tagData []gomatrix.TagData
tagContent := newTag() tagContent := newTag()
err = json.Unmarshal(dataByte, &tagData) err = json.Unmarshal(dataByte, &tagData)
tagData[0].Content.Map["something"] = gomatrix.TagProperties{0} // tagData[0].Content.Tags["something"] = gomatrix.TagProperties{0}
logrus.Info(tagData[0].Content.Map) logrus.Info(tagData[0].Content.Tags)
logrus.Info(tagData[0].Content)
tagContent = tagData[0].Content tagContent = tagData[0].Content
logrus.Info(tagContent)
logrus.Info(tagContent.Tags)
if err != nil { if err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
// outJSON, err := json.Marshal(tagContent)
// if err != nil {
// return httputil.LogThenError(req, err)
// }
// logrus.Info(string(outJSON))
// // send data to syncapi // // send data to syncapi
// if err := syncProducer.SendData(userID, roomID, tag); err != nil { // if err := syncProducer.SendData(userID, roomID, tag); err != nil {
// return httputil.LogThenError(req, err) // return httputil.LogThenError(req, err)
@ -89,7 +98,7 @@ func GetTags(
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusOK, Code: http.StatusOK,
JSON: tagContent.Map, JSON: tagContent,
} }
} }
@ -134,7 +143,7 @@ func PutTag(
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
} }
tagContent.Map[tag] = properties tagContent.Tags[tag] = properties
err = saveTagData(req, localpart, roomID, accountDB, tagContent) err = saveTagData(req, localpart, roomID, accountDB, tagContent)
if err != nil { if err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
@ -194,8 +203,8 @@ func DeleteTag(
} }
// Check whether the Tag to be deleted exists // Check whether the Tag to be deleted exists
if _, ok := tagContent.Map[tag]; ok { if _, ok := tagContent.Tags[tag]; ok {
delete(tagContent.Map, tag) delete(tagContent.Tags, tag)
} else { } else {
//Synapse returns a 200 OK response on finding no Tags, same policy is followed here. //Synapse returns a 200 OK response on finding no Tags, same policy is followed here.
return util.JSONResponse{ return util.JSONResponse{