From 2b02f06152a7f5bb2a69f907e955b06731103c28 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Mon, 24 Sep 2018 15:50:15 -0400
Subject: [PATCH] refactor publish saga

---
 client/src/sagas/publish.js | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/client/src/sagas/publish.js b/client/src/sagas/publish.js
index e82dd121..1a9bd46f 100644
--- a/client/src/sagas/publish.js
+++ b/client/src/sagas/publish.js
@@ -36,29 +36,25 @@ function * publishFile (action) {
   }
 
   let publishMetadata, publishFormData, publishChannel;
+  // create metadata
+  publishMetadata = createPublishMetadata(
+    isUpdate ? asset.name : claim,
+    isUpdate ? {type: asset.claimData.contentType} : file,
+    metadata,
+    publishInChannel,
+    selectedChannel
+  );
   if (isUpdate) {
-    publishMetadata = createPublishMetadata(asset.name, {type: asset.claimData.contentType}, metadata, publishInChannel, selectedChannel);
     publishMetadata['channelName'] = asset.claimData.channelName;
-    if (thumbnail) {
-      // add thumbnail to publish metadata
-      publishMetadata['thumbnail'] = createThumbnailUrl(thumbnailChannel, thumbnailChannelId, claim, host);
-    }
-    // create form data for main publish
-    publishFormData = createPublishFormData(file, thumbnail, publishMetadata);
-    // make the publish request
-    publishChannel = yield call(makePublishRequestChannel, publishFormData, true);
-  } else {
-    // create metadata
-    publishMetadata = createPublishMetadata(claim, file, metadata, publishInChannel, selectedChannel);
-    if (thumbnail) {
-      // add thumbnail to publish metadata
-      publishMetadata['thumbnail'] = createThumbnailUrl(thumbnailChannel, thumbnailChannelId, claim, host);
-    }
-    // create form data for main publish
-    publishFormData = createPublishFormData(file, thumbnail, publishMetadata);
-    // make the publish request
-    publishChannel = yield call(makePublishRequestChannel, publishFormData);
   }
+  if (thumbnail) {
+    // add thumbnail to publish metadata
+    publishMetadata['thumbnail'] = createThumbnailUrl(thumbnailChannel, thumbnailChannelId, claim, host);
+  }
+  // create form data for main publish
+  publishFormData = createPublishFormData(file, thumbnail, publishMetadata);
+  // make the publish request
+  publishChannel = yield call(makePublishRequestChannel, publishFormData, isUpdate);
 
   while (true) {
     const {loadStart, progress, load, success, error: publishError} = yield take(publishChannel);