Automatic Merge
Этот коммит содержится в:
Haardik Dharma
2020-12-09 10:45:17 +05:30
коммит произвёл GitHub
родитель bd4d91e62b
Коммит d83206e1a0

Просмотреть файл

@@ -79,48 +79,48 @@ func cleanComplianceStrings(in string) string {
} }
} }
func (me *CompliancePost) Row() []string { func (cp *CompliancePost) Row() []string {
postDeleteAt := "" postDeleteAt := ""
if me.PostDeleteAt > 0 { if cp.PostDeleteAt > 0 {
postDeleteAt = time.Unix(0, me.PostDeleteAt*int64(1000*1000)).Format(time.RFC3339) postDeleteAt = time.Unix(0, cp.PostDeleteAt*int64(1000*1000)).Format(time.RFC3339)
} }
postUpdateAt := "" postUpdateAt := ""
if me.PostUpdateAt != me.PostCreateAt { if cp.PostUpdateAt != cp.PostCreateAt {
postUpdateAt = time.Unix(0, me.PostUpdateAt*int64(1000*1000)).Format(time.RFC3339) postUpdateAt = time.Unix(0, cp.PostUpdateAt*int64(1000*1000)).Format(time.RFC3339)
} }
userType := "user" userType := "user"
if me.IsBot { if cp.IsBot {
userType = "bot" userType = "bot"
} }
return []string{ return []string{
cleanComplianceStrings(me.TeamName), cleanComplianceStrings(cp.TeamName),
cleanComplianceStrings(me.TeamDisplayName), cleanComplianceStrings(cp.TeamDisplayName),
cleanComplianceStrings(me.ChannelName), cleanComplianceStrings(cp.ChannelName),
cleanComplianceStrings(me.ChannelDisplayName), cleanComplianceStrings(cp.ChannelDisplayName),
cleanComplianceStrings(me.ChannelType), cleanComplianceStrings(cp.ChannelType),
cleanComplianceStrings(me.UserUsername), cleanComplianceStrings(cp.UserUsername),
cleanComplianceStrings(me.UserEmail), cleanComplianceStrings(cp.UserEmail),
cleanComplianceStrings(me.UserNickname), cleanComplianceStrings(cp.UserNickname),
userType, userType,
me.PostId, cp.PostId,
time.Unix(0, me.PostCreateAt*int64(1000*1000)).Format(time.RFC3339), time.Unix(0, cp.PostCreateAt*int64(1000*1000)).Format(time.RFC3339),
postUpdateAt, postUpdateAt,
postDeleteAt, postDeleteAt,
me.PostRootId, cp.PostRootId,
me.PostParentId, cp.PostParentId,
me.PostOriginalId, cp.PostOriginalId,
cleanComplianceStrings(me.PostMessage), cleanComplianceStrings(cp.PostMessage),
me.PostType, cp.PostType,
me.PostProps, cp.PostProps,
me.PostHashtags, cp.PostHashtags,
me.PostFileIds, cp.PostFileIds,
} }
} }