fix: Mentions do not show any options in public collections (#5150)

* Mentions do not show any options in public collections

* Avoid reset data while loading
This commit is contained in:
Tom Moor
2023-04-03 21:05:22 -04:00
committed by GitHub
parent 5421f92a9f
commit 4a99f9f386
3 changed files with 50 additions and 61 deletions

View File

@@ -452,20 +452,28 @@ router.post(
let users: User[] = [];
let total = 0;
let where: WhereOptions<User> = {
teamId: document.teamId,
suspendedAt: {
[Op.is]: null,
},
};
if (document.collectionId) {
const memberIds = await Collection.membershipUserIds(
document.collectionId
);
const collection = await document.$get("collection");
if (!collection?.permission) {
const memberIds = await Collection.membershipUserIds(
document.collectionId
);
where = {
...where,
id: {
[Op.in]: memberIds,
},
};
}
let where: WhereOptions<User> = {
id: {
[Op.in]: memberIds,
},
suspendedAt: {
[Op.is]: null,
},
};
if (query) {
where = {
...where,