Skip to content

Commit df70860

Browse files
committed
typecheck + remove ui deps from queue
1 parent 4cb49db commit df70860

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

apps/web/ui/ChannelView/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,6 @@ export default function ChannelView({
867867
updateThread={updateThread}
868868
token={token}
869869
pathCursor={pathCursor}
870-
startSignUp={startSignUp}
871870
activeUsers={[]}
872871
/>
873872
)}

packages/queue/src/tasks/email-notification/handleNotificationEmailTask.ts

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ import NotificationMailer from '@linen/web/mailers/NotificationMailer';
22
import { getCommunityUrl } from '@linen/serializers/settings';
33
import { getLinenUrl } from '@linen/utilities/domain';
44
import { appendProtocol } from '@linen/utilities/url';
5-
import React from 'react';
6-
import * as ReactDOMServer from 'react-dom/server';
7-
import Message from '@linen/ui/Message';
8-
import { emailNotificationPayloadType, MessageFormat } from '@linen/types';
9-
import { serializeUser } from '@linen/serializers/user';
5+
import { emailNotificationPayloadType } from '@linen/types';
106
import { format as formatDate } from '@linen/utilities/date';
117
import { prisma } from '@linen/database';
128

@@ -134,15 +130,11 @@ async function sendEmailNotification(
134130

135131
// build links and notify
136132
const links = threads.map((t) => {
137-
const text = ReactDOMServer.renderToStaticMarkup(
138-
React.createElement(Message, {
139-
text: t.body.length > 200 ? t.body.substring(0, 200) + '...' : t.body,
140-
mentions: t.mentions
141-
.filter((u) => u.users)
142-
.map((u) => serializeUser(u.users!)),
143-
format: MessageFormat.LINEN,
144-
})
145-
);
133+
const text = t.mentions.reduce((prev, curr) => {
134+
return curr.users?.id
135+
? prev.split(curr.users?.id).join(curr.users?.displayName || 'user')
136+
: prev;
137+
}, t.body);
146138
return {
147139
date: formatDate(new Date(t.sentAt).toISOString(), 'PPpp'),
148140
text,

0 commit comments

Comments
 (0)