diff --git a/keyserver/src/fetchers/community-fetchers.js b/keyserver/src/fetchers/community-fetchers.js --- a/keyserver/src/fetchers/community-fetchers.js +++ b/keyserver/src/fetchers/community-fetchers.js @@ -44,12 +44,12 @@ return communityInfos; } -async function checkIfCommunityHasFarcasterChannelTag( +async function fetchCommunityFarcasterChannelTag( viewer: Viewer, communityID: string, -): Promise { +): Promise { if (!viewer.loggedIn) { - return false; + return null; } const query = SQL` @@ -62,7 +62,7 @@ const communityInfo = result[0]; - return !!communityInfo?.farcasterChannelID; + return communityInfo?.farcasterChannelID; } -export { fetchCommunityInfos, checkIfCommunityHasFarcasterChannelTag }; +export { fetchCommunityInfos, fetchCommunityFarcasterChannelTag }; diff --git a/keyserver/src/updaters/thread-updaters.js b/keyserver/src/updaters/thread-updaters.js --- a/keyserver/src/updaters/thread-updaters.js +++ b/keyserver/src/updaters/thread-updaters.js @@ -45,7 +45,7 @@ import createMessages from '../creators/message-creator.js'; import { createUpdates } from '../creators/update-creator.js'; import { dbQuery, SQL } from '../database/database.js'; -import { checkIfCommunityHasFarcasterChannelTag } from '../fetchers/community-fetchers.js'; +import { fetchCommunityFarcasterChannelTag } from '../fetchers/community-fetchers.js'; import { checkIfInviteLinkIsValid } from '../fetchers/link-fetchers.js'; import { fetchMessageInfoByID } from '../fetchers/message-fetchers.js'; import { @@ -840,15 +840,14 @@ ); const communityFarcasterChannelTagPromise = - checkIfCommunityHasFarcasterChannelTag(viewer, request.threadID); + fetchCommunityFarcasterChannelTag(viewer, request.threadID); - const [threadPermission, hasCommunityFarcasterChannelTag] = - await Promise.all([ - threadPermissionPromise, - communityFarcasterChannelTagPromise, - ]); + const [threadPermission, communityFarcasterChannelTag] = await Promise.all([ + threadPermissionPromise, + communityFarcasterChannelTagPromise, + ]); - return threadPermission || hasCommunityFarcasterChannelTag; + return threadPermission || !!communityFarcasterChannelTag; })(); const [isMember, hasPermission] = await Promise.all([