etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-11-22 05:55:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge: Fix/fixing mastodon api search mfm (!532)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/532

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
This commit is contained in:
Marie 2024-05-31 18:32:51 +00:00
commit 86ccbd9487
2 changed files with 147 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

288
packages/backend/src/core/MfmService.ts
View file

@ -459,10 +459,10 @@ export class MfmService {
return `<p>${doc.body.innerHTML}</p>`; return `<p>${doc.body.innerHTML}</p>`;
} }
// the toMastoHtml function was taken from Iceshrimp and written by zotan and modified by marie to work with the current MK version // the toMastoApiHtml function was taken from Iceshrimp and written by zotan and modified by marie to work with the current MK version
@bindThis @bindThis
public async toMastoHtml(nodes: mfm.MfmNode[] | null, mentionedRemoteUsers: IMentionedRemoteUsers = [], inline = false, quoteUri: string | null = null) { public async toMastoApiHtml(nodes: mfm.MfmNode[] | null, mentionedRemoteUsers: IMentionedRemoteUsers = [], inline = false, quoteUri: string | null = null) {
if (nodes == null) { if (nodes == null) {
return null; return null;
} }
@ -480,174 +480,174 @@ export class MfmService {
const handlers: { const handlers: {
[K in mfm.MfmNode['type']]: (node: mfm.NodeType<K>) => any; [K in mfm.MfmNode['type']]: (node: mfm.NodeType<K>) => any;
} = { } = {
async bold(node) { async bold(node) {
const el = doc.createElement('span'); const el = doc.createElement('span');
el.textContent = '**'; el.textContent = '**';
await appendChildren(node.children, el); await appendChildren(node.children, el);
el.textContent += '**'; el.textContent += '**';
return el; return el;
}, },
async small(node) { async small(node) {
const el = doc.createElement('small'); const el = doc.createElement('small');
await appendChildren(node.children, el); await appendChildren(node.children, el);
return el; return el;
}, },
async strike(node) { async strike(node) {
const el = doc.createElement('span'); const el = doc.createElement('span');
el.textContent = '~~'; el.textContent = '~~';
await appendChildren(node.children, el); await appendChildren(node.children, el);
el.textContent += '~~'; el.textContent += '~~';
return el; return el;
}, },
async italic(node) { async italic(node) {
const el = doc.createElement('span'); const el = doc.createElement('span');
el.textContent = '*'; el.textContent = '*';
await appendChildren(node.children, el); await appendChildren(node.children, el);
el.textContent += '*'; el.textContent += '*';
return el; return el;
}, },
async fn(node) { async fn(node) {
const el = doc.createElement('span'); const el = doc.createElement('span');
el.textContent = '*'; el.textContent = '*';
await appendChildren(node.children, el); await appendChildren(node.children, el);
el.textContent += '*'; el.textContent += '*';
return el; return el;
}, },
blockCode(node) { blockCode(node) {
const pre = doc.createElement('pre'); const pre = doc.createElement('pre');
const inner = doc.createElement('code'); const inner = doc.createElement('code');
const nodes = node.props.code const nodes = node.props.code
.split(/\r\n|\r|\n/) .split(/\r\n|\r|\n/)
.map((x) => doc.createTextNode(x)); .map((x) => doc.createTextNode(x));
for (const x of intersperse<FIXME | 'br'>('br', nodes)) { for (const x of intersperse<FIXME | 'br'>('br', nodes)) {
inner.appendChild(x === 'br' ? doc.createElement('br') : x); inner.appendChild(x === 'br' ? doc.createElement('br') : x);
} }
pre.appendChild(inner); pre.appendChild(inner);
return pre; return pre;
}, },
async center(node) { async center(node) {
const el = doc.createElement('div'); const el = doc.createElement('div');
await appendChildren(node.children, el); await appendChildren(node.children, el);
return el; return el;
}, },
emojiCode(node) { emojiCode(node) {
return doc.createTextNode(`\u200B:${node.props.name}:\u200B`); return doc.createTextNode(`\u200B:${node.props.name}:\u200B`);
}, },
unicodeEmoji(node) { unicodeEmoji(node) {
return doc.createTextNode(node.props.emoji); return doc.createTextNode(node.props.emoji);
}, },
hashtag: (node) => { hashtag: (node) => {
const a = doc.createElement('a'); const a = doc.createElement('a');
a.setAttribute('href', `${this.config.url}/tags/${node.props.hashtag}`); a.setAttribute('href', `${this.config.url}/tags/${node.props.hashtag}`);
a.textContent = `#${node.props.hashtag}`; a.textContent = `#${node.props.hashtag}`;
a.setAttribute('rel', 'tag'); a.setAttribute('rel', 'tag');
a.setAttribute('class', 'hashtag'); a.setAttribute('class', 'hashtag');
return a; return a;
}, },
inlineCode(node) { inlineCode(node) {
const el = doc.createElement('code'); const el = doc.createElement('code');
el.textContent = node.props.code; el.textContent = node.props.code;
return el; return el;
}, },
mathInline(node) { mathInline(node) {
const el = doc.createElement('code'); const el = doc.createElement('code');
el.textContent = node.props.formula; el.textContent = node.props.formula;
return el; return el;
}, },
mathBlock(node) { mathBlock(node) {
const el = doc.createElement('code'); const el = doc.createElement('code');
el.textContent = node.props.formula; el.textContent = node.props.formula;
return el; return el;
}, },
async link(node) { async link(node) {
const a = doc.createElement('a'); const a = doc.createElement('a');
a.setAttribute('rel', 'nofollow noopener noreferrer'); a.setAttribute('rel', 'nofollow noopener noreferrer');
a.setAttribute('target', '_blank'); a.setAttribute('target', '_blank');
a.setAttribute('href', node.props.url); a.setAttribute('href', node.props.url);
await appendChildren(node.children, a); await appendChildren(node.children, a);
return a; return a;
}, },
async mention(node) { async mention(node) {
const { username, host, acct } = node.props; const { username, host, acct } = node.props;
const resolved = mentionedRemoteUsers.find(remoteUser => remoteUser.username === username && remoteUser.host === host); const resolved = mentionedRemoteUsers.find(remoteUser => remoteUser.username === username && remoteUser.host === host);
const el = doc.createElement('span'); const el = doc.createElement('span');
if (!resolved) { if (!resolved) {
el.textContent = acct; el.textContent = acct;
} else { } else {
el.setAttribute('class', 'h-card'); el.setAttribute('class', 'h-card');
el.setAttribute('translate', 'no'); el.setAttribute('translate', 'no');
const a = doc.createElement('a'); const a = doc.createElement('a');
a.setAttribute('href', resolved.url ? resolved.url : resolved.uri); a.setAttribute('href', resolved.url ? resolved.url : resolved.uri);
a.className = 'u-url mention'; a.className = 'u-url mention';
const span = doc.createElement('span'); const span = doc.createElement('span');
span.textContent = resolved.username || username; span.textContent = resolved.username || username;
a.textContent = '@'; a.textContent = '@';
a.appendChild(span); a.appendChild(span);
el.appendChild(a); el.appendChild(a);
} }
return el; return el;
}, },
async quote(node) { async quote(node) {
const el = doc.createElement('blockquote'); const el = doc.createElement('blockquote');
await appendChildren(node.children, el); await appendChildren(node.children, el);
return el; return el;
}, },
text(node) { text(node) {
const el = doc.createElement('span'); const el = doc.createElement('span');
const nodes = node.props.text const nodes = node.props.text
.split(/\r\n|\r|\n/) .split(/\r\n|\r|\n/)
.map((x) => doc.createTextNode(x)); .map((x) => doc.createTextNode(x));
for (const x of intersperse<FIXME | 'br'>('br', nodes)) { for (const x of intersperse<FIXME | 'br'>('br', nodes)) {
el.appendChild(x === 'br' ? doc.createElement('br') : x); el.appendChild(x === 'br' ? doc.createElement('br') : x);
} }
return el; return el;
}, },
url(node) { url(node) {
const a = doc.createElement('a'); const a = doc.createElement('a');
a.setAttribute('rel', 'nofollow noopener noreferrer'); a.setAttribute('rel', 'nofollow noopener noreferrer');
a.setAttribute('target', '_blank'); a.setAttribute('target', '_blank');
a.setAttribute('href', node.props.url); a.setAttribute('href', node.props.url);
a.textContent = node.props.url.replace(/^https?:\/\//, ''); a.textContent = node.props.url.replace(/^https?:\/\//, '');
return a; return a;
}, },
search: (node) => { search: (node) => {
const a = doc.createElement('a'); const a = doc.createElement('a');
a.setAttribute('href', `https"google.com/${node.props.query}`); a.setAttribute('href', `https://www.google.com/search?q=${node.props.query}`);
a.textContent = node.props.content; a.textContent = node.props.content;
return a; return a;
}, },
async plain(node) { async plain(node) {
const el = doc.createElement('span'); const el = doc.createElement('span');
await appendChildren(node.children, el); await appendChildren(node.children, el);
return el; return el;
}, },
}; };
await appendChildren(nodes, doc.body); await appendChildren(nodes, doc.body);

6
packages/backend/src/server/api/mastodon/converters.ts
View file

@ -110,7 +110,7 @@ export class MastoConverters {
private async encodeField(f: Entity.Field): Promise<Entity.Field> { private async encodeField(f: Entity.Field): Promise<Entity.Field> {
return { return {
name: f.name, name: f.name,
value: await this.mfmService.toMastoHtml(mfm.parse(f.value), [], true) ?? escapeMFM(f.value), value: await this.mfmService.toMastoApiHtml(mfm.parse(f.value), [], true) ?? escapeMFM(f.value),
verified_at: null, verified_at: null,
}; };
} }
@ -179,7 +179,7 @@ export class MastoConverters {
const files = this.driveFileEntityService.packManyByIds(edit.fileIds); const files = this.driveFileEntityService.packManyByIds(edit.fileIds);
const item = { const item = {
account: noteUser, account: noteUser,
content: this.mfmService.toMastoHtml(mfm.parse(edit.newText ?? ''), JSON.parse(note.mentionedRemoteUsers)).then(p => p ?? ''), content: this.mfmService.toMastoApiHtml(mfm.parse(edit.newText ?? ''), JSON.parse(note.mentionedRemoteUsers)).then(p => p ?? ''),
created_at: lastDate.toISOString(), created_at: lastDate.toISOString(),
emojis: [], emojis: [],
sensitive: files.then(files => files.length > 0 ? files.some((f) => f.isSensitive) : false), sensitive: files.then(files => files.length > 0 ? files.some((f) => f.isSensitive) : false),
@ -240,7 +240,7 @@ export class MastoConverters {
}); });
const content = note.text !== null const content = note.text !== null
? quoteUri.then(quoteUri => this.mfmService.toMastoHtml(mfm.parse(note.text!), JSON.parse(note.mentionedRemoteUsers), false, quoteUri)) ? quoteUri.then(quoteUri => this.mfmService.toMastoApiHtml(mfm.parse(note.text!), JSON.parse(note.mentionedRemoteUsers), false, quoteUri))
.then(p => p ?? escapeMFM(note.text!)) .then(p => p ?? escapeMFM(note.text!))
: ''; : '';