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

Fix bug

Browse source
This commit is contained in:
syuilo 2018-04-19 09:17:42 +09:00
parent dfb6e717e4
commit 02fd46f64f
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/remote/activitypub/models/note.ts
View file

@ -47,7 +47,8 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
const object = await resolver.resolve(value) as any; const object = await resolver.resolve(value) as any;
if (object == null || object.type !== 'Note') { if (object == null || object.type !== 'Note') {
throw new Error('invalid note'); log(`invalid note: ${object}`);
return null;
} }
const note: INoteActivityStreamsObject = object; const note: INoteActivityStreamsObject = object;
@ -62,7 +63,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
if (!note.to.includes('https://www.w3.org/ns/activitystreams#Public')) visibility = 'unlisted'; if (!note.to.includes('https://www.w3.org/ns/activitystreams#Public')) visibility = 'unlisted';
if (note.cc.length == 0) visibility = 'private'; if (note.cc.length == 0) visibility = 'private';
// TODO // TODO
if (visibility != 'public') throw new Error('unspported visibility'); if (visibility != 'public') return null;
//#endergion //#endergion
// 添付メディア // 添付メディア

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

@ -1,4 +1,3 @@
import { MongoError } from 'mongodb';
import Note, { pack, INote } from '../../models/note'; import Note, { pack, INote } from '../../models/note';
import User, { isLocalUser, IUser, isRemoteUser } from '../../models/user'; import User, { isLocalUser, IUser, isRemoteUser } from '../../models/user';
import stream, { publishLocalTimelineStream, publishGlobalTimelineStream } from '../../publishers/stream'; import stream, { publishLocalTimelineStream, publishGlobalTimelineStream } from '../../publishers/stream';
@ -91,7 +90,7 @@ export default async (user: IUser, data: {
note = await Note.insert(insert); note = await Note.insert(insert);
} catch (e) { } catch (e) {
// duplicate key error // duplicate key error
if (e instanceof MongoError && e.code === 11000) { if (e.code === 11000) {
return res(null); return res(null);
} }

5
src/services/note/reaction/create.ts
View file

@ -9,7 +9,6 @@ import watch from '../watch';
import renderLike from '../../../remote/activitypub/renderer/like'; import renderLike from '../../../remote/activitypub/renderer/like';
import { deliver } from '../../../queue'; import { deliver } from '../../../queue';
import pack from '../../../remote/activitypub/renderer'; import pack from '../../../remote/activitypub/renderer';
import { MongoError } from 'mongodb';
export default async (user: IUser, note: INote, reaction: string) => new Promise(async (res, rej) => { export default async (user: IUser, note: INote, reaction: string) => new Promise(async (res, rej) => {
// Myself // Myself
@ -27,8 +26,8 @@ export default async (user: IUser, note: INote, reaction: string) => new Promise
}); });
} catch (e) { } catch (e) {
// duplicate key error // duplicate key error
if (e instanceof MongoError && e.code === 11000) { if (e.code === 11000) {
return rej('already reacted'); return res(null);
} }
console.error(e); console.error(e);