summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/users/groups/joined.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-05-19 20:41:23 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-05-19 20:41:23 +0900
commite103904a0454d8a05cea60d984bc1ef1e2b9e652 (patch)
tree0f6f48594bd027abb5653cab4c4ec4d1a3143f1d /src/server/api/endpoints/users/groups/joined.ts
parentUpdate README.md [AUTOGEN] (#4940) (diff)
downloadsharkey-e103904a0454d8a05cea60d984bc1ef1e2b9e652.tar.gz
sharkey-e103904a0454d8a05cea60d984bc1ef1e2b9e652.tar.bz2
sharkey-e103904a0454d8a05cea60d984bc1ef1e2b9e652.zip
Resolve #4941
Diffstat (limited to 'src/server/api/endpoints/users/groups/joined.ts')
-rw-r--r--src/server/api/endpoints/users/groups/joined.ts6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/api/endpoints/users/groups/joined.ts b/src/server/api/endpoints/users/groups/joined.ts
index 14561fce05..853a2510de 100644
--- a/src/server/api/endpoints/users/groups/joined.ts
+++ b/src/server/api/endpoints/users/groups/joined.ts
@@ -1,6 +1,7 @@
import define from '../../../define';
import { UserGroups, UserGroupJoinings } from '../../../../../models';
import { types, bool } from '../../../../../misc/schema';
+import { Not, In } from 'typeorm';
export const meta = {
desc: {
@@ -25,8 +26,13 @@ export const meta = {
};
export default define(meta, async (ps, me) => {
+ const ownedGroups = await UserGroups.find({
+ userId: me.id,
+ });
+
const joinings = await UserGroupJoinings.find({
userId: me.id,
+ userGroupId: Not(In(ownedGroups.map(x => x.id)))
});
return await Promise.all(joinings.map(x => UserGroups.pack(x.userGroupId)));