diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-03-29 15:23:15 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-03-29 15:23:15 +0900 |
| commit | 31006fbc2570a3bf1f013190750b01f56a67c7b1 (patch) | |
| tree | 80296c243aa597a850213341b40491dd61b1ff0c /src/server/api | |
| parent | Use @type (diff) | |
| download | sharkey-31006fbc2570a3bf1f013190750b01f56a67c7b1.tar.gz sharkey-31006fbc2570a3bf1f013190750b01f56a67c7b1.tar.bz2 sharkey-31006fbc2570a3bf1f013190750b01f56a67c7b1.zip | |
#1253
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/endpoints/posts/create.ts | 5 | ||||
| -rw-r--r-- | src/server/api/models/post.ts | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/server/api/endpoints/posts/create.ts b/src/server/api/endpoints/posts/create.ts index 390370ad42..33042a51a2 100644 --- a/src/server/api/endpoints/posts/create.ts +++ b/src/server/api/endpoints/posts/create.ts @@ -43,8 +43,9 @@ module.exports = (params, user: IUser, app) => new Promise(async (res, rej) => { // Get 'geo' parameter const [geo, geoErr] = $(params.geo).optional.nullable.strict.object() - .have('latitude', $().number().range(-90, 90)) - .have('longitude', $().number().range(-180, 180)) + .have('coordinates', $().array().length(2) + .item(0, $().number().range(-180, 180)) + .item(1, $().number().range(-90, 90))) .have('altitude', $().nullable.number()) .have('accuracy', $().nullable.number()) .have('altitudeAccuracy', $().nullable.number()) diff --git a/src/server/api/models/post.ts b/src/server/api/models/post.ts index 0317cff3fa..1bf4e09051 100644 --- a/src/server/api/models/post.ts +++ b/src/server/api/models/post.ts @@ -35,8 +35,7 @@ export type IPost = { reactionCounts: any; mentions: mongo.ObjectID[]; geo: { - latitude: number; - longitude: number; + coordinates: number[]; altitude: number; accuracy: number; altitudeAccuracy: number; @@ -97,6 +96,7 @@ export const pack = async ( delete _post._id; delete _post.mentions; + if (_post.geo) delete _post.geo.type; // Parse text if (_post.text) { |