graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 05:03:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1730 from rinsuki/fix/1729

Browse source 
Fix #1729
This commit is contained in:
syuilo 2018-06-17 16:51:24 +09:00 committed by GitHub
commit f1f466ed23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/remote/activitypub/renderer/mention.ts
View file

@ -1,9 +1,8 @@
export default (mention: { import { IUser, isRemoteUser } from "../../../models/user";
uri: string; import config from "../../../config";
username: string;
host: string; export default (mention: IUser) => ({
}) => ({
type: 'Mention', type: 'Mention',
href: mention.uri, href: isRemoteUser(mention) ? mention.uri : `${config.url}/@${mention.username}`,
name: `@${mention.username}@${mention.host}` name: isRemoteUser(mention) ? `@${mention.username}@${mention.host}` : `@${mention.username}`,
}); });

13
src/remote/activitypub/renderer/note.ts
View file

@ -54,9 +54,18 @@ export default async function renderNote(note: INote, dive = true) {
? [`${attributedTo}/followers`].concat(mentions) ? [`${attributedTo}/followers`].concat(mentions)
: []; : [];
const mentionUsers = await User.find({
_id: {
$in: note.mentions
}
});
const hashtagTags = (note.tags || []).map(renderHashtag); const hashtagTags = (note.tags || []).map(renderHashtag);
const mentionTags = (note.mentionedRemoteUsers || []).map(renderMention); const mentionTags = mentionUsers.map(renderMention);
const tag = hashtagTags.concat(mentionTags); const tag = [
...hashtagTags,
...mentionTags,
];
return { return {
id: `${config.url}/notes/${note._id}`, id: `${config.url}/notes/${note._id}`,