Fix content type reader filters

Author: mdroidian

apps/obsidian/src/utils/importNodes.ts

@@ -31,6 +31,28 @@ type PublishedNode = {
   authorId: number | undefined;
 };
 
+type ObsidianNativeVariant = "direct" | "full";
+
+const PLAIN_TEXT_CONTENT_TYPE = "text/plain";
+const OBSIDIAN_MARKDOWN_CONTENT_TYPE = "text/obsidian+markdown";
+
+const getObsidianNativeContentType = (
+  variant: ObsidianNativeVariant,
+): string =>
+  variant === "direct"
+    ? PLAIN_TEXT_CONTENT_TYPE
+    : OBSIDIAN_MARKDOWN_CONTENT_TYPE;
+
+const isObsidianNativeContentRow = ({
+  variant,
+  content_type,
+}: {
+  variant: string | null;
+  content_type: string | null;
+}): boolean =>
+  (variant === "direct" && content_type === PLAIN_TEXT_CONTENT_TYPE) ||
+  (variant === "full" && content_type === OBSIDIAN_MARKDOWN_CONTENT_TYPE);
+
 export const getPublishedNodesForGroups = async ({
   client,
   groupIds,
@@ -49,9 +71,14 @@ export const getPublishedNodesForGroups = async ({
   const { data, error } = await client
     .from("my_contents")
     .select(
-      "source_local_id, space_id, text, created, last_modified, variant, metadata, author_id",
+      "source_local_id, space_id, text, created, last_modified, variant, content_type, metadata, author_id",
     )
-    .neq("space_id", currentSpaceId);
+    .neq("space_id", currentSpaceId)
+    .in("variant", ["direct", "full"])
+    .in("content_type", [
+      PLAIN_TEXT_CONTENT_TYPE,
+      OBSIDIAN_MARKDOWN_CONTENT_TYPE,
+    ]);
 
   if (error) {
     console.error("Error fetching published nodes:", error);
@@ -69,13 +96,15 @@ export const getPublishedNodesForGroups = async ({
     created: string | null;
     last_modified: string | null;
     variant: string | null;
+    content_type: string | null;
     author_id: number | null;
     metadata: Json;
   };
 
   const key = (r: Row) => `${r.space_id ?? ""}\t${r.source_local_id ?? ""}`;
   const groups = new Map<string, Row[]>();
   for (const row of data as Row[]) {
+    if (!isObsidianNativeContentRow(row)) continue;
     if (row.source_local_id == null || row.space_id == null) continue;
     const k = key(row);
     if (!groups.has(k)) groups.set(k, []);
@@ -92,7 +121,10 @@ export const getPublishedNodesForGroups = async ({
     const latest = withDate.reduce((a, b) =>
       (a.last_modified ?? "") >= (b.last_modified ?? "") ? a : b,
     );
-    const direct = rows.find((r) => r.variant === "direct");
+    const direct = rows.find(
+      (r) =>
+        r.variant === "direct" && r.content_type === PLAIN_TEXT_CONTENT_TYPE,
+    );
     const text = direct?.text ?? latest.text ?? "";
     const createdAt = latest.created
       ? new Date(latest.created + "Z").valueOf()
@@ -250,6 +282,7 @@ export const fetchNodeContent = async ({
     .eq("source_local_id", nodeInstanceId)
     .eq("space_id", spaceId)
     .eq("variant", variant)
+    .eq("content_type", getObsidianNativeContentType(variant))
     .maybeSingle();
 
   if (error || !data || data.text == null) {
@@ -284,6 +317,7 @@ export const fetchNodeContentWithMetadata = async ({
     .eq("source_local_id", nodeInstanceId)
     .eq("space_id", spaceId)
     .eq("variant", variant)
+    .eq("content_type", getObsidianNativeContentType(variant))
     .maybeSingle();
 
   if (error || !data || data.text == null) {
@@ -325,10 +359,16 @@ const fetchNodeContentForImport = async ({
 } | null> => {
   const { data, error } = await client
     .from("my_contents")
-    .select("text, created, last_modified, variant, metadata, author_id")
+    .select(
+      "text, created, last_modified, variant, content_type, metadata, author_id",
+    )
     .eq("source_local_id", nodeInstanceId)
     .eq("space_id", spaceId)
-    .in("variant", ["direct", "full"]);
+    .in("variant", ["direct", "full"])
+    .in("content_type", [
+      PLAIN_TEXT_CONTENT_TYPE,
+      OBSIDIAN_MARKDOWN_CONTENT_TYPE,
+    ]);
 
   if (error) {
     console.error("Error fetching node content for import:", error);
@@ -341,10 +381,16 @@ const fetchNodeContentForImport = async ({
     last_modified: string | null;
     author_id: number | null;
     variant: string | null;
+    content_type: string | null;
     metadata: Json;
   }>;
-  const direct = rows.find((r) => r.variant === "direct");
-  const full = rows.find((r) => r.variant === "full");
+  const direct = rows.find(
+    (r) => r.variant === "direct" && r.content_type === PLAIN_TEXT_CONTENT_TYPE,
+  );
+  const full = rows.find(
+    (r) =>
+      r.variant === "full" && r.content_type === OBSIDIAN_MARKDOWN_CONTENT_TYPE,
+  );
   const authorId = full?.author_id ?? direct?.author_id ?? null;
 
   if (
@@ -395,6 +441,7 @@ export const getSourceContentDates = async ({
     .eq("source_local_id", nodeInstanceId)
     .eq("space_id", spaceId)
     .eq("variant", "direct")
+    .eq("content_type", PLAIN_TEXT_CONTENT_TYPE)
     .maybeSingle();
   if (error || !data) return null;
   return {
@@ -1525,6 +1572,7 @@ export const refreshImportedFile = async ({
     .eq("space_id", spaceId)
     .eq("source_local_id", frontmatter.nodeInstanceId)
     .eq("variant", "direct")
+    .eq("content_type", PLAIN_TEXT_CONTENT_TYPE)
     .maybeSingle();
   const metadata = metadataResp.data?.metadata;
   const filePath: string | undefined =

apps/obsidian/src/utils/publishNode.ts

@@ -23,6 +23,8 @@ import type { DiscourseNodeInVault } from "./getDiscourseNodes";
 import type { SupabaseContext } from "./supabaseContext";
 import type { TablesInsert } from "@repo/database/dbTypes";
 
+const OBSIDIAN_MARKDOWN_CONTENT_TYPE = "text/obsidian+markdown";
+
 export const getPublishedToGroups = (
   frontmatter: FrontMatterCache | Record<string, unknown>,
 ): string[] => {
@@ -428,6 +430,7 @@ export const publishNodeToGroup = async ({
     .eq("source_local_id", nodeId)
     .eq("space_id", spaceId)
     .eq("variant", "full")
+    .eq("content_type", OBSIDIAN_MARKDOWN_CONTENT_TYPE)
     .maybeSingle();
   if (idResponse.error || !idResponse.data) {
     throw idResponse.error || new Error("no data while fetching node");

packages/database/features/step-definitions/stepdefs.ts

@@ -308,15 +308,14 @@ Then(
   },
 );
 
+/* eslint-disable max-params -- Cucumber inspects function.length for step arity. */
 Then(
   "a user logged in space {word} should see {int} content rows with variant {string} and content type {string}",
   async (
-    ...[spaceName, expectedCount, variant, contentType]: [
-      string,
-      number,
-      ContentVariant,
-      string,
-    ]
+    spaceName: string,
+    expectedCount: number,
+    variant: ContentVariant,
+    contentType: string,
   ) => {
     const localRefs = (world.localRefs || {}) as LocalRefsType;
     const spaceId = localRefs[spaceName];
@@ -331,6 +330,7 @@ Then(
     assert.equal(response.count, expectedCount);
   },
 );
+/* eslint-enable max-params */
 
 // invoke the upsert_accounts_in_space function, expects json
 Given(