Merge branch 'develop'

3 files changed, 6 insertions, 4 deletions

diff --git a/packages/backend/src/server/api/api-handler.ts b/packages/backend/src/server/api/api-handler.ts
index 34ff970b4c..ec71ddd2c0 100644
--- a/packages/backend/src/server/api/api-handler.ts
+++ b/packages/backend/src/server/api/api-handler.ts
@@ -68,11 +68,11 @@ export default (endpoint: IEndpoint, ctx: Koa.Context) => new Promise<void>((res
 					}
 
 					try {
-						UserIps.insert({
+						UserIps.createQueryBuilder().insert().values({
 							createdAt: new Date(),
 							userId: user.id,
 							ip: ip,
-						});
+						}).orIgnore(true).execute();
 					} catch {
 					}
 				}
diff --git a/packages/backend/src/server/api/common/read-notification.ts b/packages/backend/src/server/api/common/read-notification.ts
index 17dd8e6f02..cf993ade3e 100644
--- a/packages/backend/src/server/api/common/read-notification.ts
+++ b/packages/backend/src/server/api/common/read-notification.ts
@@ -12,13 +12,15 @@ export async function readNotification(
 	if (notificationIds.length === 0) return;
 
 	// Update documents
-	await Notifications.update({
+	const result = await Notifications.update({
 		id: In(notificationIds),
 		isRead: false,
 	}, {
 		isRead: true,
 	});
 
+	if (result.affected === 0) return;
+
 	if (!await Users.getHasUnreadNotification(userId)) return postReadAllNotifications(userId);
 	else return postReadNotifications(userId, notificationIds);
 }
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index 122120f275..3c2f1cea0d 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -214,7 +214,7 @@ export default define(meta, paramDef, async (ps, _user, token) => {
 	const newDescription = profileUpdates.description === undefined ? profile.description : profileUpdates.description;
 
 	if (newName != null) {
-		const tokens = mfm.parsePlain(newName);
+		const tokens = mfm.parseSimple(newName);
 		emojis = emojis.concat(extractCustomEmojisFromMfm(tokens!));
 	}