diff --git a/lib/Service/ImageService.php b/lib/Service/ImageService.php index 1fdcb318bae..de1b1d0269f 100644 --- a/lib/Service/ImageService.php +++ b/lib/Service/ImageService.php @@ -42,10 +42,6 @@ class ImageService { - /** - * @var string|null - */ - private $userId; /** * @var ShareManager */ @@ -89,7 +85,7 @@ public function downloadImageLink(string $link, string $userId): array { } $savedFile->touch(); if (isset($res['Content-Type'])) { - if ($res['Content-Type'] === 'image/jpg') { + if (in_array($res['Content-Type'], ['image/jpg', 'image/jpeg'])) { $fileName = $fileName . '.jpg'; } elseif ($res['Content-Type'] === 'image/png') { $fileName = $fileName . '.png'; diff --git a/package-lock.json b/package-lock.json index 630f21050bd..70d5353d1f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,12 +5,14 @@ "requires": true, "packages": { "": { + "name": "text", "version": "3.4.0", "license": "agpl", "dependencies": { "@nextcloud/auth": "^1.3.0", "@nextcloud/axios": "^1.7.0", "@nextcloud/browser-storage": "^0.1.1", + "@nextcloud/dialogs": "^3.1.2", "@nextcloud/event-bus": "^2.1.0", "@nextcloud/initial-state": "^1.2.0", "@nextcloud/l10n": "^1.4.1", diff --git a/package.json b/package.json index b8485cc15de..57c13737b6f 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@nextcloud/auth": "^1.3.0", "@nextcloud/axios": "^1.7.0", "@nextcloud/browser-storage": "^0.1.1", + "@nextcloud/dialogs": "^3.1.2", "@nextcloud/event-bus": "^2.1.0", "@nextcloud/initial-state": "^1.2.0", "@nextcloud/l10n": "^1.4.1", diff --git a/src/components/MenuBar.vue b/src/components/MenuBar.vue index 95bf6ed3a5f..8ffb086a0e4 100644 --- a/src/components/MenuBar.vue +++ b/src/components/MenuBar.vue @@ -136,6 +136,7 @@ import ClickOutside from 'vue-click-outside' import { getCurrentUser } from '@nextcloud/auth' import axios from '@nextcloud/axios' import { generateUrl } from '@nextcloud/router' +import { showError } from '@nextcloud/dialogs' export default { name: 'MenuBar', @@ -356,6 +357,7 @@ export default { this.insertImage(targetFilePath, this.imageCommand) }).catch((error) => { console.error(error) + showError(error?.response?.data?.error) }).then(() => { this.imageCommand = null this.uploadingImage = false @@ -375,6 +377,7 @@ export default { this.insertImage(response.data?.path, command) }).catch((error) => { console.error(error) + showError(error?.response?.data?.error) }).then(() => { this.uploadingImage = false })