Merge branch 'master' into bug/unread_pinmessage
commit
c936704ee0
|
|
@ -93,7 +93,7 @@ export const PinMessageBox = observer(
|
|||
|
||||
|
||||
let children = null;
|
||||
let userName = message.client ? message.client.user?.username : ""
|
||||
let userName = message.client ? message.system.by_username : ""
|
||||
|
||||
|
||||
if (data.type as string == "message_pinned") {
|
||||
|
|
|
|||
|
|
@ -164,8 +164,6 @@ export default observer(({ last_id, renderer, highlight }: Props) => {
|
|||
previous.masquerade,
|
||||
);
|
||||
}
|
||||
// console.log(renderer.messages[i].content, 7979)
|
||||
|
||||
|
||||
if (message.system?.type as any == "message_pinned" || message.system?.type as any == "message_unpinned") {
|
||||
render.push(
|
||||
|
|
|
|||
Loading…
Reference in New Issue