Skip to content

Commit eac5aca

Browse files
committed
Remove sendMessage try/catch
1 parent 04abc6e commit eac5aca

File tree

1 file changed

+26
-34
lines changed

1 file changed

+26
-34
lines changed

server/src/methods/sendMessage.ts

+26-34
Original file line numberDiff line numberDiff line change
@@ -109,43 +109,35 @@ export const handler = async (input: Input, context: HandlerContext): Promise<Re
109109

110110
await updateLastMessageId(chatId, newMessageId)
111111

112-
try {
113-
const encodedMessage = encodeMessageInfo(newMessage, {
114-
currentUserId: context.currentUserId,
115-
peerId: peerId,
116-
})
117-
118-
sendMessageUpdate({
119-
message: newMessage,
120-
peerId,
112+
const encodedMessage = encodeMessageInfo(newMessage, {
113+
currentUserId: context.currentUserId,
114+
peerId: peerId,
115+
})
116+
117+
sendMessageUpdate({
118+
message: newMessage,
119+
peerId,
120+
currentUserId: context.currentUserId,
121+
})
122+
123+
const title: string = await db
124+
.select({ firstName: users.firstName, username: users.username })
125+
.from(users)
126+
.where(eq(users.id, context.currentUserId))
127+
.then(([user]) => user?.firstName ?? user?.username ?? "New Message")
128+
129+
if (input.peerUserId) {
130+
sendPushNotificationToUser({
131+
userId: Number(input.peerUserId),
132+
title,
133+
chatId,
134+
message: input.text,
121135
currentUserId: context.currentUserId,
136+
currentUser,
122137
})
123-
124-
const title: string = await db
125-
.select({ firstName: users.firstName, username: users.username })
126-
.from(users)
127-
.where(eq(users.id, context.currentUserId))
128-
.then(([user]) => user?.firstName ?? user?.username ?? "New Message")
129-
130-
if (input.peerUserId) {
131-
sendPushNotificationToUser({
132-
userId: Number(input.peerUserId),
133-
title,
134-
chatId,
135-
message: input.text,
136-
currentUserId: context.currentUserId,
137-
currentUser,
138-
})
139-
}
140-
141-
return { message: encodedMessage }
142-
} catch (encodeError) {
143-
Log.shared.error("Failed to encode message", {
144-
error: encodeError,
145-
message: newMessage,
146-
})
147-
throw new InlineError(InlineError.ApiError.INTERNAL)
148138
}
139+
140+
return { message: encodedMessage }
149141
}
150142

151143
export const getChatIdFromPeer = async (

0 commit comments

Comments
 (0)