graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-23 20:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

[API] Fix bug

Browse source
This commit is contained in:
syuilo 2017-03-03 20:28:42 +09:00
parent 66eed481ea
commit 3a58cff9b2
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/api/endpoints/app/show.ts
View file

@ -57,12 +57,12 @@ module.exports = (params, user, _, isSecure) =>
const [nameId, nameIdErr] = it(params.name_id, 'string');
if (nameIdErr) return rej('invalid name_id param');
if (appId === null && nameId === null) {
if (appId === undefined && nameId === undefined) {
return rej('app_id or name_id is required');
}
// Lookup app
const app = appId !== null
const app = appId !== undefined
? await App.findOne({ _id: appId })
: await App.findOne({ name_id_lower: nameId.toLowerCase() });

8
src/api/endpoints/posts/create.ts
View file

@ -35,7 +35,7 @@ module.exports = (params, user, app) =>
if (mediaIdsErr) return rej('invalid media_ids');
let files = [];
if (mediaIds !== null) {
if (mediaIds !== undefined) {
// Fetch files
// forEach だと途中でエラーなどがあっても return できないので
// 敢えて for を使っています。
@ -67,7 +67,7 @@ module.exports = (params, user, app) =>
if (repostIdErr) return rej('invalid repost_id');
let repost = null;
if (repostId !== null) {
if (repostId !== undefined) {
// Fetch repost to post
repost = await Post.findOne({
_id: repostId
@ -109,7 +109,7 @@ module.exports = (params, user, app) =>
if (inReplyToPostIdErr) return rej('invalid in_reply_to_post_id');
let inReplyToPost = null;
if (inReplyToPostId !== null) {
if (inReplyToPostId !== undefined) {
// Fetch reply
inReplyToPost = await Post.findOne({
_id: inReplyToPostId
@ -130,7 +130,7 @@ module.exports = (params, user, app) =>
if (pollErr) return rej('invalid poll');
let poll = null;
if (_poll !== null) {
if (_poll !== undefined) {
const [pollChoices, pollChoicesErr] =
it(params.poll).expect.array()
.unique()

4
src/api/endpoints/users/posts.ts
View file

@ -26,7 +26,7 @@ module.exports = (params, me) =>
const [username, usernameErr] = it(params.username, 'string');
if (usernameErr) return rej('invalid username param');
if (userId === null && username === null) {
if (userId === undefined && username === undefined) {
return rej('user_id or username is required');
}
@ -55,7 +55,7 @@ module.exports = (params, me) =>
return rej('cannot set since_id and max_id');
}
const q = userId != null
const q = userId !== undefined
? { _id: userId }
: { username_lower: username.toLowerCase() } ;

6
src/api/endpoints/users/show.ts
View file

@ -25,13 +25,13 @@ module.exports = (params, me) =>
const [username, usernameErr] = it(params.username, 'string');
if (usernameErr) return rej('invalid username param');
if (userId === null && username === null) {
if (userId === undefined && username === undefined) {
return rej('user_id or username is required');
}
const q = userId != null
const q = userId !== undefined
? { _id: userId }
: { username_lower: username.toLowerCase() } ;
: { username_lower: username.toLowerCase() };
// Lookup user
const user = await User.findOne(q, {