diff options
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/new_api/oauth.js | 4 | ||||
| -rw-r--r-- | src/services/user_profile_link_generator/user_profile_link_generator.js | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/services/new_api/oauth.js b/src/services/new_api/oauth.js index 97dec94f..9e656507 100644 --- a/src/services/new_api/oauth.js +++ b/src/services/new_api/oauth.js @@ -5,7 +5,7 @@ const getOrCreateApp = ({oauth, instance}) => { const form = new window.FormData() form.append('client_name', `PleromaFE_${Math.random()}`) - form.append('redirect_uris', `${window.location.origin}/~/oauth-callback`) + form.append('redirect_uris', `${window.location.origin}/oauth-callback`) form.append('scopes', 'read write follow') return window.fetch(url, { @@ -64,7 +64,7 @@ const getToken = ({app, instance, code}) => { form.append('client_secret', app.client_secret) form.append('grant_type', 'authorization_code') form.append('code', code) - form.append('redirect_uri', `${window.location.origin}/~/oauth-callback`) + form.append('redirect_uri', `${window.location.origin}/oauth-callback`) return window.fetch(url, { method: 'POST', diff --git a/src/services/user_profile_link_generator/user_profile_link_generator.js b/src/services/user_profile_link_generator/user_profile_link_generator.js index 3367eb8a..bca2c9cd 100644 --- a/src/services/user_profile_link_generator/user_profile_link_generator.js +++ b/src/services/user_profile_link_generator/user_profile_link_generator.js @@ -1,7 +1,10 @@ -const generateProfileLink = (id, screenName) => { +import { includes } from 'lodash' + +const generateProfileLink = (id, screenName, restrictedNicknames) => { + const complicated = (isExternal(screenName) || includes(restrictedNicknames, screenName)) return { - name: (isExternal(screenName) ? 'external-user-profile' : 'user-profile'), - params: (isExternal(screenName) ? { id } : { name: screenName }) + name: (complicated ? 'external-user-profile' : 'user-profile'), + params: (complicated ? { id } : { name: screenName }) } } |