Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2020-06-21 16:37:43 +09:00
commit 8dbdab4a47
5 changed files with 28 additions and 3 deletions

View File

@ -3,7 +3,9 @@ export function nyaize(text: string): string {
// ja-JP
.replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ').replace(/ナ/g, 'ニャ')
// en-US
.replace(/morning/gi, 'mornyan').replace(/everyone/gi, 'everynyan')
.replace(/(?<=n)a/gi, x => x === 'A' ? 'YA' : 'ya')
.replace(/(?<=morn)ing/gi, x => x === 'ING' ? 'YAN' : 'yan')
.replace(/(?<=every)one/gi, x => x === 'ONE' ? 'NYAN' : 'nyan')
// ko-KR
.replace(/[나-낳]/g, match => String.fromCharCode(
match.charCodeAt(0)! + '냐'.charCodeAt(0) - '나'.charCodeAt(0)

View File

@ -138,6 +138,8 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
const isBot = object.type === 'Service';
const bday = person['vcard:bday']?.match(/^\d{4}-\d{2}-\d{2}/);
// Create user
let user: IRemoteUser;
try {
@ -168,6 +170,8 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
description: person.summary ? htmlToMfm(person.summary, person.tag) : null,
url: getOneApHrefNullable(person.url),
fields,
birthday: bday ? bday[0] : null,
location: person['vcard:Address'] || null,
userHost: host
}));
@ -319,6 +323,8 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
const tags = extractApHashtags(person.tag).map(tag => tag.toLowerCase()).splice(0, 32);
const bday = person['vcard:bday']?.match(/^\d{4}-\d{2}-\d{2}/);
const updates = {
lastFetchedAt: new Date(),
inbox: person.inbox,
@ -356,6 +362,8 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
url: getOneApHrefNullable(person.url),
fields,
description: person.summary ? htmlToMfm(person.summary, person.tag) : null,
birthday: bday ? bday[0] : null,
location: person['vcard:Address'] || null,
});
// ハッシュタグ更新

View File

@ -49,6 +49,9 @@ export const attachLdSignature = async (activity: any, user: ILocalUser): Promis
'_misskey_reaction': 'misskey:_misskey_reaction',
'_misskey_votes': 'misskey:_misskey_votes',
'_misskey_talk': 'misskey:_misskey_talk',
'isCat': 'misskey:isCat',
// vcard
vcard: 'http://www.w3.org/2006/vcard/ns#',
};
activity['@context'].push(obj);

View File

@ -52,7 +52,7 @@ export async function renderPerson(user: ILocalUser) {
const keypair = await UserKeypairs.findOne(user.id).then(ensure);
return {
const person = {
type: isSystem ? 'Application' : user.isBot ? 'Service' : 'Person',
id,
inbox: `${id}/inbox`,
@ -73,5 +73,15 @@ export async function renderPerson(user: ILocalUser) {
publicKey: renderKey(user, keypair, `#main-key`),
isCat: user.isCat,
attachment: attachment.length ? attachment : undefined
};
} as any;
if (profile?.birthday) {
person['vcard:bday'] = profile.birthday;
}
if (profile?.location) {
person['vcard:Address'] = profile.location;
}
return person;
}

View File

@ -140,6 +140,8 @@ export interface IPerson extends IObject {
endpoints?: {
sharedInbox?: string;
};
'vcard:bday'?: string;
'vcard:Address'?: string;
}
export const isCollection = (object: IObject): object is ICollection =>