graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-23 22:43:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2278 from mei23/mei-0817-announce3

Browse source 
Misskey => Misskey で renote 出来ない件修正
This commit is contained in:
syuilo 2018-08-17 13:18:11 +09:00 committed by GitHub
commit 2777460150
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/remote/activitypub/kernel/announce/note.ts
View file

@ -40,11 +40,13 @@ export default async function(resolver: Resolver, actor: IRemoteUser, activity:
if (!note.to.includes('https://www.w3.org/ns/activitystreams#Public')) {
if (note.cc.includes('https://www.w3.org/ns/activitystreams#Public')) {
visibility = 'home';
} else if (note.to.includes(`${actor.uri}/followers`)) { // TODO: person.followerと照合するべき？
visibility = 'followers';
} else {
visibility = 'specified';
visibleUsers = await Promise.all(note.to.map(uri => resolvePerson(uri)));
}
} if (activity.cc.length == 0) visibility = 'followers';
}
//#endergion
await post(actor, {

20
src/remote/activitypub/renderer/announce.ts
View file

@ -1,5 +1,15 @@
export default (id: string, object: any) => ({
type: 'Announce',
id,
object
});
import config from '../../../config';
import { INote } from '../../../models/note';
export default (object: any, note: INote) => {
const attributedTo = `${config.url}/users/${note.userId}`;
return {
id: `${config.url}/notes/${note._id}`,
type: 'Announce',
published: note.createdAt.toISOString(),
to: ['https://www.w3.org/ns/activitystreams#Public'],
cc: [attributedTo, `${attributedTo}/followers`],
object
};
};

2
src/services/note/create.ts
View file

@ -235,7 +235,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
async function renderActivity(data: Option, note: INote) {
const content = data.renote && data.text == null
? renderAnnounce(note._id.toHexString(), data.renote.uri ? data.renote.uri : await renderNote(data.renote))
? renderAnnounce(data.renote.uri ? data.renote.uri : await renderNote(data.renote), note)
: renderCreate(await renderNote(note));
return packAp(content);