Merge branch 'dev' into search-component

This commit is contained in:
tonyrewin 2022-11-19 08:01:20 +03:00
commit 8ffb0ca7ce
2 changed files with 3 additions and 2 deletions

View File

@ -11,6 +11,7 @@ import { clsx } from 'clsx'
import { useSession } from '../../context/session'
interface AuthorCardProps {
caption?: string
compact?: boolean
hideDescription?: boolean
hideFollow?: boolean
@ -30,7 +31,7 @@ export const AuthorCard = (props: AuthorCardProps) => {
() => session()?.news?.authors?.some((u) => u === props.author.slug) || false
)
const canFollow = createMemo(() => !props.hideFollow && session()?.user?.slug !== props.author.slug)
const bio = () => props.author.bio || t('Our regular contributor')
const bio = () => props.caption || props.author.bio || t('Our regular contributor')
const name = () => {
return props.author.name === 'Дискурс' && locale() !== 'ru'
? 'Discours'

View File

@ -11,8 +11,8 @@ export default gql`
links
lastSeen
stat {
shouts
followers
followings
}
}
}