profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1728 from rinsuki/fix/1726

Browse source 
fix #1726
This commit is contained in:
syuilo 2018-06-17 16:02:21 +09:00 • committed by GitHub
commit 44cd1e9223
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/remote/activitypub/misc/get-note-html.ts
View file

@ -6,7 +6,7 @@ import config from '../../../config';
export default function(note: INote) { export default function(note: INote) {
if (note.text == null) return null; if (note.text == null) return null;
let html = toHtml(parse(note.text)); let html = toHtml(parse(note.text), note.mentionedRemoteUsers);
if (note.poll != null) { if (note.poll != null) {
const url = `${config.url}/notes/${note._id}`; const url = `${config.url}/notes/${note._id}`;

12
src/text/html.ts
View file

@ -1,8 +1,9 @@
import { lib as emojilib } from 'emojilib'; import { lib as emojilib } from 'emojilib';
import { JSDOM } from 'jsdom'; import { JSDOM } from 'jsdom';
import config from '../config'; import config from '../config';
import { INote } from '../models/note';
const handlers = { const handlers: {[key: string]: (window: any, token: any, mentionedRemoteUsers: INote["mentionedRemoteUsers"]) => void} = {
bold({ document }, { bold }) { bold({ document }, { bold }) {
const b = document.createElement('b'); const b = document.createElement('b');
b.textContent = bold; b.textContent = bold;
@ -44,9 +45,10 @@ const handlers = {
document.body.appendChild(a); document.body.appendChild(a);
}, },
mention({ document }, { content }) { mention({ document }, { content, username, host }, mentionedRemoteUsers) {
const a = document.createElement('a'); const a = document.createElement('a');
a.href = `${config.url}/${content}`; const remoteUserInfo = mentionedRemoteUsers.find(remoteUser => remoteUser.username === username && remoteUser.host === host);
a.href = remoteUserInfo ? remoteUserInfo.uri : `${config.url}/${content}`;
a.textContent = content; a.textContent = content;
document.body.appendChild(a); document.body.appendChild(a);
}, },
@ -88,11 +90,11 @@ const handlers = {
} }
}; };
export default tokens => { export default (tokens, mentionedRemoteUsers: INote["mentionedRemoteUsers"] = []) => {
const { window } = new JSDOM(''); const { window } = new JSDOM('');
for (const token of tokens) { for (const token of tokens) {
handlers[token.type](window, token); handlers[token.type](window, token, mentionedRemoteUsers);
} }
return `<p>${window.document.body.innerHTML}</p>`; return `<p>${window.document.body.innerHTML}</p>`;