aboutsummaryrefslogtreecommitdiff
path: root/models/activity_streams_object.go
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--models/activity_streams_object.go19
1 files changed, 10 insertions, 9 deletions
diff --git a/models/activity_streams_object.go b/models/activity_streams_object.go
index 85a7d09..98c69bb 100644
--- a/models/activity_streams_object.go
+++ b/models/activity_streams_object.go
@@ -1,6 +1,8 @@
package models
import (
+ "bytes"
+ "encoding/json"
"fmt"
"time"
@@ -37,17 +39,16 @@ func (a *ActivityStreamsObject) Keybase() string {
}
func (a *ActivityStreamsObject) content() []byte {
- var contentVal string
- if a.wrappedObject.GetActivityStreamsContent() != nil {
- content := a.wrappedObject.GetActivityStreamsContent()
- for contentIter := content.Begin(); contentIter != content.End(); contentIter = contentIter.Next() {
- contentVal = contentIter.GetXMLSchemaString()
- }
- }
- return []byte(contentVal)
+ objMap, _ := a.wrappedObject.Serialize()
+ buffer := &bytes.Buffer{}
+ encoder := json.NewEncoder(buffer)
+ encoder.SetEscapeHTML(false)
+ encoder.Encode(objMap)
+ return bytes.TrimRight(buffer.Bytes(), "\n")
}
func (a *ActivityStreamsObject) Save(txn *badger.Txn) error {
- e := badger.NewEntry(a.keyName(), a.content())
+ content := a.content()
+ e := badger.NewEntry(a.keyName(), content)
return txn.SetEntry(e)
}