Merge branch 'develop'

3 files changed, 6 insertions, 0 deletions

diff --git a/src/server/api/endpoints/hashtags/search.ts b/src/server/api/endpoints/hashtags/search.ts
index 6a9a2df6ef..802f177993 100644
--- a/src/server/api/endpoints/hashtags/search.ts
+++ b/src/server/api/endpoints/hashtags/search.ts
@@ -48,6 +48,7 @@ export default define(meta, async (ps) => {
 	const hashtags = await Hashtags.createQueryBuilder('tag')
 		.where('tag.name like :q', { q: ps.query.toLowerCase() + '%' })
 		.orderBy('tag.count', 'DESC')
+		.groupBy('tag.id')
 		.take(ps.limit!)
 		.skip(ps.offset)
 		.getMany();
diff --git a/src/server/api/endpoints/sw/register.ts b/src/server/api/endpoints/sw/register.ts
index cb0572aa90..79bc18bf21 100644
--- a/src/server/api/endpoints/sw/register.ts
+++ b/src/server/api/endpoints/sw/register.ts
@@ -27,6 +27,7 @@ export const meta = {
 export default define(meta, async (ps, user) => {
 	// if already subscribed
 	const exist = await SwSubscriptions.findOne({
+		createdAt: new Date(),
 		userId: user.id,
 		endpoint: ps.endpoint,
 		auth: ps.auth,
diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts
index 2be193f89b..46dc7341e6 100644
--- a/src/server/api/endpoints/users/show.ts
+++ b/src/server/api/endpoints/users/show.ts
@@ -65,6 +65,10 @@ export default define(meta, async (ps, me) => {
 	let user;
 
 	if (ps.userIds) {
+		if (ps.userIds.length === 0) {
+			return [];
+		}
+
 		const users = await Users.find({
 			id: In(ps.userIds)
 		});