summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorこぴなたみぽ <syuilotan@yahoo.co.jp>2017-12-22 04:50:50 +0900
committerこぴなたみぽ <syuilotan@yahoo.co.jp>2017-12-22 04:50:50 +0900
commit8fd78aebbf01755ffdecb9aa17dff1f842b194ff (patch)
tree5792e2f6f4dba5f719c0ef44e8f7cfacee518b61 /src
parentFix bug (diff)
downloadsharkey-8fd78aebbf01755ffdecb9aa17dff1f842b194ff.tar.gz
sharkey-8fd78aebbf01755ffdecb9aa17dff1f842b194ff.tar.bz2
sharkey-8fd78aebbf01755ffdecb9aa17dff1f842b194ff.zip
wip
Diffstat (limited to 'src')
-rw-r--r--src/api/endpoints/posts/timeline.ts12
-rw-r--r--src/api/models/mute.ts3
2 files changed, 14 insertions, 1 deletions
diff --git a/src/api/endpoints/posts/timeline.ts b/src/api/endpoints/posts/timeline.ts
index 91cba0a047..6cc7825e64 100644
--- a/src/api/endpoints/posts/timeline.ts
+++ b/src/api/endpoints/posts/timeline.ts
@@ -77,7 +77,17 @@ module.exports = async (params, user, app) => {
channel_id: {
$in: watchingChannelIds
}
- }]
+ }],
+ // mute
+ user_id: {
+ $nin: mutes
+ },
+ '_reply.user_id': {
+ $nin: mutes
+ },
+ '_repost.user_id': {
+ $nin: mutes
+ },
} as any;
if (sinceId) {
diff --git a/src/api/models/mute.ts b/src/api/models/mute.ts
new file mode 100644
index 0000000000..16018b82f7
--- /dev/null
+++ b/src/api/models/mute.ts
@@ -0,0 +1,3 @@
+import db from '../../db/mongodb';
+
+export default db.get('mute') as any; // fuck type definition