From 6744396f82e1dd0ad7476fff20b4f2eabcdc0250 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 16 Jun 2019 20:17:59 +0300
Subject: getting and setting user background via MastoAPI

---
 src/services/api/api.service.js | 43 ++++++++---------------------------------
 1 file changed, 8 insertions(+), 35 deletions(-)

(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 05d968f7..83b9b819 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1,5 +1,4 @@
 /* eslint-env browser */
-const BG_UPDATE_URL = '/api/qvitter/update_background_image.json'
 const EXTERNAL_PROFILE_URL = '/api/externalprofile/show.json'
 const QVITTER_USER_NOTIFICATIONS_READ_URL = '/api/qvitter/statuses/notifications/read.json'
 const BLOCKS_IMPORT_URL = '/api/pleroma/blocks_import'
@@ -25,7 +24,6 @@ const MFA_DISABLE_OTP_URL = '/api/pleroma/profile/mfa/totp'
 
 const MASTODON_LOGIN_URL = '/api/v1/accounts/verify_credentials'
 const MASTODON_REGISTRATION_URL = '/api/v1/accounts'
-const GET_BACKGROUND_HACK = '/api/account/verify_credentials.json'
 const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
 const MASTODON_USER_NOTIFICATIONS_URL = '/api/v1/notifications'
 const MASTODON_FAVORITE_URL = id => `/api/v1/statuses/${id}/favourite`
@@ -133,22 +131,17 @@ const updateAvatar = ({credentials, avatar}) => {
   .then((data) => parseUser(data))
 }
 
-const updateBg = ({credentials, params}) => {
-  let url = BG_UPDATE_URL
-
+const updateBg = ({ credentials, background }) => {
   const form = new FormData()
-
-  each(params, (value, key) => {
-    if (value) {
-      form.append(key, value)
-    }
-  })
-
-  return fetch(url, {
+  console.log(background)
+  form.append('pleroma_background_image', background)
+  return fetch(MASTODON_PROFILE_UPDATE_URL, {
     headers: authHeaders(credentials),
-    method: 'POST',
+    method: 'PATCH',
     body: form
-  }).then((data) => data.json())
+  })
+    .then((data) => data.json())
+    .then((data) => parseUser(data))
 }
 
 const updateBanner = ({credentials, banner}) => {
@@ -544,26 +537,6 @@ const verifyCredentials = (user) => {
       }
     })
     .then((data) => data.error ? data : parseUser(data))
-    .then((mastoUser) => {
-      // REMOVE WHEN BE SUPPORTS background_image
-      return fetch(GET_BACKGROUND_HACK, {
-        method: 'POST',
-        headers: authHeaders(user)
-      })
-        .then((response) => {
-          if (response.ok) {
-            return response.json()
-          } else {
-            return {}
-          }
-        })
-      /* eslint-disable camelcase */
-        .then(({ background_image }) => ({
-          ...mastoUser,
-          background_image
-        }))
-      /* eslint-enable camelcase */
-    })
 }
 
 const favorite = ({ id, credentials }) => {
-- 
cgit v1.2.3-70-g09d2


From 8caf13bbceff56746a37b461fc24908e09abe774 Mon Sep 17 00:00:00 2001
From: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Mon, 17 Jun 2019 08:20:02 +0000
Subject: Apply suggestion to src/services/api/api.service.js

---
 src/services/api/api.service.js | 1 -
 1 file changed, 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 83b9b819..ab1fc0b2 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -133,7 +133,6 @@ const updateAvatar = ({credentials, avatar}) => {
 
 const updateBg = ({ credentials, background }) => {
   const form = new FormData()
-  console.log(background)
   form.append('pleroma_background_image', background)
   return fetch(MASTODON_PROFILE_UPDATE_URL, {
     headers: authHeaders(credentials),
-- 
cgit v1.2.3-70-g09d2