From 4d1c616d6d2a24a9bdde8e8039d26308668d0b1c Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Mon, 3 Feb 2020 09:26:07 +0100
Subject: [PATCH 1/8] Add actions

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 .../NewMessageForm/NewMessageForm.vue         | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index 2c1a33523a8..29fa73b509f 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -28,10 +28,25 @@
 				class="new-message-form">
 				<div
 					class="new-message-form__button">
-					<button
-						v-if="!currentUserIsGuest"
-						class="new-message-form__button icon-clip-add-file"
-						@click.prevent="handleFileShare" />
+					<Actions
+						default-icon="icon-clip-add-file"
+						class="new-message-form__button">
+						<ActionText>Add a file</ActionText>
+						<ActionButton
+							v-if="!currentUserIsGuest"
+							:close-after-click="true"
+							icon="icon-upload"
+							@click.prevent="handleFileShare">
+							Upload from device
+						</ActionButton>
+						<ActionButton
+							v-if="!currentUserIsGuest"
+							:close-after-click="true"
+							icon="icon-folder"
+							@click.prevent="handleFileShare">
+							Add from Nextcloud
+						</ActionButton>
+					</Actions>
 				</div>
 				<div class="new-message-form__input">
 					<Quote
@@ -60,6 +75,9 @@ import { getFilePickerBuilder } from '@nextcloud/dialogs'
 import { generateOcsUrl } from '@nextcloud/router'
 import { postNewMessage } from '../../services/messagesService'
 import Quote from '../Quote'
+import Actions from '@nextcloud/vue/dist/Components/Actions'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import ActionText from '@nextcloud/vue/dist/Components/ActionText'
 
 const picker = getFilePickerBuilder(t('spreed', 'File to share'))
 	.setMultiSelect(false)
@@ -73,6 +91,9 @@ export default {
 	components: {
 		AdvancedInput,
 		Quote,
+		Actions,
+		ActionButton,
+		ActionText,
 	},
 	data: function() {
 		return {

From 2dba83a406493be710452bd99658d32b9dc8301e Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Tue, 18 Feb 2020 13:27:57 +0100
Subject: [PATCH 2/8] Add hidden browser file-picker

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 .../NewMessageForm/NewMessageForm.vue           | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index 29fa73b509f..34b6585f5cd 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -22,6 +22,15 @@
 <template>
 	<div
 		class="wrapper">
+		<!--native file picker, hidden -->
+		<input id="file-upload"
+			ref="file-upload-input"
+			webkitdirectory
+			directory
+			multiple
+			type="file"
+			class="hidden-visually"
+			@change="processFile">
 		<div
 			class="new-message">
 			<form
@@ -32,11 +41,12 @@
 						default-icon="icon-clip-add-file"
 						class="new-message-form__button">
 						<ActionText>Add a file</ActionText>
+
 						<ActionButton
 							v-if="!currentUserIsGuest"
 							:close-after-click="true"
 							icon="icon-upload"
-							@click.prevent="handleFileShare">
+							@click.prevent="clickImportInput">
 							Upload from device
 						</ActionButton>
 						<ActionButton
@@ -272,6 +282,11 @@ export default {
 
 			}
 		},
+		// Clicks the hidden file input when clicking the correspondent ActionButton, thus
+		// opening the file-picker
+		clickImportInput() {
+			this.$refs['file-upload-input'].click()
+		},
 	},
 }
 </script>

From 5bd9980767e3c3feb36f539f232e493dcc74d078 Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Wed, 19 Feb 2020 09:41:30 +0100
Subject: [PATCH 3/8] Add dav client

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 package-lock.json                             | 73 +++++++++++++++++++
 package.json                                  |  2 +
 .../NewMessageForm/NewMessageForm.vue         | 23 +++++-
 src/services/DavClient.js                     | 37 ++++++++++
 4 files changed, 133 insertions(+), 2 deletions(-)
 create mode 100644 src/services/DavClient.js

diff --git a/package-lock.json b/package-lock.json
index 77b243c375b..22c07a98ab9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3784,6 +3784,14 @@
 			"integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
 			"dev": true
 		},
+		"axios": {
+			"version": "0.19.2",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
+			"integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+			"requires": {
+				"follow-redirects": "1.5.10"
+			}
+		},
 		"babel-eslint": {
 			"version": "10.0.3",
 			"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.3.tgz",
@@ -3888,6 +3896,11 @@
 				}
 			}
 		},
+		"base-64": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
+			"integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs="
+		},
 		"base64-js": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
@@ -5852,6 +5865,11 @@
 			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
 			"dev": true
 		},
+		"fast-xml-parser": {
+			"version": "3.16.0",
+			"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.16.0.tgz",
+			"integrity": "sha512-U+bpScacfgnfNfIKlWHDu4u6rtOaCyxhblOLJ8sZPkhsjgGqdZmVPBhdOyvdMGCDt8CsAv+cssOP3NzQptNt2w=="
+		},
 		"fecha": {
 			"version": "2.3.3",
 			"resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
@@ -7282,6 +7300,11 @@
 			"integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==",
 			"dev": true
 		},
+		"hot-patcher": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/hot-patcher/-/hot-patcher-0.5.0.tgz",
+			"integrity": "sha512-2Uu2W0s8+dnqXzdlg0MRsRzPoDCs1wVjOGSyMRRaMzLDX4bgHw6xDYKccsWafXPPxQpkQfEjgW6+17pwcg60bw=="
+		},
 		"html-tags": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
@@ -8657,6 +8680,11 @@
 			"integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
 			"dev": true
 		},
+		"nested-property": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/nested-property/-/nested-property-1.0.4.tgz",
+			"integrity": "sha512-6fNIumJJUyP3rkB4FyVYCYpdW+PKUCaxRWRGLLf0kv/RKoG4mbTvInedA9x3zOyuOmOkGudKuAtPSI+dnhwj2g=="
+		},
 		"nextcloud-vue-collections": {
 			"version": "0.7.2",
 			"resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.7.2.tgz",
@@ -9351,6 +9379,11 @@
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
 			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
 		},
+		"path-posix": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz",
+			"integrity": "sha1-BrJhE/Vr6rBCVFojv6iAA8ysJg8="
+		},
 		"path-type": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
@@ -9894,6 +9927,11 @@
 			"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
 			"dev": true
 		},
+		"querystringify": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+			"integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+		},
 		"quick-lru": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
@@ -10523,6 +10561,11 @@
 			"integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
 			"dev": true
 		},
+		"requires-port": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+			"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+		},
 		"resolve": {
 			"version": "1.12.0",
 			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
@@ -12476,6 +12519,20 @@
 				}
 			}
 		},
+		"url-join": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+			"integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="
+		},
+		"url-parse": {
+			"version": "1.4.7",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+			"integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+			"requires": {
+				"querystringify": "^2.1.1",
+				"requires-port": "^1.0.0"
+			}
+		},
 		"use": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -12763,6 +12820,22 @@
 				"neo-async": "^2.5.0"
 			}
 		},
+		"webdav": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/webdav/-/webdav-3.2.0.tgz",
+			"integrity": "sha512-wOvLjoa+cZUHsgfItGeg2SYS2yRMUu29aqKFzp9yRcVjq+A5V/pqT6CPx04kMvKrK4jE/fK/QvkXPmkJSzgyDg==",
+			"requires": {
+				"axios": "^0.19.2",
+				"base-64": "^0.1.0",
+				"fast-xml-parser": "^3.16.0",
+				"hot-patcher": "^0.5.0",
+				"minimatch": "^3.0.4",
+				"nested-property": "^1.0.4",
+				"path-posix": "^1.0.0",
+				"url-join": "^4.0.1",
+				"url-parse": "^1.4.7"
+			}
+		},
 		"webpack": {
 			"version": "4.41.6",
 			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz",
diff --git a/package.json b/package.json
index f664b633ab9..3e569655a4a 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
 		"hark": "^1.2.3",
 		"mockconsole": "0.0.1",
 		"nextcloud-vue-collections": "^0.7.2",
+		"url-parse": "^1.4.7",
 		"util": "^0.12.1",
 		"vue": "^2.6.11",
 		"vue-at": "^2.5.0-beta.2",
@@ -42,6 +43,7 @@
 		"vue-router": "^3.1.5",
 		"vue-shortkey": "^3.1.7",
 		"vuex": "^3.1.2",
+		"webdav": "^3.2.0",
 		"webrtc-adapter": "^7.4.0",
 		"webrtcsupport": "^2.2.0",
 		"wildemitter": "^1.2.1"
diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index 34b6585f5cd..9e3fa8cdf08 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -25,12 +25,11 @@
 		<!--native file picker, hidden -->
 		<input id="file-upload"
 			ref="file-upload-input"
-			webkitdirectory
 			directory
 			multiple
 			type="file"
 			class="hidden-visually"
-			@change="processFile">
+			@input="processFiles">
 		<div
 			class="new-message">
 			<form
@@ -88,6 +87,7 @@ import Quote from '../Quote'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
 import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 import ActionText from '@nextcloud/vue/dist/Components/ActionText'
+import client, { remotePath } from '../../services/DavClient'
 
 const picker = getFilePickerBuilder(t('spreed', 'File to share'))
 	.setMultiSelect(false)
@@ -287,6 +287,25 @@ export default {
 		clickImportInput() {
 			this.$refs['file-upload-input'].click()
 		},
+		// Uploads the files to the root files directory
+		async processFiles(event) {
+			try {
+				console.log(event)
+				// Get the files array
+				const files = Object.values(event.target.files)
+				console.log(files)
+				// Copy each file into the remote path
+				for (let i = 0; i < files.length; i++) {
+					console.log('file object:' + files[i])
+					await client.putFileContents(files[i].name, remotePath)
+				}
+				console.log('success')
+			} catch (exception) {
+				console.log('error while uploading files' + exception)
+			}
+			console.log(client)
+			console.log(event.target.files)
+		},
 	},
 }
 </script>
diff --git a/src/services/DavClient.js b/src/services/DavClient.js
new file mode 100644
index 00000000000..9524c776903
--- /dev/null
+++ b/src/services/DavClient.js
@@ -0,0 +1,37 @@
+/**
+ * @copyright Copyright (c) 2020 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import webdav from 'webdav'
+import axios from '@nextcloud/axios'
+import parseUrl from 'url-parse'
+import { generateRemoteUrl } from '@nextcloud/router'
+
+// force our axios
+const patcher = webdav.getPatcher()
+patcher.patch('request', axios)
+
+// init webdav client on default dav endpoint
+const remote = generateRemoteUrl(`dav`)
+const client = webdav.createClient(remote)
+
+export const remotePath = parseUrl(remote).pathname
+export default client

From 2b56d021d32d14ec8c78f7ab00108bfe4c0e84f6 Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Thu, 20 Feb 2020 12:46:39 +0100
Subject: [PATCH 4/8] Upload files to root user directory

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 .../NewMessageForm/NewMessageForm.vue         | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index 9e3fa8cdf08..a163715096d 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -25,7 +25,6 @@
 		<!--native file picker, hidden -->
 		<input id="file-upload"
 			ref="file-upload-input"
-			directory
 			multiple
 			type="file"
 			class="hidden-visually"
@@ -87,7 +86,7 @@ import Quote from '../Quote'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
 import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 import ActionText from '@nextcloud/vue/dist/Components/ActionText'
-import client, { remotePath } from '../../services/DavClient'
+import client from '../../services/DavClient'
 
 const picker = getFilePickerBuilder(t('spreed', 'File to share'))
 	.setMultiSelect(false)
@@ -289,22 +288,17 @@ export default {
 		},
 		// Uploads the files to the root files directory
 		async processFiles(event) {
-			try {
-				console.log(event)
-				// Get the files array
-				const files = Object.values(event.target.files)
-				console.log(files)
-				// Copy each file into the remote path
-				for (let i = 0; i < files.length; i++) {
-					console.log('file object:' + files[i])
-					await client.putFileContents(files[i].name, remotePath)
+			// Get the files array
+			const files = Object.values(event.target.files)
+			// Copy each file into the remote path
+			for (let i = 0; i < files.length; i++) {
+				const userId = this.$store.getters.getUserId()
+				try {
+					await client.putFileContents(`/files/${userId}/` + files[i].name, files[i], { overwrite: false })
+				} catch (exception) {
+					console.debug('Error while uploading file' + exception)
 				}
-				console.log('success')
-			} catch (exception) {
-				console.log('error while uploading files' + exception)
 			}
-			console.log(client)
-			console.log(event.target.files)
 		},
 	},
 }

From 9b778bd13a698ae75a12fd539d5160b996c9a5c0 Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Thu, 20 Feb 2020 16:31:07 +0100
Subject: [PATCH 5/8] Improve menu wording

---
 src/components/NewMessageForm/NewMessageForm.vue | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index a163715096d..bc53c0cbf4d 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -38,21 +38,19 @@
 					<Actions
 						default-icon="icon-clip-add-file"
 						class="new-message-form__button">
-						<ActionText>Add a file</ActionText>
-
 						<ActionButton
 							v-if="!currentUserIsGuest"
 							:close-after-click="true"
 							icon="icon-upload"
 							@click.prevent="clickImportInput">
-							Upload from device
+							{{t('spreed', 'Upload new files')}}
 						</ActionButton>
 						<ActionButton
 							v-if="!currentUserIsGuest"
 							:close-after-click="true"
 							icon="icon-folder"
 							@click.prevent="handleFileShare">
-							Add from Nextcloud
+							{{t('spreed', 'Share from Files')}}
 						</ActionButton>
 					</Actions>
 				</div>
@@ -85,7 +83,6 @@ import { postNewMessage } from '../../services/messagesService'
 import Quote from '../Quote'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
 import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
-import ActionText from '@nextcloud/vue/dist/Components/ActionText'
 import client from '../../services/DavClient'
 
 const picker = getFilePickerBuilder(t('spreed', 'File to share'))
@@ -102,7 +99,6 @@ export default {
 		Quote,
 		Actions,
 		ActionButton,
-		ActionText,
 	},
 	data: function() {
 		return {
@@ -294,7 +290,7 @@ export default {
 			for (let i = 0; i < files.length; i++) {
 				const userId = this.$store.getters.getUserId()
 				try {
-					await client.putFileContents(`/files/${userId}/` + files[i].name, files[i], { overwrite: false })
+					await client.putFileContents(`/files/${userId}/` + files[i].name, files[i])
 				} catch (exception) {
 					console.debug('Error while uploading file' + exception)
 				}

From 31437e5f1a689c70f415beb7fc469c2fb01dfd8c Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Thu, 20 Feb 2020 16:52:46 +0100
Subject: [PATCH 6/8] Show error when upload fails

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 src/components/NewMessageForm/NewMessageForm.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index bc53c0cbf4d..59885c63c0b 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -77,7 +77,7 @@
 <script>
 import axios from '@nextcloud/axios'
 import AdvancedInput from './AdvancedInput/AdvancedInput'
-import { getFilePickerBuilder } from '@nextcloud/dialogs'
+import { getFilePickerBuilder, showError } from '@nextcloud/dialogs'
 import { generateOcsUrl } from '@nextcloud/router'
 import { postNewMessage } from '../../services/messagesService'
 import Quote from '../Quote'
@@ -292,7 +292,8 @@ export default {
 				try {
 					await client.putFileContents(`/files/${userId}/` + files[i].name, files[i])
 				} catch (exception) {
-					console.debug('Error while uploading file' + exception)
+					console.debug('Error while uploading file:' + exception)
+					showError(t('spreed', 'Error while uploading file'))
 				}
 			}
 		},

From a01c6bcefa2c5c1b5091c5c981796e4579826ba2 Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Thu, 20 Feb 2020 17:53:25 +0100
Subject: [PATCH 7/8] Display the uploaded file in the chat

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 .../NewMessageForm/NewMessageForm.vue         | 55 +++++++++----------
 src/services/filesSharingServices.js          | 34 ++++++++++++
 2 files changed, 60 insertions(+), 29 deletions(-)
 create mode 100644 src/services/filesSharingServices.js

diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index 59885c63c0b..28b242c7fd0 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -43,14 +43,14 @@
 							:close-after-click="true"
 							icon="icon-upload"
 							@click.prevent="clickImportInput">
-							{{t('spreed', 'Upload new files')}}
+							{{ t('spreed', 'Upload new files') }}
 						</ActionButton>
 						<ActionButton
 							v-if="!currentUserIsGuest"
 							:close-after-click="true"
 							icon="icon-folder"
 							@click.prevent="handleFileShare">
-							{{t('spreed', 'Share from Files')}}
+							{{ t('spreed', 'Share from Files') }}
 						</ActionButton>
 					</Actions>
 				</div>
@@ -75,15 +75,14 @@
 </template>
 
 <script>
-import axios from '@nextcloud/axios'
 import AdvancedInput from './AdvancedInput/AdvancedInput'
 import { getFilePickerBuilder, showError } from '@nextcloud/dialogs'
-import { generateOcsUrl } from '@nextcloud/router'
 import { postNewMessage } from '../../services/messagesService'
 import Quote from '../Quote'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
 import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 import client from '../../services/DavClient'
+import { shareFileToRoom } from '../../services/filesSharingServices'
 
 const picker = getFilePickerBuilder(t('spreed', 'File to share'))
 	.setMultiSelect(false)
@@ -221,30 +220,7 @@ export default {
 					if (!path.startsWith('/')) {
 						throw new Error(t('files', 'Invalid path selected'))
 					}
-
-					try {
-						// FIXME move to service
-						await axios.post(
-							generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares',
-							{
-								shareType: 10, // OC.Share.SHARE_TYPE_ROOM,
-								path: path,
-								shareWith: this.token,
-							}
-						)
-					} catch (error) {
-						if (error.response
-							&& error.response.data
-							&& error.response.data.ocs
-							&& error.response.data.ocs.meta
-							&& error.response.data.ocs.meta.message) {
-							console.error(`Error while sharing file: ${error.response.data.ocs.meta.message || 'Unknown error'}`)
-							OCP.Toast.error(error.response.data.ocs.meta.message)
-						} else {
-							console.error(`Error while sharing file: Unknown error`)
-							OCP.Toast.error(t('files', 'Error while sharing file'))
-						}
-					}
+					this.sendFile(path)
 				})
 		},
 
@@ -289,14 +265,35 @@ export default {
 			// Copy each file into the remote path
 			for (let i = 0; i < files.length; i++) {
 				const userId = this.$store.getters.getUserId()
+				const path = `/files/${userId}/` + files[i].name
 				try {
-					await client.putFileContents(`/files/${userId}/` + files[i].name, files[i])
+					await client.putFileContents(path, files[i])
+					this.sendFile('/' + files[i].name)
 				} catch (exception) {
 					console.debug('Error while uploading file:' + exception)
 					showError(t('spreed', 'Error while uploading file'))
 				}
 			}
 		},
+
+		// Appends a file as a message to the messagelist
+		async sendFile(path) {
+			try {
+				await shareFileToRoom(path, this.token)
+			} catch (error) {
+				if (error.response
+					&& error.response.data
+					&& error.response.data.ocs
+					&& error.response.data.ocs.meta
+					&& error.response.data.ocs.meta.message) {
+					console.error(`Error while sharing file: ${error.response.data.ocs.meta.message || 'Unknown error'}`)
+					OCP.Toast.error(error.response.data.ocs.meta.message)
+				} else {
+					console.error(`Error while sharing file: Unknown error`)
+					OCP.Toast.error(t('files', 'Error while sharing file'))
+				}
+			}
+		},
 	},
 }
 </script>
diff --git a/src/services/filesSharingServices.js b/src/services/filesSharingServices.js
new file mode 100644
index 00000000000..40745b962d7
--- /dev/null
+++ b/src/services/filesSharingServices.js
@@ -0,0 +1,34 @@
+/**
+ * @copyright Copyright (c) 2019 Marco Ambrosini <marcoambrosini@pm.me>
+ *
+ * @author Marco Ambrosini <marcoambrosini@pm.me>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+import axios from '@nextcloud/axios'
+import { generateOcsUrl } from '@nextcloud/router'
+
+export const shareFileToRoom = (path, token) => {
+	const response = axios.post(
+		generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares',
+		{
+			shareType: 10, // OC.Share.SHARE_TYPE_ROOM,
+			path: path,
+			shareWith: token,
+		})
+	return response
+}

From ec105b8187904b67e33dfa39f06b997181e7be86 Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Thu, 20 Feb 2020 18:02:23 +0100
Subject: [PATCH 8/8] Add documentation

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 .../NewMessageForm/NewMessageForm.vue         | 81 +++++++++++--------
 src/services/filesSharingServices.js          | 13 ++-
 2 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index 28b242c7fd0..d7f8695af4c 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -213,17 +213,6 @@ export default {
 			return 'temp-' + date.getTime()
 		},
 
-		async handleFileShare() {
-			picker.pick()
-				.then(async(path) => {
-					console.debug(`path ${path} selected for sharing`)
-					if (!path.startsWith('/')) {
-						throw new Error(t('files', 'Invalid path selected'))
-					}
-					this.sendFile(path)
-				})
-		},
-
 		/**
 		 * Sends the new message
 		 */
@@ -253,30 +242,12 @@ export default {
 
 			}
 		},
-		// Clicks the hidden file input when clicking the correspondent ActionButton, thus
-		// opening the file-picker
-		clickImportInput() {
-			this.$refs['file-upload-input'].click()
-		},
-		// Uploads the files to the root files directory
-		async processFiles(event) {
-			// Get the files array
-			const files = Object.values(event.target.files)
-			// Copy each file into the remote path
-			for (let i = 0; i < files.length; i++) {
-				const userId = this.$store.getters.getUserId()
-				const path = `/files/${userId}/` + files[i].name
-				try {
-					await client.putFileContents(path, files[i])
-					this.sendFile('/' + files[i].name)
-				} catch (exception) {
-					console.debug('Error while uploading file:' + exception)
-					showError(t('spreed', 'Error while uploading file'))
-				}
-			}
-		},
 
-		// Appends a file as a message to the messagelist
+		/**
+		 * Appends a file as a message to the messagelist.
+		 * @param {string} path The file path from the user's root directory
+		 * e.g. `/myfile.txt`
+		 */
 		async sendFile(path) {
 			try {
 				await shareFileToRoom(path, this.token)
@@ -294,6 +265,48 @@ export default {
 				}
 			}
 		},
+
+		async handleFileShare() {
+			picker.pick()
+				.then(async(path) => {
+					console.debug(`path ${path} selected for sharing`)
+					if (!path.startsWith('/')) {
+						throw new Error(t('files', 'Invalid path selected'))
+					}
+					this.sendFile(path)
+				})
+		},
+
+		/**
+		 * Clicks the hidden file input when clicking the correspondent ActionButton,
+		 * thus opening the file-picker
+		 */
+		clickImportInput() {
+			this.$refs['file-upload-input'].click()
+		},
+
+		/**
+		 * Uploads the files to the root files directory
+		 * @param {object} event the file input event object
+		 */
+		async processFiles(event) {
+			// The selected files array
+			const files = Object.values(event.target.files)
+			// process each file in the array
+			for (let i = 0; i < files.length; i++) {
+				const userId = this.$store.getters.getUserId()
+				const path = `/files/${userId}/` + files[i].name
+				try {
+					// Upload the file
+					await client.putFileContents(path, files[i])
+					// Share the file to the talk room
+					this.sendFile('/' + files[i].name)
+				} catch (exception) {
+					console.debug('Error while uploading file:' + exception)
+					showError(t('spreed', 'Error while uploading file'))
+				}
+			}
+		},
 	},
 }
 </script>
diff --git a/src/services/filesSharingServices.js b/src/services/filesSharingServices.js
index 40745b962d7..011570920b1 100644
--- a/src/services/filesSharingServices.js
+++ b/src/services/filesSharingServices.js
@@ -22,7 +22,14 @@
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 
-export const shareFileToRoom = (path, token) => {
+/**
+ * Appends a file as a message to the messagelist.
+ * @param {string} path The file path from the user's root directory
+ * e.g. `/myfile.txt`
+ * @param {string} token The conversation's token
+ * @returns {object} the response object
+ */
+const shareFileToRoom = (path, token) => {
 	const response = axios.post(
 		generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares',
 		{
@@ -32,3 +39,7 @@ export const shareFileToRoom = (path, token) => {
 		})
 	return response
 }
+
+export {
+	shareFileToRoom
+}