From a6a58f99e7292e1d298a3c47c39994ec642878b6 Mon Sep 17 00:00:00 2001
From: Doug Lauder <wiggin77@warpmail.net>
Date: Fri, 1 May 2020 14:13:06 -0400
Subject: [PATCH] MM-24707 fix reply import bug (#14442)

---
 app/import_functions.go | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/app/import_functions.go b/app/import_functions.go
index 0baa6d2395..b9ac6b83a9 100644
--- a/app/import_functions.go
+++ b/app/import_functions.go
@@ -1267,8 +1267,6 @@ func (a *App) importMultiplePosts(data []*PostImportData, dryRun bool) *model.Ap
 		return err
 	}
 
-	var lastPostWithData *postAndData
-	repliesBulk := []ReplyImportData{}
 	for _, postWithData := range postsWithData {
 		postWithData := postWithData
 		if postWithData.postData.FlaggedBy != nil {
@@ -1301,27 +1299,14 @@ func (a *App) importMultiplePosts(data []*PostImportData, dryRun bool) *model.Ap
 			}
 		}
 
-		if postWithData.postData.Replies != nil {
-			repliesBulk = append(repliesBulk, *postWithData.postData.Replies...)
-			if len(repliesBulk) >= importMultiplePostsThreshold {
-				err := a.importReplies(repliesBulk, postWithData.post, postWithData.team.Id, dryRun)
-				if err != nil {
-					return err
-				}
-				repliesBulk = []ReplyImportData{}
+		if postWithData.postData.Replies != nil && len(*postWithData.postData.Replies) > 0 {
+			err := a.importReplies(*postWithData.postData.Replies, postWithData.post, postWithData.team.Id, dryRun)
+			if err != nil {
+				return err
 			}
 		}
 		a.updateFileInfoWithPostId(postWithData.post)
-		lastPostWithData = &postWithData
 	}
-
-	if len(repliesBulk) >= 0 && lastPostWithData != nil {
-		err := a.importReplies(repliesBulk, lastPostWithData.post, lastPostWithData.team.Id, dryRun)
-		if err != nil {
-			return err
-		}
-	}
-
 	return nil
 }