SWREI/switched
0
0
Fork 0
Code

#1021

Browse Source
This commit is contained in:
syuilo 2017-12-21 02:20:02 +09:00
parent fb09710b62
commit c378e5fc94
24 changed files with 135 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/endpoints/channels.ts
View File

@ -21,13 +21,13 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) return rej('invalid max_id param');
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) return rej('invalid until_id param');
// Check if both of since_id and max_id is specified
if (sinceId && maxId) {
return rej('cannot set since_id and max_id');
// Check if both of since_id and until_id is specified
if (sinceId && untilId) {
return rej('cannot set since_id and until_id');
}
// Construct query
@ -40,9 +40,9 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
}

16
src/api/endpoints/channels/posts.ts
View File

@ -22,13 +22,13 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) return rej('invalid max_id param');
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) return rej('invalid until_id param');
// Check if both of since_id and max_id is specified
if (sinceId && maxId) {
return rej('cannot set since_id and max_id');
// Check if both of since_id and until_id is specified
if (sinceId && untilId) {
return rej('cannot set since_id and until_id');
}
// Get 'channel_id' parameter
@ -58,9 +58,9 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
}
//#endregion Construct query

16
src/api/endpoints/drive/files.ts
View File

@ -22,13 +22,13 @@ module.exports = async (params, user, app) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) throw 'invalid since_id param';
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) throw 'invalid max_id param';
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) throw 'invalid until_id param';
// Check if both of since_id and max_id is specified
if (sinceId && maxId) {
throw 'cannot set since_id and max_id';
// Check if both of since_id and until_id is specified
if (sinceId && untilId) {
throw 'cannot set since_id and until_id';
}
// Get 'folder_id' parameter
@ -52,9 +52,9 @@ module.exports = async (params, user, app) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
}
if (type) {

16
src/api/endpoints/drive/folders.ts
View File

@ -22,13 +22,13 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) return rej('invalid max_id param');
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) return rej('invalid until_id param');
// Check if both of since_id and max_id is specified
if (sinceId && maxId) {
return rej('cannot set since_id and max_id');
// Check if both of since_id and until_id is specified
if (sinceId && untilId) {
return rej('cannot set since_id and until_id');
}
// Get 'folder_id' parameter
@ -48,9 +48,9 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
}

16
src/api/endpoints/drive/stream.ts
View File

@ -21,13 +21,13 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) return rej('invalid max_id param');
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) return rej('invalid until_id param');
// Check if both of since_id and max_id is specified
if (sinceId && maxId) {
return rej('cannot set since_id and max_id');
// Check if both of since_id and until_id is specified
if (sinceId && untilId) {
return rej('cannot set since_id and until_id');
}
// Get 'type' parameter
@ -46,9 +46,9 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
}
if (type) {

16
src/api/endpoints/i/notifications.ts
View File

@ -36,13 +36,13 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) return rej('invalid max_id param');
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) return rej('invalid until_id param');
// Check if both of since_id and max_id is specified
if (sinceId && maxId) {
return rej('cannot set since_id and max_id');
// Check if both of since_id and until_id is specified
if (sinceId && untilId) {
return rej('cannot set since_id and until_id');
}
const query = {
@ -73,9 +73,9 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
}

16
src/api/endpoints/i/signin_history.ts
View File

@ -21,13 +21,13 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) return rej('invalid max_id param');
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) return rej('invalid until_id param');
// Check if both of since_id and max_id is specified
if (sinceId && maxId) {
return rej('cannot set since_id and max_id');
// Check if both of since_id and until_id is specified
if (sinceId && untilId) {
return rej('cannot set since_id and until_id');
}
const query = {
@ -43,9 +43,9 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
}

16
src/api/endpoints/messaging/messages.ts
View File

@ -44,13 +44,13 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) return rej('invalid max_id param');
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) return rej('invalid until_id param');
// Check if both of since_id and max_id is specified
if (sinceId && maxId) {
return rej('cannot set since_id and max_id');
// Check if both of since_id and until_id is specified
if (sinceId && untilId) {
return rej('cannot set since_id and until_id');
}
const query = {
@ -72,9 +72,9 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
}

16
src/api/endpoints/posts.ts
View File

@ -36,13 +36,13 @@ module.exports = (params) => new Promise(async (res, rej) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) return rej('invalid max_id param');
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) return rej('invalid until_id param');
// Check if both of since_id and max_id is specified
if (sinceId && maxId) {
return rej('cannot set since_id and max_id');
// Check if both of since_id and until_id is specified
if (sinceId && untilId) {
return rej('cannot set since_id and until_id');
}
// Construct query
@ -55,9 +55,9 @@ module.exports = (params) => new Promise(async (res, rej) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
}

16
src/api/endpoints/posts/mentions.ts
View File

@ -27,13 +27,13 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) return rej('invalid max_id param');
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) return rej('invalid until_id param');
// Check if both of since_id and max_id is specified
if (sinceId && maxId) {
return rej('cannot set since_id and max_id');
// Check if both of since_id and until_id is specified
if (sinceId && untilId) {
return rej('cannot set since_id and until_id');
}
// Construct query
@ -58,9 +58,9 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
}

16
src/api/endpoints/posts/reposts.ts
View File

@ -25,13 +25,13 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) return rej('invalid max_id param');
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) return rej('invalid until_id param');
// Check if both of since_id and max_id is specified
if (sinceId && maxId) {
return rej('cannot set since_id and max_id');
// Check if both of since_id and until_id is specified
if (sinceId && untilId) {
return rej('cannot set since_id and until_id');
}
// Lookup post
@ -55,9 +55,9 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
}

26
src/api/endpoints/posts/timeline.ts
View File

@ -25,21 +25,21 @@ module.exports = async (params, user, app) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) throw 'invalid since_id param';
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) throw 'invalid max_id param';
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) throw 'invalid until_id param';
// Get 'since_date' parameter
const [sinceDate, sinceDateErr] = $(params.since_date).optional.number().$;
if (sinceDateErr) throw 'invalid since_date param';
// Get 'max_date' parameter
const [maxDate, maxDateErr] = $(params.max_date).optional.number().$;
if (maxDateErr) throw 'invalid max_date param';
// Get 'until_date' parameter
const [untilDate, untilDateErr] = $(params.until_date).optional.number().$;
if (untilDateErr) throw 'invalid until_date param';
// Check if only one of since_id, max_id, since_date, max_date specified
if ([sinceId, maxId, sinceDate, maxDate].filter(x => x != null).length > 1) {
throw 'only one of since_id, max_id, since_date, max_date can be specified';
// Check if only one of since_id, until_id, since_date, until_date specified
if ([sinceId, untilId, sinceDate, untilDate].filter(x => x != null).length > 1) {
throw 'only one of since_id, until_id, since_date, until_date can be specified';
}
const { followingIds, watchingChannelIds } = await rap({
@ -85,18 +85,18 @@ module.exports = async (params, user, app) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
} else if (sinceDate) {
sort._id = 1;
query.created_at = {
$gt: new Date(sinceDate)
};
} else if (maxDate) {
} else if (untilDate) {
query.created_at = {
$lt: new Date(maxDate)
$lt: new Date(untilDate)
};
}
//#endregion

16
src/api/endpoints/users.ts
View File

@ -21,13 +21,13 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) return rej('invalid max_id param');
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) return rej('invalid until_id param');
// Check if both of since_id and max_id is specified
if (sinceId && maxId) {
return rej('cannot set since_id and max_id');
// Check if both of since_id and until_id is specified
if (sinceId && untilId) {
return rej('cannot set since_id and until_id');
}
// Construct query
@ -40,9 +40,9 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
}

26
src/api/endpoints/users/posts.ts
View File

@ -42,21 +42,21 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
if (maxIdErr) return rej('invalid max_id param');
// Get 'until_id' parameter
const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
if (untilIdErr) return rej('invalid until_id param');
// Get 'since_date' parameter
const [sinceDate, sinceDateErr] = $(params.since_date).optional.number().$;
if (sinceDateErr) throw 'invalid since_date param';
// Get 'max_date' parameter
const [maxDate, maxDateErr] = $(params.max_date).optional.number().$;
if (maxDateErr) throw 'invalid max_date param';
// Get 'until_date' parameter
const [untilDate, untilDateErr] = $(params.until_date).optional.number().$;
if (untilDateErr) throw 'invalid until_date param';
// Check if only one of since_id, max_id, since_date, max_date specified
if ([sinceId, maxId, sinceDate, maxDate].filter(x => x != null).length > 1) {
throw 'only one of since_id, max_id, since_date, max_date can be specified';
// Check if only one of since_id, until_id, since_date, until_date specified
if ([sinceId, untilId, sinceDate, untilDate].filter(x => x != null).length > 1) {
throw 'only one of since_id, until_id, since_date, until_date can be specified';
}
const q = userId !== undefined
@ -88,18 +88,18 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
query._id = {
$gt: sinceId
};
} else if (maxId) {
} else if (untilId) {
query._id = {
$lt: maxId
$lt: untilId
};
} else if (sinceDate) {
sort._id = 1;
query.created_at = {
$gt: new Date(sinceDate)
};
} else if (maxDate) {
} else if (untilDate) {
query.created_at = {
$lt: new Date(maxDate)
$lt: new Date(untilDate)
};
}

2
src/web/app/common/tags/messaging/room.tag
View File

@ -254,7 +254,7 @@
this.api('messaging/messages', {
user_id: this.user.id,
limit: max + 1,
max_id: this.moreMessagesIsInStock ? this.messages[0].id : undefined
until_id: this.moreMessagesIsInStock ? this.messages[0].id : undefined
}).then(messages => {
if (messages.length == max + 1) {
this.moreMessagesIsInStock = true;

2
src/web/app/desktop/tags/home-widgets/mentions.tag
View File

@ -101,7 +101,7 @@
});
this.api('posts/mentions', {
following: this.mode == 'following',
max_id: this.refs.timeline.tail().id
until_id: this.refs.timeline.tail().id
}).then(posts => {
this.update({
moreLoading: false

4
src/web/app/desktop/tags/home-widgets/timeline.tag
View File

@ -86,7 +86,7 @@
});
this.api('posts/timeline', {
max_date: this.date ? this.date.getTime() : undefined
until_date: this.date ? this.date.getTime() : undefined
}).then(posts => {
this.update({
isLoading: false,
@ -103,7 +103,7 @@
moreLoading: true
});
this.api('posts/timeline', {
max_id: this.refs.timeline.tail().id
until_id: this.refs.timeline.tail().id
}).then(posts => {
this.update({
moreLoading: false

2
src/web/app/desktop/tags/notifications.tag
View File

@ -283,7 +283,7 @@
this.api('i/notifications', {
limit: max + 1,
max_id: this.notifications[this.notifications.length - 1].id
until_id: this.notifications[this.notifications.length - 1].id
}).then(notifications => {
if (notifications.length == max + 1) {
this.moreNotifications = true;

4
src/web/app/desktop/tags/user-timeline.tag
View File

@ -96,7 +96,7 @@
this.fetch = cb => {
this.api('users/posts', {
user_id: this.user.id,
max_date: this.date ? this.date.getTime() : undefined,
until_date: this.date ? this.date.getTime() : undefined,
with_replies: this.mode == 'with-replies'
}).then(posts => {
this.update({
@ -116,7 +116,7 @@
this.api('users/posts', {
user_id: this.user.id,
with_replies: this.mode == 'with-replies',
max_id: this.refs.timeline.tail().id
until_id: this.refs.timeline.tail().id
}).then(posts => {
this.update({
moreLoading: false

2
src/web/app/mobile/tags/drive.tag
View File

@ -430,7 +430,7 @@
this.api('drive/files', {
folder_id: this.folder ? this.folder.id : null,
limit: max + 1,
max_id: this.files[this.files.length - 1].id
until_id: this.files[this.files.length - 1].id
}).then(files => {
if (files.length == max + 1) {
this.moreFiles = true;

2
src/web/app/mobile/tags/home-timeline.tag
View File

@ -47,7 +47,7 @@
this.more = () => {
return this.api('posts/timeline', {
max_id: this.refs.timeline.tail().id
until_id: this.refs.timeline.tail().id
});
};

2
src/web/app/mobile/tags/notifications.tag
View File

@ -146,7 +146,7 @@
this.api('i/notifications', {
limit: max + 1,
max_id: this.notifications[this.notifications.length - 1].id
until_id: this.notifications[this.notifications.length - 1].id
}).then(notifications => {
if (notifications.length == max + 1) {
this.moreNotifications = true;

2
src/web/app/mobile/tags/user-timeline.tag
View File

@ -26,7 +26,7 @@
return this.api('users/posts', {
user_id: this.user.id,
with_media: this.withMedia,
max_id: this.refs.timeline.tail().id
until_id: this.refs.timeline.tail().id
});
};
</script>

4
src/web/docs/api/endpoints/posts/timeline.yaml
View File

@ -15,7 +15,7 @@ params:
optional: true
desc:
ja: "指定すると、この投稿を基点としてより新しい投稿を取得します"
- name: "max_id"
- name: "until_id"
type: "id(Post)"
optional: true
desc:
@ -25,7 +25,7 @@ params:
optional: true
desc:
ja: "指定した時間を基点としてより新しい投稿を取得します。数値は、1970 年 1 月 1 日 00:00:00 UTC から指定した日時までの経過時間をミリ秒単位で表します。"
- name: "max_date"
- name: "until_date"
type: "number"
optional: true
desc: