refac
This commit is contained in:
1 parent
2c804b0ac4
commit
7ea7680f56
4 files changed
+69
-31
No files matched your search
@@ -1365,19 +1365,37 @@ async def pin_channel_message(
|
|||||||
await Messages.update_is_pinned_by_id(message_id, form_data.is_pinned, user.id, db=db)
|
await Messages.update_is_pinned_by_id(message_id, form_data.is_pinned, user.id, db=db)
|
||||||
message = await Messages.get_message_by_id(message_id, db=db)
|
message = await Messages.get_message_by_id(message_id, db=db)
|
||||||
message_user = await Users.get_user_by_id(message.user_id, db=db)
|
message_user = await Users.get_user_by_id(message.user_id, db=db)
|
||||||
await publish_event(
|
message_data = MessageUserResponse(
|
||||||
request,
|
|
||||||
EVENTS.MESSAGE_PINNED if form_data.is_pinned else EVENTS.MESSAGE_UNPINNED,
|
|
||||||
actor=user,
|
|
||||||
subject_id=message_id, subject_type='message',
|
|
||||||
data={'channel_id': id},
|
|
||||||
)
|
|
||||||
return MessageUserResponse(
|
|
||||||
**{
|
**{
|
||||||
**message.model_dump(),
|
**message.model_dump(),
|
||||||
'user': UserNameResponse(**message_user.model_dump()) if message_user else None,
|
'user': UserNameResponse(**message_user.model_dump()) if message_user else None,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
await sio.emit(
|
||||||
|
'events:channel',
|
||||||
|
{
|
||||||
|
'channel_id': channel.id,
|
||||||
|
'message_id': message.id,
|
||||||
|
'data': {
|
||||||
|
'type': 'message:update',
|
||||||
|
'data': message_data.model_dump(),
|
||||||
|
},
|
||||||
|
'user': UserNameResponse(**user.model_dump()).model_dump(),
|
||||||
|
'channel': channel.model_dump(),
|
||||||
|
},
|
||||||
|
to=f'channel:{channel.id}',
|
||||||
|
)
|
||||||
|
|
||||||
|
await publish_event(
|
||||||
|
request,
|
||||||
|
EVENTS.MESSAGE_PINNED if form_data.is_pinned else EVENTS.MESSAGE_UNPINNED,
|
||||||
|
actor=user,
|
||||||
|
subject_id=message_id,
|
||||||
|
subject_type='message',
|
||||||
|
data={'channel_id': id},
|
||||||
|
)
|
||||||
|
return message_data
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log.exception(e)
|
log.exception(e)
|
||||||
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=ERROR_MESSAGES.DEFAULT())
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=ERROR_MESSAGES.DEFAULT())
|
||||||
|
|||||||
@@ -76,6 +76,27 @@
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const pinHandler = (
|
||||||
|
messageId: string,
|
||||||
|
pinned: boolean,
|
||||||
|
pinnedBy: string | null = pinned ? ($user?.id ?? null) : null,
|
||||||
|
pinnedAt: number | null = pinned ? Date.now() * 1000000 : null
|
||||||
|
) => {
|
||||||
|
if (messages) {
|
||||||
|
messages = messages.map((message) => {
|
||||||
|
if (message.id === messageId) {
|
||||||
|
return {
|
||||||
|
...message,
|
||||||
|
is_pinned: pinned,
|
||||||
|
pinned_by: pinnedBy,
|
||||||
|
pinned_at: pinnedAt
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return message;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const initHandler = async () => {
|
const initHandler = async () => {
|
||||||
if (currentId) {
|
if (currentId) {
|
||||||
updateLastReadAt(currentId);
|
updateLastReadAt(currentId);
|
||||||
@@ -305,17 +326,7 @@
|
|||||||
<Pane defaultSize={50} minSize={50} class="h-full flex flex-col w-full relative">
|
<Pane defaultSize={50} minSize={50} class="h-full flex flex-col w-full relative">
|
||||||
<Navbar
|
<Navbar
|
||||||
{channel}
|
{channel}
|
||||||
onPin={(messageId, pinned) => {
|
onPin={pinHandler}
|
||||||
messages = messages.map((message) => {
|
|
||||||
if (message.id === messageId) {
|
|
||||||
return {
|
|
||||||
...message,
|
|
||||||
is_pinned: pinned
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return message;
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
onUpdate={async () => {
|
onUpdate={async () => {
|
||||||
channel = await getChannelById(localStorage.token, id).catch((error) => {
|
channel = await getChannelById(localStorage.token, id).catch((error) => {
|
||||||
return null;
|
return null;
|
||||||
@@ -347,6 +358,7 @@
|
|||||||
onThread={(id) => {
|
onThread={(id) => {
|
||||||
threadId = id;
|
threadId = id;
|
||||||
}}
|
}}
|
||||||
|
onPin={pinHandler}
|
||||||
onLoad={async () => {
|
onLoad={async () => {
|
||||||
const newMessages = await getChannelMessages(
|
const newMessages = await getChannelMessages(
|
||||||
localStorage.token,
|
localStorage.token,
|
||||||
@@ -406,6 +418,7 @@
|
|||||||
<Thread
|
<Thread
|
||||||
{threadId}
|
{threadId}
|
||||||
{channel}
|
{channel}
|
||||||
|
onPin={pinHandler}
|
||||||
onClose={() => {
|
onClose={() => {
|
||||||
threadId = null;
|
threadId = null;
|
||||||
}}
|
}}
|
||||||
@@ -428,6 +441,7 @@
|
|||||||
<Thread
|
<Thread
|
||||||
{threadId}
|
{threadId}
|
||||||
{channel}
|
{channel}
|
||||||
|
onPin={pinHandler}
|
||||||
onClose={() => {
|
onClose={() => {
|
||||||
threadId = null;
|
threadId = null;
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -37,6 +37,7 @@
|
|||||||
export let onLoad: Function = () => {};
|
export let onLoad: Function = () => {};
|
||||||
export let onReply: Function = () => {};
|
export let onReply: Function = () => {};
|
||||||
export let onThread: Function = () => {};
|
export let onThread: Function = () => {};
|
||||||
|
export let onPin: Function = () => {};
|
||||||
|
|
||||||
let messagesLoading = false;
|
let messagesLoading = false;
|
||||||
|
|
||||||
@@ -166,24 +167,27 @@
|
|||||||
onReply(message);
|
onReply(message);
|
||||||
}}
|
}}
|
||||||
onPin={async (message) => {
|
onPin={async (message) => {
|
||||||
|
const pinned = !message.is_pinned;
|
||||||
|
const pinnedBy = pinned ? ($user?.id ?? null) : null;
|
||||||
|
const pinnedAt = pinned ? Date.now() * 1000000 : null;
|
||||||
|
|
||||||
messages = messages.map((m) => {
|
messages = messages.map((m) => {
|
||||||
if (m.id === message.id) {
|
if (m.id === message.id) {
|
||||||
m.is_pinned = !m.is_pinned;
|
m.is_pinned = pinned;
|
||||||
m.pinned_by = !m.is_pinned ? null : $user?.id;
|
m.pinned_by = pinnedBy;
|
||||||
m.pinned_at = !m.is_pinned ? null : Date.now() * 1000000;
|
m.pinned_at = pinnedAt;
|
||||||
}
|
}
|
||||||
return m;
|
return m;
|
||||||
});
|
});
|
||||||
|
|
||||||
const updatedMessage = await pinMessage(
|
onPin(message.id, pinned, pinnedBy, pinnedAt);
|
||||||
localStorage.token,
|
|
||||||
message.channel_id,
|
await pinMessage(localStorage.token, message.channel_id, message.id, pinned).catch(
|
||||||
message.id,
|
(error) => {
|
||||||
message.is_pinned
|
toast.error(`${error}`);
|
||||||
).catch((error) => {
|
return null;
|
||||||
toast.error(`${error}`);
|
}
|
||||||
return null;
|
);
|
||||||
});
|
|
||||||
}}
|
}}
|
||||||
onThread={(id) => {
|
onThread={(id) => {
|
||||||
onThread(id);
|
onThread(id);
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
export let channel = null;
|
export let channel = null;
|
||||||
|
|
||||||
export let onClose = () => {};
|
export let onClose = () => {};
|
||||||
|
export let onPin = () => {};
|
||||||
|
|
||||||
let messages = null;
|
let messages = null;
|
||||||
let top = false;
|
let top = false;
|
||||||
@@ -196,6 +197,7 @@
|
|||||||
{messages}
|
{messages}
|
||||||
{replyToMessage}
|
{replyToMessage}
|
||||||
thread={true}
|
thread={true}
|
||||||
|
{onPin}
|
||||||
onReply={async (message) => {
|
onReply={async (message) => {
|
||||||
replyToMessage = message;
|
replyToMessage = message;
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user