report topic's channel status to users

remondekop · Aug 5, 2021 · 89db1e7 · 89db1e7
1 parent 2a5851a
commit 89db1e7
Show file tree

Hide file tree

Showing 7 changed files with 297 additions and 273 deletions.
diff --git a/pbx/model.pb.go b/pbx/model.pb.go
diff --git a/pbx/model.proto b/pbx/model.proto
@@ -315,6 +315,7 @@ message TopicDesc {
 	string state = 12;
 	int64 state_at = 13;
 	bytes trusted = 14;
+	bool is_chan = 17; // 17!
 
 	// P2P only: other user's last online timestamp & user agent
 	int64 last_seen_time = 15;
@@ -362,7 +363,6 @@ message DelValues {
 	repeated SeqRange del_seq = 2;
 }
 
-
 // {ctrl} message
 message ServerCtrl {
 	string id = 1;

diff --git a/py_grpc/tinode_grpc/model_pb2.py b/py_grpc/tinode_grpc/model_pb2.py
diff --git a/server/datamodel.go b/server/datamodel.go
@@ -415,6 +415,9 @@ type MsgTopicDesc struct {
 	// If the group topic is online.
 	Online bool `json:"online,omitempty"`
 
+	// If the topic can be accessed as a channel
+	IsChan bool `json:"chan,omitempty"`
+
 	// P2P other user's last online timestamp & user agent
 	LastSeen *MsgLastSeenInfo `json:"seen,omitempty"`
 

diff --git a/server/hub.go b/server/hub.go
@@ -601,6 +601,7 @@ func replyOfflineTopicGetDesc(sess *Session, msg *ClientComMessage) {
 		desc.UpdatedAt = &stopic.UpdatedAt
 		desc.Public = stopic.Public
 		desc.Trusted = stopic.Trusted
+		desc.IsChan = stopic.UseBt
 		if stopic.Owner == msg.AsUser {
 			desc.DefaultAcs = &MsgDefaultAcsMode{
 				Auth: stopic.Access.Auth.String(),

diff --git a/server/pbconverter.go b/server/pbconverter.go
@@ -785,6 +785,7 @@ func pbTopicDescSerialize(desc *MsgTopicDesc) *pbx.TopicDesc {
 		UpdatedAt: timeToInt64(desc.UpdatedAt),
 		TouchedAt: timeToInt64(desc.TouchedAt),
 		State:     desc.State,
+		IsChan:    desc.IsChan,
 		Defacs:    pbDefaultAcsSerialize(desc.DefaultAcs),
 		Acs:       pbAccessModeSerialize(desc.Acs),
 		SeqId:     int32(desc.SeqId),
@@ -811,6 +812,7 @@ func pbTopicDescDeserialize(desc *pbx.TopicDesc) *MsgTopicDesc {
 		UpdatedAt:  int64ToTime(desc.GetUpdatedAt()),
 		TouchedAt:  int64ToTime(desc.GetTouchedAt()),
 		State:      desc.GetState(),
+		IsChan:     desc.GetIsChan(),
 		DefaultAcs: pbDefaultAcsDeserialize(desc.GetDefacs()),
 		Acs:        pbAccessModeDeserialize(desc.GetAcs()),
 		SeqId:      int(desc.SeqId),

diff --git a/server/topic.go b/server/topic.go
@@ -1899,6 +1899,8 @@ func (t *Topic) replyGetDesc(sess *Session, asUid types.Uid, asChan bool, opts *
 
 	if t.cat == types.TopicCatMe {
 		full = true
+	} else if t.cat == types.TopicCatGrp {
+		desc.IsChan = t.isChan
 	}
 
 	if ifUpdated {