From 4a9fc0c8ed27c261a49223fc0598acec384d33d9 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 15 Aug 2018 02:08:18 +0900
Subject: [PATCH] Better query
---
src/server/activitypub/outbox.ts | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/server/activitypub/outbox.ts b/src/server/activitypub/outbox.ts
index e441e3dc4e..91473b77e3 100644
--- a/src/server/activitypub/outbox.ts
+++ b/src/server/activitypub/outbox.ts
@@ -51,8 +51,15 @@ export default async (ctx: Koa.Context) => {
const query = {
userId: user._id,
- $or: [ { visibility: 'public' }, { visibility: 'home' } ],
- text: { $ne: null } // exclude renote, but include quote
+ $and: [{
+ $or: [ { visibility: 'public' }, { visibility: 'home' } ]
+ }, { // exclude renote, but include quote
+ $or: [{
+ text: { $ne: null }
+ }, {
+ mediaIds: { $ne: [] }
+ }]
+ }]
} as any;
if (sinceId) {