From 625220b4bcf264bed15b2f10dea40205919f1f4c Mon Sep 17 00:00:00 2001 From: bandinopla Date: Fri, 29 Mar 2024 05:34:16 -0300 Subject: [PATCH] omg... --- server/db/resolvers/forum/forum-announcements.js | 8 ++++---- server/db/resolvers/forum/resolver.js | 13 +++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/server/db/resolvers/forum/forum-announcements.js b/server/db/resolvers/forum/forum-announcements.js index fb7f8d4..efa70ec 100644 --- a/server/db/resolvers/forum/forum-announcements.js +++ b/server/db/resolvers/forum/forum-announcements.js @@ -44,9 +44,9 @@ export async function getAnnouncementsCount() { return total?.[0].totalCount ?? 0; } -export async function getAnnouncementsThreadMessages ( forumThreadRow, limit, pushThreadHere ) +export async function getAnnouncementsThreadMessages ( args, limit, pushThreadHere, $pointerId ) { - const globalId = forumThreadRow.post_comment.replace("global:", ""); + const globalId = $pointerId.replace("global:", ""); const global = await query(`SELECT * FROM messages WHERE id=?`, [ globalId ]); if(!global.length) @@ -65,11 +65,11 @@ export async function getAnnouncementsThreadMessages ( forumThreadRow, limit, pu post_preview:"" } - const proxy = await query(`SELECT * FROM forum WHERE post_comment=?`, [ args.messageId ]); + const proxy = await query(`SELECT * FROM forum WHERE post_comment=?`, [ $pointerId ]); if(!proxy.length) { - const created = await query( `INSERT INTO forum SET ?`, { ...thread, post_comment: args.messageId } ); + const created = await query( `INSERT INTO forum SET ?`, { ...thread, post_comment: $pointerId } ); if(!created.insertId ) { diff --git a/server/db/resolvers/forum/resolver.js b/server/db/resolvers/forum/resolver.js index 4863a68..83d0d4c 100644 --- a/server/db/resolvers/forum/resolver.js +++ b/server/db/resolvers/forum/resolver.js @@ -159,15 +159,20 @@ export const ForumResolver = { let messages ; let thread = await query(`SELECT * FROM forum WHERE id=?`, [ args.messageId ]); + let idForSection ; + let sectionHook = SECTIONS.find( s=> { + idForSection = s.idIsMine? + s.idIsMine(args.messageId) ? args.messageId : + s.idIsMine(thread[0]?.post_comment) ? thread[0]?.post_comment : null + : null; - let sectionHook = SECTIONS.find( s=> s.idIsMine && (s.idIsMine(args.messageId) || s.idIsMine(thread[0]?.post_comment)) ); + return idForSection? s : null; + }); if( sectionHook ) { - let threadRow = thread[0]; - thread = []; - messages = await sectionHook.getThreadMessages()( threadRow, limit, thread ); + messages = await sectionHook.getThreadMessages()( args, limit, thread, idForSection ); } else {