From 03f28d3fa6b57d97cfd4933f4f0f232201075f92 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 17 Sep 2018 18:55:11 +0300 Subject: Fixed "user.id is undefined" or something error more sane by properly handling HTTP errors --- src/services/api/api.service.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/services/api/api.service.js') diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 87315657..e973667b 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -335,7 +335,14 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&') url += `?${queryString}` - return fetch(url, { headers: authHeaders(credentials) }).then((data) => data.json()) + return fetch(url, { headers: authHeaders(credentials) }) + .then((data) => { + if (data.ok) { + return data + } + throw new Error('Error fetching timeline') + }) + .then((data) => data.json()) } const verifyCredentials = (user) => { -- cgit v1.2.3-70-g09d2 From 419744080ff2dfcf4b860f01692463b78f30c40a Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 17 Sep 2018 19:16:33 +0300 Subject: console.log cleanup --- src/main.js | 2 -- src/services/api/api.service.js | 2 -- 2 files changed, 4 deletions(-) (limited to 'src/services/api/api.service.js') diff --git a/src/main.js b/src/main.js index 31607f0d..367db881 100644 --- a/src/main.js +++ b/src/main.js @@ -80,7 +80,6 @@ window.fetch('/api/statusnet/config.json') .then((data) => { const {name, closed: registrationClosed, textlimit, server} = data.site - console.log(store) store.dispatch('setInstanceOption', { name: 'name', value: name }) store.dispatch('setInstanceOption', { name: 'registrationOpen', value: (registrationClosed === '0') }) store.dispatch('setInstanceOption', { name: 'textlimit', value: parseInt(textlimit) }) @@ -92,7 +91,6 @@ window.fetch('/api/statusnet/config.json') .then((res) => res.json()) .catch((err) => { console.warn('Failed to load static/config.json, continuing without it.') - console.warn('Error was: ') console.warn(err) return {} }) diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index e973667b..83a83e91 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -133,8 +133,6 @@ const updateBanner = ({credentials, params}) => { const updateProfile = ({credentials, params}) => { let url = PROFILE_UPDATE_URL - console.log(params) - const form = new FormData() each(params, (value, key) => { -- cgit v1.2.3-70-g09d2 From 1af5c8fd39b559a4de23dc16a06f2760102a3e24 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sat, 22 Sep 2018 03:54:05 +0000 Subject: add support for disabling rich text formatting --- src/components/user_settings/user_settings.js | 4 +++- src/components/user_settings/user_settings.vue | 4 ++++ src/i18n/en.json | 1 + src/i18n/fr.json | 1 + src/services/api/api.service.js | 4 ++-- 5 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src/services/api/api.service.js') diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index 70463f2a..a6203962 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -7,6 +7,7 @@ const UserSettings = { newname: this.$store.state.users.currentUser.name, newbio: this.$store.state.users.currentUser.description, newlocked: this.$store.state.users.currentUser.locked, + newnorichtext: this.$store.state.users.currentUser.no_rich_text, newdefaultScope: this.$store.state.users.currentUser.default_scope, followList: null, followImportError: false, @@ -53,7 +54,8 @@ const UserSettings = { const locked = this.newlocked /* eslint-disable camelcase */ const default_scope = this.newdefaultScope - this.$store.state.api.backendInteractor.updateProfile({params: {name, description, locked, default_scope}}).then((user) => { + const no_rich_text = this.newnorichtext + this.$store.state.api.backendInteractor.updateProfile({params: {name, description, locked, default_scope, no_rich_text}}).then((user) => { if (!user.error) { this.$store.commit('addNewUsers', [user]) this.$store.commit('setCurrentUser', user) diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index 9daafdce..a2a101dc 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -25,6 +25,10 @@ +

+ + +

diff --git a/src/i18n/en.json b/src/i18n/en.json index e18791e7..2dc6493e 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -130,6 +130,7 @@ "notification_visibility_likes": "Likes", "notification_visibility_mentions": "Mentions", "notification_visibility_repeats": "Repeats", + "no_rich_text_description": "Disable rich text support", "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding", "panelRadius": "Panels", "pause_on_unfocused": "Pause streaming when tab is not focused", diff --git a/src/i18n/fr.json b/src/i18n/fr.json index e8ddf767..022b68c1 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -89,6 +89,7 @@ "name": "Nom", "name_bio": "Nom & Bio", "new_password": "Nouveau mot de passe", + "no_rich_text_description": "Ne formatez pas le texte", "nsfw_clickthrough": "Masquer les images marquées comme contenu adulte ou sensible", "panelRadius": "Fenêtres", "presets": "Thèmes prédéfinis", diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 83a83e91..ab746918 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -136,8 +136,8 @@ const updateProfile = ({credentials, params}) => { const form = new FormData() each(params, (value, key) => { - /* Always include description and locked, because it might be empty or false */ - if (key === 'description' || key === 'locked' || value) { + /* Always include description, no_rich_text and locked, because it might be empty or false */ + if (key === 'description' || key === 'locked' || key === 'no_rich_text' || value) { form.append(key, value) } }) -- cgit v1.2.3-70-g09d2