[MM-59519] preserve DM/GM unread/read state over export and import (#27707)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
c2c37cea20
Коммит
4b3de1861f
@@ -832,7 +832,17 @@ func (v *Validator) validateDirectChannel(info ImportFileInfo, line imports.Line
|
||||
}
|
||||
}
|
||||
|
||||
if data.Members != nil {
|
||||
if data.Participants != nil {
|
||||
for i, member := range data.Participants {
|
||||
if _, ok := v.users[*member.Username]; !ok {
|
||||
return &ImportValidationError{
|
||||
ImportFileInfo: info,
|
||||
FieldName: fmt.Sprintf("direct_channel.members[%d]", i),
|
||||
Err: fmt.Errorf("reference to unknown user %q", *member.Username),
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if data.Members != nil {
|
||||
for i, member := range *data.Members {
|
||||
if _, ok := v.users[member]; !ok {
|
||||
return &ImportValidationError{
|
||||
|
||||
@@ -394,10 +394,17 @@ func createPost(team string, channel string, allUsers []string, createAt int64)
|
||||
|
||||
func createDirectChannel(members []string) imports.LineImportData {
|
||||
header := fake.Sentence()
|
||||
var p []*imports.DirectChannelMemberImportData
|
||||
|
||||
for _, m := range members {
|
||||
p = append(p, &imports.DirectChannelMemberImportData{
|
||||
Username: model.NewString(m),
|
||||
})
|
||||
}
|
||||
|
||||
channel := imports.DirectChannelImportData{
|
||||
Members: &members,
|
||||
Header: &header,
|
||||
Participants: p,
|
||||
Header: &header,
|
||||
}
|
||||
return imports.LineImportData{
|
||||
Type: "direct_channel",
|
||||
|
||||
Ссылка в новой задаче
Block a user