From 4241b67771128200adee4964df949f2c9891f699 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Tue, 24 Jan 2023 23:07:45 +0100 Subject: [PATCH] nothing Signed-off-by: Sam Therapy --- ci/deploy.sh | 2 +- src/services/api/api.service.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh index e7bfe709..5d2a7106 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -3,7 +3,7 @@ TARGET="pleroma@froth.zone:/opt/pleroma-zero" #rsync -ra public/ "${TARGET}/instance/static" #cp dist/index.html "${TARGET}/instance/static/index.html" -rsync --update -Pr dist/ "${TARGET}" +rsync --update --delete -Pr dist/ "${TARGET}" #rsync --update -ra dist/static/ "${TARGET}/instance/static/static" #rsync --delete -ra images/ "${TARGET}/instance/static/images" #rsync --delete -ra sounds/ "${TARGET}/instance/static/sounds" diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 661acccc..7e53d45c 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -304,7 +304,7 @@ const fetchUser = ({ id, credentials }) => { } const fetchUserRelationship = ({ id, credentials }) => { - let url = `${MASTODON_USER_RELATIONSHIPS_URL}/?id=${id?.id ?? id}` + let url = `${MASTODON_USER_RELATIONSHIPS_URL}/?id=${id.id}` return fetch(url, { headers: authHeaders(credentials) }) .then((response) => { return new Promise((resolve, reject) => response.json()