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

Remove silent flag

Browse source
This commit is contained in:
syuilo 2018-04-06 19:18:38 +09:00
parent eb0809ebb4
commit 9c15c94f80
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/remote/activitypub/act/create.ts
View file

@ -58,7 +58,7 @@ async function createImage(resolver: Resolver, actor: IRemoteUser, image) {
return await uploadFromUrl(image.url, actor); return await uploadFromUrl(image.url, actor);
} }
async function createNote(resolver: Resolver, actor: IRemoteUser, note, silent = false) { async function createNote(resolver: Resolver, actor: IRemoteUser, note) {
if ( if (
('attributedTo' in note && actor.account.uri !== note.attributedTo) || ('attributedTo' in note && actor.account.uri !== note.attributedTo) ||
typeof note.id !== 'string' typeof note.id !== 'string'
@ -86,7 +86,7 @@ async function createNote(resolver: Resolver, actor: IRemoteUser, note, silent =
const inReplyTo = await resolver.resolve(note.inReplyTo) as any; const inReplyTo = await resolver.resolve(note.inReplyTo) as any;
const actor = await resolvePerson(inReplyTo.attributedTo); const actor = await resolvePerson(inReplyTo.attributedTo);
if (isRemoteUser(actor)) { if (isRemoteUser(actor)) {
reply = await createNote(resolver, actor, inReplyTo, true); reply = await createNote(resolver, actor, inReplyTo);
} }
} }
} }
@ -102,5 +102,5 @@ async function createNote(resolver: Resolver, actor: IRemoteUser, note, silent =
viaMobile: false, viaMobile: false,
geo: undefined, geo: undefined,
uri: note.id uri: note.id
}, silent); });
} }

7
src/services/post/create.ts
View file

@ -31,7 +31,7 @@ export default async (user: IUser, data: {
visibility?: string; visibility?: string;
uri?: string; uri?: string;
app?: IApp; app?: IApp;
}, silent = false) => new Promise<IPost>(async (res, rej) => { }) => new Promise<IPost>(async (res, rej) => {
if (data.createdAt == null) data.createdAt = new Date(); if (data.createdAt == null) data.createdAt = new Date();
if (data.visibility == null) data.visibility = 'public'; if (data.visibility == null) data.visibility = 'public';
@ -127,7 +127,10 @@ export default async (user: IUser, data: {
_id: false _id: false
}); });
if (!silent) { // この投稿が3分以内に作成されたものであるならストリームに配信
const shouldDistribute = new Date().getTime() - post.createdAt.getTime() < 1000 * 60 * 3;
if (shouldDistribute) {
const note = await renderNote(user, post); const note = await renderNote(user, post);
const content = renderCreate(note); const content = renderCreate(note);
content['@context'] = context; content['@context'] = context;