OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-15 00:35:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse source
This commit is contained in:
syuilo 2019-02-15 08:40:25 +09:00
commit 66b79e5e24
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/client/app/common/views/components/welcome-timeline.vue
View file

@ -76,6 +76,7 @@ export default Vue.extend({
if (note.replyId != null) return; if (note.replyId != null) return;
if (note.renoteId != null) return; if (note.renoteId != null) return;
if (note.poll != null) return; if (note.poll != null) return;
if (note.localOnly) return;
this.notes.unshift(note); this.notes.unshift(note);
}, },

3
src/server/api/endpoints/notes.ts
View file

@ -80,7 +80,8 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
}; };
const query = { const query = {
deletedAt: null, deletedAt: null,
visibility: 'public' visibility: 'public',
localOnly: { $ne: true },
} as any; } as any;
if (ps.sinceId) { if (ps.sinceId) {
sort._id = 1; sort._id = 1;