Skip to content

Commit 57bbd47

Browse files
committed
fix
1 parent 4daf740 commit 57bbd47

5 files changed

Lines changed: 18 additions & 16 deletions

File tree

packages/webapp/components/chat/MessageContextMenu.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ export const MessageContextMenu = forwardRef<
147147
? addChannelPinnedMessage(messageData.channel_id, messageData)
148148
: removeChannelPinnedMessage(messageData.channel_id, messageData.id)
149149

150-
await workspaceBroadcaster.send({
151-
type: 'broadcast',
152-
event: 'pinnedMessage',
153-
payload: { message: messageData, actionType }
154-
})
150+
// await workspaceBroadcaster.send({
151+
// type: 'broadcast',
152+
// event: 'pinnedMessage',
153+
// payload: { message: messageData, actionType }
154+
// })
155155
}
156156
}, [messageData])
157157

packages/webapp/components/chat/components/send-message/Editor.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ import StarterKit from '@tiptap/starter-kit'
1717
import Placeholder from '@tiptap/extension-placeholder'
1818
import Mention from '@tiptap/extension-mention'
1919
import suggestion from './suggestion'
20-
import ListItem from '@tiptap/extension-list-item'
2120
// Links and Media
22-
// import previewHyperlinkModal from '@components/TipTap/hyperlinkModals/previewHyperlink'
23-
// import setHyperlinks from '@components/TipTap/hyperlinkModals/setHyperlink'
2421
import {
2522
Hyperlink,
2623
createHyperlinkPopover,
@@ -54,6 +51,7 @@ export const useTiptapEditor = ({ loading }: any) => {
5451
extensions: [
5552
StarterKit.configure({
5653
code: false, // Disable default code to use our custom InlineCode extension
54+
codeBlock: false,
5755
bulletList: {
5856
keepMarks: true,
5957
keepAttributes: false // TODO : Making this as `false` becase marks are not preserved when I try to preserve attrs, awaiting a bit of help
@@ -68,7 +66,6 @@ export const useTiptapEditor = ({ loading }: any) => {
6866
CodeBlockLowlight.configure({
6967
lowlight
7068
}),
71-
ListItem,
7269
Mention.configure({
7370
HTMLAttributes: {
7471
class: 'mention'

packages/webapp/components/chat/components/send-message/SendMessage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ export default function SendMessage() {
219219

220220
// eslint-disable-next-line react-hooks/exhaustive-deps
221221
},
222-
[user, text, html, editor, channelId, loading]
222+
[user, text, html, editor, channelId, loading, setOrUpdateUserPresence]
223223
)
224224

225225
const openEmojiPicker = (clickEvent: any) => {

packages/webapp/hooks/useCatchUserPresences.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,5 +136,5 @@ export const useCatchUserPresences = () => {
136136
return () => {
137137
messageSubscription?.unsubscribe()
138138
}
139-
}, [profile, workspaceId])
139+
}, [profile, workspaceId, setOrUpdateUserPresence])
140140
}

packages/webapp/stores/chat/chatroom.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,16 @@ const getWorkspaceId = (): string => {
3838

3939
const join2Channel = (user: Profile, channelId: string) => {
4040
if (!user) return
41-
useStore.getState().settings?.broadcaster.send({
42-
type: 'broadcast',
43-
event: 'presence',
44-
payload: { ...user, channelId }
45-
})
41+
const broadcaster = useStore.getState().settings?.broadcaster
42+
try {
43+
broadcaster?.send({
44+
type: 'broadcast',
45+
event: 'presence',
46+
payload: { ...user, channelId }
47+
})
48+
} catch (error) {
49+
console.error('Failed to join channel:', error)
50+
}
4651
}
4752

4853
const leaveChannel = (user: Profile): void => {

0 commit comments

Comments
 (0)