usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix

This commit is contained in:
syuilo 2018-05-07 17:45:21 +09:00
parent 8afaca36d9
commit d305c7e401
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/remote/activitypub/models/note.ts
View File

@ -13,7 +13,7 @@ import { IRemoteUser } from '../../../models/user';
const log = debug('misskey:activitypub'); const log = debug('misskey:activitypub');
function parse(tag, html: string): string { function parse(html: string): string {
const dom = parse5.parseFragment(html) as parse5.AST.Default.Document; const dom = parse5.parseFragment(html) as parse5.AST.Default.Document;
let text = ''; let text = '';
@ -22,6 +22,16 @@ function parse(tag, html: string): string {
return text.trim(); return text.trim();
function getText(node) {
if (node.nodeName == '#text') return node.value;
if (node.childNodes) {
return node.childNodes.map(n => getText(n)).join('');
}
return '';
}
function analyze(node) { function analyze(node) {
switch (node.nodeName) { switch (node.nodeName) {
case '#text': case '#text':
@ -39,23 +49,23 @@ function parse(tag, html: string): string {
// for Mastodon // for Mastodon
if (cls.includes('mention')) { if (cls.includes('mention')) {
//#region ホスト名部分が省略されているので復元する const mention = getText(node);
// Activityのtag情報に次のような形で省略前の情報が添付されているのでそこから持ってくる const part = mention.split('@');
// {
// "type": "Mention",
// "href": "https://misskey.xyz/users/57d01a501fdf2d07be417afe",
// "name": "@syuilo@misskey.xyz"
// }
const href = node.attrs.find(x => x.name == 'href').value; if (part.length == 2) {
const acct = tag.find(t => t.type == 'Mention' && t.href == href).name; //#region ホスト名部分が省略されているので復元する
text += acct; const href = new URL(node.attrs.find(x => x.name == 'href').value);
const acct = mention + '@' + href.hostname;
text += acct;
break;
break; //#endregion
} else if (part.length == 3) {
//#endregion text += mention;
break;
}
} }
if (node.childNodes) { if (node.childNodes) {
@ -154,7 +164,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
const reply = note.inReplyTo ? await resolveNote(note.inReplyTo, resolver) : null; const reply = note.inReplyTo ? await resolveNote(note.inReplyTo, resolver) : null;
// テキストのパース // テキストのパース
const text = parse(note.tag, note.content); const text = parse(note.content);
// ユーザーの情報が古かったらついでに更新しておく // ユーザーの情報が古かったらついでに更新しておく
if (actor.updatedAt == null || Date.now() - actor.updatedAt.getTime() > 1000 * 60 * 60 * 24) { if (actor.updatedAt == null || Date.now() - actor.updatedAt.getTime() > 1000 * 60 * 60 * 24) {