Merge branch 'upstream-patch-name' of https://github.com/theowenyoung/lemmy-ui into theowenyoung-upstream-patch-name

This commit is contained in:
Dessalines 2021-10-29 14:52:40 -04:00
commit ed37b30723

View file

@ -1464,13 +1464,13 @@ export const choicesConfig = {
export function communitySelectName(cv: CommunityView): string { export function communitySelectName(cv: CommunityView): string {
return cv.community.local return cv.community.local
? cv.community.name ? cv.community.title
: `${hostname(cv.community.actor_id)}/${cv.community.name}`; : `${hostname(cv.community.actor_id)}/${cv.community.name}`;
} }
export function personSelectName(pvs: PersonViewSafe): string { export function personSelectName(pvs: PersonViewSafe): string {
return pvs.person.local return pvs.person.local
? pvs.person.name ? pvs.person.display_name || pvs.person.name
: `${hostname(pvs.person.actor_id)}/${pvs.person.name}`; : `${hostname(pvs.person.actor_id)}/${pvs.person.name}`;
} }