mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-10 01:53:08 +02:00
upd: update user data fetching on masto api
This commit is contained in:
parent
c10f785614
commit
06630c097b
3 changed files with 12 additions and 8 deletions
|
@ -344,6 +344,7 @@ export class UserEntityService implements OnModuleInit {
|
|||
host: user.host,
|
||||
avatarUrl: user.avatarUrl ?? this.getIdenticonUrl(user),
|
||||
avatarBlurhash: user.avatarBlurhash,
|
||||
description: profile!.description,
|
||||
createdAt: user.createdAt.toISOString(),
|
||||
isBot: user.isBot ?? falsy,
|
||||
isCat: user.isCat ?? falsy,
|
||||
|
@ -355,6 +356,9 @@ export class UserEntityService implements OnModuleInit {
|
|||
faviconUrl: instance.faviconUrl,
|
||||
themeColor: instance.themeColor,
|
||||
} : undefined) : undefined,
|
||||
followersCount: followersCount ?? 0,
|
||||
followingCount: followingCount ?? 0,
|
||||
notesCount: user.notesCount,
|
||||
emojis: this.customEmojiService.populateEmojis(user.emojis, user.host),
|
||||
onlineStatus: this.getOnlineStatus(user),
|
||||
// パフォーマンス上の理由でローカルユーザーのみ
|
||||
|
@ -379,16 +383,12 @@ export class UserEntityService implements OnModuleInit {
|
|||
isLocked: user.isLocked,
|
||||
isSilenced: this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote),
|
||||
isSuspended: user.isSuspended ?? falsy,
|
||||
description: profile!.description,
|
||||
location: profile!.location,
|
||||
birthday: profile!.birthday,
|
||||
listenbrainz: profile!.listenbrainz,
|
||||
lang: profile!.lang,
|
||||
fields: profile!.fields,
|
||||
verifiedLinks: profile!.verifiedLinks,
|
||||
followersCount: followersCount ?? 0,
|
||||
followingCount: followingCount ?? 0,
|
||||
notesCount: user.notesCount,
|
||||
pinnedNoteIds: pins.map(pin => pin.noteId),
|
||||
pinnedNotes: this.noteEntityService.packMany(pins.map(pin => pin.note!), me, {
|
||||
detail: true,
|
||||
|
|
|
@ -88,10 +88,10 @@ namespace MisskeyAPI {
|
|||
suspended: null,
|
||||
limited: null,
|
||||
created_at: u.createdAt ? u.createdAt : '',
|
||||
followers_count: 0,
|
||||
following_count: 0,
|
||||
statuses_count: 0,
|
||||
note: '',
|
||||
followers_count: u.followersCount ? u.followersCount : 0,
|
||||
following_count: u.followingCount ? u.followingCount : 0,
|
||||
statuses_count: u.notesCount ? u.notesCount : 0,
|
||||
note: u.description ? u.description : '',
|
||||
url: u.host ? `https://${u.host}/@${u.username}` : host ? `https://${host}/@${u.username}` : acct,
|
||||
avatar: u.avatarUrl,
|
||||
avatar_static: u.avatarColor,
|
||||
|
|
|
@ -5,7 +5,11 @@ namespace MisskeyEntity {
|
|||
id: string
|
||||
name: string
|
||||
username: string
|
||||
description?: string
|
||||
createdAt?: string
|
||||
followingCount?: number
|
||||
followersCount?: number
|
||||
notesCount?: number
|
||||
host: string | null
|
||||
avatarUrl: string
|
||||
avatarColor: string
|
||||
|
|
Loading…
Reference in a new issue