summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-08-02 10:05:41 +0900
committerGitHub <noreply@github.com>2018-08-02 10:05:41 +0900
commit3fa8433a0e0943a8c6320d3e7cda0f705b2dd25a (patch)
tree1701e9e2627622ab2280ba9acf61247758b3e562 /src/server/api/endpoints
parentNew translations ja.yml (Catalan) (diff)
parent:v: (diff)
downloadmisskey-3fa8433a0e0943a8c6320d3e7cda0f705b2dd25a.tar.gz
misskey-3fa8433a0e0943a8c6320d3e7cda0f705b2dd25a.tar.bz2
misskey-3fa8433a0e0943a8c6320d3e7cda0f705b2dd25a.zip
Merge branch 'master' into l10n_master
Diffstat (limited to 'src/server/api/endpoints')
-rw-r--r--src/server/api/endpoints/i/notifications.ts13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts
index b6865fba52..46242b9d9f 100644
--- a/src/server/api/endpoints/i/notifications.ts
+++ b/src/server/api/endpoints/i/notifications.ts
@@ -19,10 +19,6 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
const [markAsRead = true, markAsReadErr] = $.bool.optional.get(params.markAsRead);
if (markAsReadErr) return rej('invalid markAsRead param');
- // Get 'type' parameter
- const [type, typeErr] = $.arr($.str).optional.unique().get(params.type);
- if (typeErr) return rej('invalid type param');
-
// Get 'limit' parameter
const [limit = 10, limitErr] = $.num.optional.range(1, 100).get(params.limit);
if (limitErr) return rej('invalid limit param');
@@ -41,8 +37,7 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
}
const mute = await Mute.find({
- muterId: user._id,
- deletedAt: { $exists: false }
+ muterId: user._id
});
const query = {
@@ -69,12 +64,6 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
});
}
- if (type) {
- query.type = {
- $in: type
- };
- }
-
if (sinceId) {
sort._id = 1;
query._id = {