From 41379e27c880cc7b3255a30bf7d8850d35bc1e71 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 4 Dec 2020 14:52:03 -0500
Subject: [PATCH] fix: hack uploader to handle a response from v3 write api

---
 public/src/modules/uploader.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js
index 88dfb1e901..e97371e42d 100644
--- a/public/src/modules/uploader.js
+++ b/public/src/modules/uploader.js
@@ -65,7 +65,9 @@ define('uploader', ['jquery-form'], function () {
 	}
 
 	module.ajaxSubmit = function (uploadModal, callback) {
-		uploadModal.find('#uploadForm').ajaxSubmit({
+		const uploadForm = uploadModal.find('#uploadForm');
+		const v3 = uploadForm.attr('action').startsWith(config.relative_path + '/api/v3/');
+		uploadForm.ajaxSubmit({
 			headers: {
 				'x-csrf-token': config.csrf_token,
 			},
@@ -79,6 +81,17 @@ define('uploader', ['jquery-form'], function () {
 			success: function (response) {
 				response = maybeParse(response);
 
+				// Appropriately handle v3 API responses
+				if (v3) {
+					if (response.status.code === 'ok') {
+						response = response.response.images;
+					} else {
+						response = {
+							error: response.status.code,
+						};
+					}
+				}
+
 				if (response.error) {
 					return showAlert(uploadModal, 'error', response.error);
 				}