diff options
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/endpoints/endpoints.ts | 15 | ||||
| -rw-r--r-- | src/server/api/endpoints/notes/hybrid-timeline.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/notes.ts | 2 | ||||
| -rw-r--r-- | src/server/api/stream/channels/hybrid-timeline.ts | 4 |
4 files changed, 20 insertions, 3 deletions
diff --git a/src/server/api/endpoints/endpoints.ts b/src/server/api/endpoints/endpoints.ts new file mode 100644 index 0000000000..d1e4edaa21 --- /dev/null +++ b/src/server/api/endpoints/endpoints.ts @@ -0,0 +1,15 @@ +import define from '../define'; +import endpoints from '../endpoints'; + +export const meta = { + requireCredential: false, + + tags: ['meta'], + + params: { + }, +}; + +export default define(meta, async () => { + return endpoints.map(x => x.name); +}); diff --git a/src/server/api/endpoints/notes/hybrid-timeline.ts b/src/server/api/endpoints/notes/hybrid-timeline.ts index 6dfb143003..effee2b134 100644 --- a/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -17,6 +17,8 @@ export const meta = { tags: ['notes'], + requireCredential: true, + params: { limit: { validator: $.optional.num.range(1, 100), diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts index d3f17bd787..4691a99394 100644 --- a/src/server/api/endpoints/users/notes.ts +++ b/src/server/api/endpoints/users/notes.ts @@ -142,7 +142,7 @@ export default define(meta, async (ps, me) => { }); //#region Construct query - const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId) + const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate) .andWhere('note.userId = :userId', { userId: user.id }) .leftJoinAndSelect('note.user', 'user'); diff --git a/src/server/api/stream/channels/hybrid-timeline.ts b/src/server/api/stream/channels/hybrid-timeline.ts index 18e6aa8350..a8020bfcfa 100644 --- a/src/server/api/stream/channels/hybrid-timeline.ts +++ b/src/server/api/stream/channels/hybrid-timeline.ts @@ -20,11 +20,11 @@ export default class extends Channel { @autobind private async onNote(note: any) { - // 自分自身の投稿 または その投稿のユーザーをフォローしている または ローカルの投稿 の場合だけ + // 自分自身の投稿 または その投稿のユーザーをフォローしている または 全体公開のローカルの投稿 の場合だけ if (!( this.user!.id === note.userId || this.following.includes(note.userId) || - note.user.host == null + (note.user.host == null && note.visibility === 'public') )) return; if (['followers', 'specified'].includes(note.visibility)) { |