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

[API] Fix bug

Browse source
This commit is contained in:
syuilo 2017-02-23 23:39:58 +09:00
parent d3148590f0
commit 8ed05b7539
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/api/endpoints/posts/create.js
View file

@ -39,6 +39,9 @@ module.exports = (params, user, app) =>
// Get 'text' parameter // Get 'text' parameter
let text = params.text; let text = params.text;
if (text !== undefined && text !== null) { if (text !== undefined && text !== null) {
if (typeof text != 'string') {
return rej('text is must be a string');
}
text = text.trim(); text = text.trim();
if (text.length == 0) { if (text.length == 0) {
text = null; text = null;
@ -50,31 +53,39 @@ module.exports = (params, user, app) =>
} }
// Get 'media_ids' parameter // Get 'media_ids' parameter
let media = params.media_ids; let medias = params.media_ids;
let files = []; let files = [];
if (media !== undefined && media !== null) { if (medias !== undefined && medias !== null) {
if (media.length > maxMediaCount) { if (!Array.isArray(medias)) {
return rej('media_ids is must be an array');
}
if (medias.length > maxMediaCount) {
return rej('too many media'); return rej('too many media');
} }
// Drop duplicates // Drop duplicates
media = media.filter((x, i, s) => s.indexOf(x) == i); medias = medias.filter((x, i, s) => s.indexOf(x) == i);
// Fetch files // Fetch files
// forEach だと途中でエラーなどがあっても return できないので // forEach だと途中でエラーなどがあっても return できないので
// 敢えて for を使っています。 // 敢えて for を使っています。
for (let i = 0; i < media.length; i++) { for (let i = 0; i < medias.length; i++) {
const image = media[i]; const media = medias[i];
if (typeof media != 'string') {
return rej('media id is must be a string');
}
// Validate id // Validate id
if (!mongo.ObjectID.isValid(image)) { if (!mongo.ObjectID.isValid(media)) {
return rej('incorrect media id'); return rej('incorrect media id');
} }
// Fetch file // Fetch file
// SELECT _id // SELECT _id
const entity = await DriveFile.findOne({ const entity = await DriveFile.findOne({
_id: new mongo.ObjectID(image), _id: new mongo.ObjectID(media),
user_id: user._id user_id: user._id
}, { }, {
_id: true _id: true
@ -93,6 +104,10 @@ module.exports = (params, user, app) =>
// Get 'repost_id' parameter // Get 'repost_id' parameter
let repost = params.repost_id; let repost = params.repost_id;
if (repost !== undefined && repost !== null) { if (repost !== undefined && repost !== null) {
if (typeof repost != 'string') {
return rej('repost_id is must be a string');
}
// Validate id // Validate id
if (!mongo.ObjectID.isValid(repost)) { if (!mongo.ObjectID.isValid(repost)) {
return rej('incorrect repost_id'); return rej('incorrect repost_id');
@ -139,6 +154,10 @@ module.exports = (params, user, app) =>
// Get 'reply_to_id' parameter // Get 'reply_to_id' parameter
let replyTo = params.reply_to_id; let replyTo = params.reply_to_id;
if (replyTo !== undefined && replyTo !== null) { if (replyTo !== undefined && replyTo !== null) {
if (typeof replyTo != 'string') {
return rej('reply_to_id is must be a string');
}
// Validate id // Validate id
if (!mongo.ObjectID.isValid(replyTo)) { if (!mongo.ObjectID.isValid(replyTo)) {
return rej('incorrect reply_to_id'); return rej('incorrect reply_to_id');