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

✌️

Browse source
This commit is contained in:
こぴなたみぽ 2017-12-21 07:57:31 +09:00
parent b2223c19e1
commit aff76a57c0
3 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/api/endpoints/posts/search.ts
View file

@ -46,6 +46,10 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
const [media = null, mediaErr] = $(params.media).optional.nullable.boolean().$;
if (mediaErr) return rej('invalid media param');
// Get 'poll' parameter
const [poll = null, pollErr] = $(params.poll).optional.nullable.boolean().$;
if (pollErr) return rej('invalid poll param');
// Get 'since_date' parameter
const [sinceDate, sinceDateErr] = $(params.since_date).optional.number().$;
if (sinceDateErr) throw 'invalid since_date param';
@ -76,11 +80,11 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
// If Elasticsearch is available, search by it
// If not, search by MongoDB
(config.elasticsearch.enable ? byElasticsearch : byNative)
(res, rej, me, text, user, following, reply, repost, media, sinceDate, untilDate, offset, limit);
(res, rej, me, text, user, following, reply, repost, media, poll, sinceDate, untilDate, offset, limit);
});
// Search by MongoDB
async function byNative(res, rej, me, text, userId, following, reply, repost, media, sinceDate, untilDate, offset, max) {
async function byNative(res, rej, me, text, userId, following, reply, repost, media, poll, sinceDate, untilDate, offset, max) {
const q: any = {
$and: []
};
@ -175,6 +179,27 @@ async function byNative(res, rej, me, text, userId, following, reply, repost, me
}
}
if (poll != null) {
if (poll) {
push({
poll: {
$exists: true,
$ne: null
}
});
} else {
push({
$or: [{
poll: {
$exists: false
}
}, {
poll: null
}]
});
}
}
if (sinceDate) {
push({
created_at: {
@ -207,7 +232,7 @@ async function byNative(res, rej, me, text, userId, following, reply, repost, me
}
// Search by Elasticsearch
async function byElasticsearch(res, rej, me, text, userId, following, reply, repost, media, sinceDate, untilDate, offset, max) {
async function byElasticsearch(res, rej, me, text, userId, following, reply, repost, media, poll, sinceDate, untilDate, offset, max) {
const es = require('../../db/elasticsearch');
es.search({

3
src/web/app/common/scripts/parse-search-query.ts
View file

@ -22,6 +22,9 @@ export default function(qs: string) {
case 'media':
q['media'] = value == 'null' ? null : value == 'true';
break;
case 'poll':
q['poll'] = value == 'null' ? null : value == 'true';
break;
case 'until':
case 'since':
// YYYY-MM-DD

8
src/web/docs/search.ja.pug
View file

@ -53,6 +53,14 @@ section
| false ... メディアが添付されていない投稿に限定。
br
| null ... 特に限定しない(デフォルト)
tr
td poll
td
| true ... 投票が添付されている投稿に限定。
br
| false ... 投票が添付されていない投稿に限定。
br
| null ... 特に限定しない(デフォルト)
tr
td until
td 上限の日時。(YYYY-MM-DD)