cwtch.im
/
cwtch
16
21
Fork 15
Code Issues 12 Pull Requests Releases 165 Wiki Activity

minor fixes for group functionality #412

Merged
sarah merged 3 commits from groupFix into master 2021-12-17 19:58:35 +00:00
Conversation 5 Commits 3 Files Changed 4 +3
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3efacc889d - Show all commits

1
event/common.go
View File

@ -279,6 +279,7 @@ const (
ConversationID = Field("ConversationID") ConversationID = Field("ConversationID")
GroupID = Field("GroupID") GroupID = Field("GroupID")
GroupServer = Field("GroupServer") GroupServer = Field("GroupServer")
GroupName = Field("GroupName")
ServerTokenY = Field("ServerTokenY") ServerTokenY = Field("ServerTokenY")
ServerTokenOnion = Field("ServerTokenOnion") ServerTokenOnion = Field("ServerTokenOnion")
GroupInvite = Field("GroupInvite") GroupInvite = Field("GroupInvite")

2
peer/cwtch_peer.go
View File

@ -588,6 +588,7 @@ func (cp *cwtchPeer) StartGroup(name string, server string) (int, error) {
event.ConversationID: strconv.Itoa(conversationID), event.ConversationID: strconv.Itoa(conversationID),
event.GroupID: group.GroupID, event.GroupID: group.GroupID,
event.GroupServer: group.GroupServer, event.GroupServer: group.GroupServer,
event.GroupName: name,
dan marked this conversation as resolved
sarah commented 2021-12-16 18:55:51 +00:00
Review
Copy Link

ImportGroup should also have this.

ImportGroup should also have this.
})) }))
return conversationID, nil return conversationID, nil
} }
@ -652,6 +653,7 @@ func (cp *cwtchPeer) AddServer(serverSpecification string) (string, error) {
cp.SetConversationAttribute(conversationInfo.ID, attr.PublicScope.ConstructScopedZonedPath(attr.ServerKeyZone.ConstructZonedPath(k)), v) cp.SetConversationAttribute(conversationInfo.ID, attr.PublicScope.ConstructScopedZonedPath(attr.ServerKeyZone.ConstructZonedPath(k)), v)
} }
cp.SetConversationAttribute(conversationInfo.ID, attr.PublicScope.ConstructScopedZonedPath(attr.ServerKeyZone.ConstructZonedPath(string(model.BundleType))), serverSpecification) cp.SetConversationAttribute(conversationInfo.ID, attr.PublicScope.ConstructScopedZonedPath(attr.ServerKeyZone.ConstructZonedPath(string(model.BundleType))), serverSpecification)
cp.JoinServer(onion)
return onion, err return onion, err
} }
return "", err return "", err