mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-16 11:23:11 -06:00
Code cleaned up, commented
This commit is contained in:
parent
8a46edbddf
commit
57976a0aca
|
|
@ -63,10 +63,14 @@ func GetTags(
|
||||||
return httputil.LogThenError(req, err)
|
return httputil.LogThenError(req, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var tagData []gomatrix.TagData
|
var tagData []gomatrixserverlib.ClientEvent
|
||||||
tagContent := newTag()
|
tagContent := newTag()
|
||||||
err = json.Unmarshal(dataByte, &tagData)
|
err = json.Unmarshal(dataByte, &tagData)
|
||||||
tagContent = tagData[0].Content
|
if err != nil {
|
||||||
|
return httputil.LogThenError(req, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = json.Unmarshal(tagData[0].Content, &tagContent)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return httputil.LogThenError(req, err)
|
return httputil.LogThenError(req, err)
|
||||||
|
|
@ -84,6 +88,8 @@ 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
|
||||||
|
// the tag onto the "map" and saving the new "map" onto the DB
|
||||||
func PutTag(
|
func PutTag(
|
||||||
req *http.Request,
|
req *http.Request,
|
||||||
accountDB *accounts.Database,
|
accountDB *accounts.Database,
|
||||||
|
|
@ -142,6 +148,8 @@ 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
|
||||||
|
// the "map" and then saving the new "map" in the DB
|
||||||
func DeleteTag(
|
func DeleteTag(
|
||||||
req *http.Request,
|
req *http.Request,
|
||||||
accountDB *accounts.Database,
|
accountDB *accounts.Database,
|
||||||
|
|
@ -179,10 +187,17 @@ func DeleteTag(
|
||||||
return httputil.LogThenError(req, err)
|
return httputil.LogThenError(req, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var tagData []gomatrix.TagData
|
var tagData []gomatrixserverlib.ClientEvent
|
||||||
tagContent := newTag()
|
tagContent := newTag()
|
||||||
err = json.Unmarshal(dataByte, &tagData)
|
err = json.Unmarshal(dataByte, &tagData)
|
||||||
tagContent = tagData[0].Content
|
if err != nil {
|
||||||
|
return httputil.LogThenError(req, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = json.Unmarshal(tagData[0].Content, &tagContent)
|
||||||
|
if err != nil {
|
||||||
|
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 {
|
||||||
|
|
@ -211,7 +226,7 @@ func DeleteTag(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// obtainSavedTags is a utility function to get all the tags saved in the DB
|
// obtainSavedTags gets all the tags saved in the DB
|
||||||
func obtainSavedTags(
|
func obtainSavedTags(
|
||||||
req *http.Request,
|
req *http.Request,
|
||||||
userID string,
|
userID string,
|
||||||
|
|
@ -233,7 +248,7 @@ func obtainSavedTags(
|
||||||
return localpart, data, nil
|
return localpart, data, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// saveTagData is a utility function to save the tag data into the DB
|
// saveTagData saves the tag data into the DB
|
||||||
func saveTagData(
|
func saveTagData(
|
||||||
req *http.Request,
|
req *http.Request,
|
||||||
localpart string,
|
localpart string,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue