Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications

This commit is contained in:
dave 2019-03-31 11:03:43 -04:00
commit 8efcfc69e8
2 changed files with 10 additions and 1 deletions

View file

@ -1,7 +1,7 @@
import { includes } from 'lodash'
const generateProfileLink = (id, screenName, restrictedNicknames) => {
const complicated = (isExternal(screenName) || includes(restrictedNicknames, screenName))
const complicated = !screenName || (isExternal(screenName) || includes(restrictedNicknames, screenName))
return {
name: (complicated ? 'external-user-profile' : 'user-profile'),
params: (complicated ? { id } : { name: screenName })