From 6fb4d212ee6a604f629de9a53c8c2e47a53c64a0 Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Sun, 26 Jan 2025 16:12:26 +0330 Subject: [PATCH] added pinMessages structure --- src/components/common/messaging/bars/PinnedMessage.tsx | 10 +++++----- src/lib/renderer/Singleton.ts | 1 + src/lib/renderer/simple/SimpleRenderer.ts | 9 +++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/components/common/messaging/bars/PinnedMessage.tsx b/src/components/common/messaging/bars/PinnedMessage.tsx index 1e0fbf93..2eb97951 100644 --- a/src/components/common/messaging/bars/PinnedMessage.tsx +++ b/src/components/common/messaging/bars/PinnedMessage.tsx @@ -308,8 +308,8 @@ export default observer( // if (!last_id) return null; // if (hidden) return null; - - // renderer.messages.slice().reverse().map((res, i) => { + // console.log(renderer.pinned_messages, "PINNED MESSAGES") + // renderer.pinned_messages.slice().reverse().map((res, i) => { // console.log(res, 8989) // }) function truncateText(text: string, chars: number) { @@ -365,7 +365,7 @@ export default observer(
{ - renderer.messages.slice().reverse().map((msg, i) => { + renderer.pinned_messages.slice().reverse().map((msg, i) => { if (msg.is_pinned) { let content = msg.content ? truncateText(msg.content, 220) : "" pinFound = true @@ -413,11 +413,11 @@ export default observer( style={{ display: 'flex', paddingTop: "5px", justifyContent: "center" }}> - + /> */}
} diff --git a/src/lib/renderer/Singleton.ts b/src/lib/renderer/Singleton.ts index 90c4d20d..09aa1f49 100644 --- a/src/lib/renderer/Singleton.ts +++ b/src/lib/renderer/Singleton.ts @@ -15,6 +15,7 @@ export class ChannelRenderer { atTop: Nullable = null; atBottom: Nullable = null; messages: Message[] = []; + pinned_messages: Message[] = []; currentRenderer: RendererRoutines = SimpleRenderer; diff --git a/src/lib/renderer/simple/SimpleRenderer.ts b/src/lib/renderer/simple/SimpleRenderer.ts index 19222589..52d89ec0 100644 --- a/src/lib/renderer/simple/SimpleRenderer.ts +++ b/src/lib/renderer/simple/SimpleRenderer.ts @@ -9,12 +9,14 @@ export const SimpleRenderer: RendererRoutines = { if (nearby) renderer.channel .fetchMessagesWithUsers({ nearby, limit: 100 }) - .then(({ messages }) => { + .then(({ messages, pinned_messages }) => { messages.sort((a, b) => a._id.localeCompare(b._id)); runInAction(() => { renderer.state = "RENDER"; renderer.messages = messages; + renderer.pinned_messages = pinned_messages; + renderer.atTop = false; renderer.atBottom = false; @@ -27,13 +29,12 @@ export const SimpleRenderer: RendererRoutines = { else renderer.channel .fetchMessagesWithUsers({}) - .then(({ messages }) => { - console.log(messages, 9090); + .then(({ messages, pinned_messages }) => { messages.reverse(); - runInAction(() => { renderer.state = "RENDER"; renderer.messages = messages; + renderer.pinned_messages = pinned_messages; renderer.atTop = messages.length < 50; renderer.atBottom = true;