fix insertion of trusted from demo data

July1921 · Jun 25, 2021 · 9f8f300 · 9f8f300
1 parent c431101
commit 9f8f300
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/tinode-db/gendb.go b/tinode-db/gendb.go
@@ -44,9 +44,11 @@ func genDb(data *Data) {
 				Auth: types.ModeCAuth,
 				Anon: types.ModeNone,
 			},
-			Tags:    uu.Tags,
-			Public:  parsePublic(&uu.Public, data.datapath),
-			Trusted: &uu.Trusted,
+			Tags:   uu.Tags,
+			Public: parsePublic(&uu.Public, data.datapath),
+		}
+		if !uu.Trusted.IsZero() {
+			user.Trusted = uu.Trusted
 		}
 		user.CreatedAt = getCreatedTime(uu.CreatedAt)
 
@@ -146,10 +148,12 @@ func genDb(data *Data) {
 				Auth: accessAuth,
 				Anon: accessAnon,
 			},
-			UseBt:   gt.Channel,
-			Tags:    gt.Tags,
-			Public:  parsePublic(&gt.Public, data.datapath),
-			Trusted: &gt.Trusted,
+			UseBt:  gt.Channel,
+			Tags:   gt.Tags,
+			Public: parsePublic(&gt.Public, data.datapath),
+		}
+		if !gt.Trusted.IsZero() {
+			topic.Trusted = gt.Trusted
 		}
 		var owner types.Uid
 		if gt.Owner != "" {

diff --git a/tinode-db/main.go b/tinode-db/main.go
@@ -34,8 +34,12 @@ type tPrivate struct {
 }
 
 type tTrusted struct {
-	Verified bool `json:"verified"`
-	Staff    bool `json:"staff"`
+	Verified bool `json:"verified,omitempty"`
+	Staff    bool `json:"staff,omitempty"`
+}
+
+func (t tTrusted) IsZero() bool {
+	return !t.Verified && !t.Staff
 }
 
 // DefAccess is default access mode.