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

Do not use _replyIds (#3392)

Browse source
This commit is contained in:
MeiMei 2018-11-23 23:12:28 +09:00 committed by syuilo
parent 915d352505
commit f2f7bdc5a9
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/models/note.ts
View file

@ -18,6 +18,7 @@ Note.createIndex('uri', { sparse: true, unique: true });
Note.createIndex('userId');
Note.createIndex('mentions');
Note.createIndex('visibleUserIds');
Note.createIndex('replyId');
Note.createIndex('tagsLower');
Note.createIndex('_user.host');
Note.createIndex('_files._id');
@ -99,7 +100,6 @@ export type INote = {
host: string;
inbox?: string;
};
_replyIds?: mongo.ObjectID[];
_files?: IDriveFile[];
};
@ -258,6 +258,8 @@ export const pack = async (
delete _note._reply;
delete _note._renote;
delete _note._files;
delete _note._replyIds;
if (_note.geo) delete _note.geo.type;
// Populate user

17
src/server/api/endpoints/notes/replies.ts
View file

@ -33,16 +33,13 @@ export const meta = {
};
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
// Lookup note
const note = await Note.findOne({
_id: ps.noteId
});
if (note === null) {
return rej('note not found');
}
const notes = await Note.find({
replyId: ps.noteId
}, {
limit: ps.limit,
skip: ps.offset
});
const ids = (note._replyIds || []).slice(ps.offset, ps.offset + ps.limit);
res(await packMany(ids, user));
res(await packMany(notes, user));
}));

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

@ -622,9 +622,6 @@ function saveQuote(renote: INote, note: INote) {
function saveReply(reply: INote, note: INote) {
Note.update({ _id: reply._id }, {
$push: {
_replyIds: note._id
},
$inc: {
repliesCount: 1
}