From 2ef6613857e3f11c017a516aa06871665b203ddb Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 9 Oct 2020 18:16:40 +0200 Subject: migrate away from depricated OC.generateUrl Signed-off-by: Robin Appelman --- package-lock.json | 84 +++++++++++++++++++++++++++++++++++++++ package.json | 1 + src/App.vue | 3 +- src/components/ActorAvatar.vue | 3 +- src/components/Composer.vue | 11 ++--- src/components/MessageContent.js | 2 +- src/components/PostAttachment.vue | 5 ++- src/components/ProfileInfo.vue | 5 ++- src/components/Search.vue | 7 ++-- src/components/TimelinePost.vue | 6 ++- src/components/UserEntry.vue | 3 +- src/mixins/follow.js | 5 ++- src/router.js | 3 +- src/store/account.js | 13 +++--- src/store/timeline.js | 23 ++++++----- src/views/OStatus.vue | 5 ++- 16 files changed, 139 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index f450eed6..5124d8ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3543,6 +3543,57 @@ "core-js": "^3.6.4" } }, + "@nextcloud/moment": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@nextcloud/moment/-/moment-1.1.1.tgz", + "integrity": "sha512-lh7Xn9Ver12pLfE0rpjxE6x/ipscAV+7fw1u+7TJak1QR1T1UDRMZ9dA7z77W8mZH2C3yveTh/VEHZIflKBrng==", + "requires": { + "@nextcloud/l10n": "1.2.0", + "core-js": "3.6.4", + "jed": "^1.1.1", + "moment": "2.24.0", + "node-gettext": "^2.0.0" + }, + "dependencies": { + "@nextcloud/l10n": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.2.0.tgz", + "integrity": "sha512-aPsVAewCYMNe2h0yse3Fj7LofvnvFPimojw24K47ip1+I1gawMIsQL+BYAnN8wzlcbsDTEc7I1FxtOh+8dHHIA==", + "requires": { + "core-js": "^3.6.4", + "node-gettext": "^3.0.0" + }, + "dependencies": { + "node-gettext": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/node-gettext/-/node-gettext-3.0.0.tgz", + "integrity": "sha512-/VRYibXmVoN6tnSAY2JWhNRhWYJ8Cd844jrZU/DwLVoI4vBI6ceYbd8i42sYZ9uOgDH3S7vslIKOWV/ZrT2YBA==", + "requires": { + "lodash.get": "^4.4.2" + } + } + } + }, + "core-js": { + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz", + "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==" + }, + "moment": { + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + }, + "node-gettext": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/node-gettext/-/node-gettext-2.1.0.tgz", + "integrity": "sha512-vsHImHl+Py0vB7M2UXcFEJ5NJ3950gcja45YclBFtYxYeZiqdfQdcu+G9s4L7jpRFSh/J/7VoS3upR4JM1nS+g==", + "requires": { + "lodash.get": "^4.4.2" + } + } + } + }, "@nextcloud/router": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-1.2.0.tgz", @@ -6963,6 +7014,7 @@ "has": "^1.0.3", "has-symbols": "^1.0.1", "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", "is-regex": "^1.1.1", "object-inspect": "^1.8.0", "object-keys": "^1.1.1", @@ -6977,8 +7029,30 @@ "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", "requires": { "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.0", "has-symbols": "^1.0.1", "object-keys": "^1.1.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + } } } } @@ -9235,6 +9309,11 @@ "is-path-inside": "^3.0.1" } }, + "is-negative-zero": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=" + }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", @@ -9542,6 +9621,11 @@ "plist": "^3.0.1" } }, + "jed": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz", + "integrity": "sha1-elSbvZ/+FYWwzQoZHiAwVb7ldLQ=" + }, "jest": { "version": "26.4.2", "resolved": "https://registry.npmjs.org/jest/-/jest-26.4.2.tgz", diff --git a/package.json b/package.json index 651412ad..2f0f6b2d 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "@nextcloud/axios": "^1.4.0", "@nextcloud/initial-state": "^1.1.2", "@nextcloud/logger": "^1.1.2", + "@nextcloud/moment": "^1.1.1", "@nextcloud/router": "^1.2.0", "@nextcloud/vue": "^2.6.8", "he": "^1.2.0", diff --git a/src/App.vue b/src/App.vue index 572000a6..78ac28d1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -97,6 +97,7 @@ import axios from '@nextcloud/axios' import Search from './components/Search.vue' import currentuserMixin from './mixins/currentUserMixin' import { loadState } from '@nextcloud/initial-state' +import { generateUrl } from '@nextcloud/router' export default { name: 'App', @@ -214,7 +215,7 @@ export default { this.infoHidden = true }, setCloudAddress() { - axios.post(OC.generateUrl('apps/social/api/v1/config/cloudAddress'), { cloudAddress: this.cloudAddress }).then((response) => { + axios.post(generateUrl('apps/social/api/v1/config/cloudAddress'), { cloudAddress: this.cloudAddress }).then((response) => { this.$store.commit('setServerDataEntry', 'setup', false) this.$store.commit('setServerDataEntry', 'cloudAddress', this.cloudAddress) }) diff --git a/src/components/ActorAvatar.vue b/src/components/ActorAvatar.vue index d45954dd..769265b3 100644 --- a/src/components/ActorAvatar.vue +++ b/src/components/ActorAvatar.vue @@ -29,6 +29,7 @@