mirror of
https://github.com/misskey-dev/misskey.git
synced 2024-12-13 23:20:50 +01:00
fix(backend): プロフィールの自己紹介欄のMFMを連合するように (misskey-dev#12184) (MisskeyIO#199)
Co-authored-by: kakkokari-gtyih <daisho7308+f@gmail.com>
This commit is contained in:
parent
462b5470b7
commit
5bcf8e9b9d
3 changed files with 21 additions and 2 deletions
|
@ -496,6 +496,7 @@ export class ApRendererService {
|
|||
preferredUsername: user.username,
|
||||
name: user.name,
|
||||
summary: profile.description ? this.mfmService.toHtml(mfm.parse(profile.description)) : null,
|
||||
_misskey_summary: profile.description,
|
||||
icon: avatar ? this.renderImage(avatar) : null,
|
||||
image: banner ? this.renderImage(banner) : null,
|
||||
tag,
|
||||
|
@ -645,6 +646,7 @@ export class ApRendererService {
|
|||
'_misskey_quote': 'misskey:_misskey_quote',
|
||||
'_misskey_reaction': 'misskey:_misskey_reaction',
|
||||
'_misskey_votes': 'misskey:_misskey_votes',
|
||||
'_misskey_summary': 'misskey:_misskey_summary',
|
||||
'isCat': 'misskey:isCat',
|
||||
// vcard
|
||||
vcard: 'http://www.w3.org/2006/vcard/ns#',
|
||||
|
|
|
@ -335,9 +335,17 @@ export class ApPersonService implements OnModuleInit {
|
|||
emojis,
|
||||
})) as MiRemoteUser;
|
||||
|
||||
let _description: string | null = null;
|
||||
|
||||
if (person._misskey_summary) {
|
||||
_description = truncate(person._misskey_summary, summaryLength);
|
||||
} else if (person.summary) {
|
||||
_description = this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag);
|
||||
}
|
||||
|
||||
await transactionalEntityManager.save(new MiUserProfile({
|
||||
userId: user.id,
|
||||
description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null,
|
||||
description: _description,
|
||||
url,
|
||||
fields,
|
||||
birthday: bday?.[0] ?? null,
|
||||
|
@ -503,10 +511,18 @@ export class ApPersonService implements OnModuleInit {
|
|||
});
|
||||
}
|
||||
|
||||
let _description: string | null = null;
|
||||
|
||||
if (person._misskey_summary) {
|
||||
_description = truncate(person._misskey_summary, summaryLength);
|
||||
} else if (person.summary) {
|
||||
_description = this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag);
|
||||
}
|
||||
|
||||
await this.userProfilesRepository.update({ userId: exist.id }, {
|
||||
url,
|
||||
fields,
|
||||
description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null,
|
||||
description: _description,
|
||||
birthday: bday?.[0] ?? null,
|
||||
location: person['vcard:Address'] ?? null,
|
||||
});
|
||||
|
|
|
@ -12,6 +12,7 @@ export interface IObject {
|
|||
id?: string;
|
||||
name?: string | null;
|
||||
summary?: string;
|
||||
_misskey_summary?: string;
|
||||
published?: string;
|
||||
cc?: ApObject;
|
||||
to?: ApObject;
|
||||
|
|
Loading…
Reference in a new issue