🎨 makeChangeで書き換えた

takker99 · takker99 · commit 5a2aaf279b92 · 2022-02-11T17:25:17.000+09:00
diff --git a/browser/websocket/diffToChanges.test.ts b/browser/websocket/diffToChanges.test.ts
@@ -1,5 +1,5 @@
 /// <reference lib="deno.unstable" />
-import { diffToChanges } from "./patch.ts";
+import { diffToChanges } from "./diffToChanges.ts";
 import { assertEquals } from "../../deps/testing.ts";
 
 Deno.test("diffToChanges()", async ({ step }) => {
diff --git a/browser/websocket/diffToChanges.ts b/browser/websocket/diffToChanges.ts
diff --git a/browser/websocket/makeChanges.ts b/browser/websocket/makeChanges.ts
@@ -1,4 +1,4 @@
-import { diffToChanges } from "./patch.ts";
+import { diffToChanges } from "./diffToChanges.ts";
 import type { Line } from "../../deps/scrapbox.ts";
 import {
   Block,
diff --git a/browser/websocket/room.ts b/browser/websocket/room.ts
@@ -5,8 +5,9 @@ import {
   wrap,
 } from "../../deps/socket.ts";
 import { getProjectId, getUserId } from "./id.ts";
-import { diffToChanges } from "./patch.ts";
 import { applyCommit } from "./applyCommit.ts";
+import { toTitleLc } from "../../title.ts";
+import { makeChanges } from "./makeChanges.ts";
 import type { Line } from "../../deps/scrapbox.ts";
 import { ensureEditablePage, pushCommit } from "./_fetch.ts";
 export type { CommitNotification };
@@ -48,9 +49,13 @@ export async function joinPageRoom(
   ]);
 
   // 接続したページの情報
-  let parentId = page.commitId;
-  let created = page.persistent;
-  let lines = page.lines;
+  let head = {
+    persistent: page.persistent,
+    lines: page.lines,
+    image: page.image,
+    commitId: page.commitId,
+    linksLc: page.links.map((link) => toTitleLc(link)),
+  };
   const pageId = page.id;
 
   const io = await socketIO();
@@ -63,55 +68,36 @@ export async function joinPageRoom(
   // subscribe the latest commit
   (async () => {
     for await (const { id, changes } of response("commit")) {
-      parentId = id;
-      lines = applyCommit(lines, changes, { updated: id, userId });
+      head.commitId = id;
+      head.lines = applyCommit(head.lines, changes, { updated: id, userId });
     }
   })();
 
   return {
     patch: async (update: (before: Line[]) => string[] | Promise<string[]>) => {
-      const tryPush = async () => {
-        const pending = update(lines);
-        const newLines = pending instanceof Promise ? await pending : pending;
-        const changes: Change[] = [
-          ...diffToChanges(lines, newLines, { userId }),
-        ];
-
-        // 変更後のlinesを計算する
-        const changedLines = applyCommit(lines, changes, {
-          userId,
-        });
-        // タイトルの変更チェック
-        // 空ページの場合もタイトル変更commitを入れる
-        if (lines[0].text !== changedLines[0].text || !created) {
-          changes.push({ title: changedLines[0].text });
-        }
-        // サムネイルの変更チェック
-        const oldDescriptions = lines.slice(1, 6).map((line) => line.text);
-        const newDescriptions = changedLines.slice(1, 6).map((lines) =>
-          lines.text
-        );
-        if (oldDescriptions.join("\n") !== newDescriptions.join("\n")) {
-          changes.push({ descriptions: newDescriptions });
-        }
-
-        // pushする
-        const { commitId } = await pushCommit(request, changes, {
-          parentId,
-          projectId,
-          pageId,
-          userId,
-        });
-
-        // pushに成功したら、localにも変更を反映する
-        parentId = commitId;
-        created = true;
-        lines = changedLines;
-      };
-
       for (let i = 0; i < 3; i++) {
         try {
-          await tryPush();
+          const pending = update(head.lines);
+          const newLines = pending instanceof Promise ? await pending : pending;
+          const changes = makeChanges(head.lines, newLines, {
+            userId,
+            head,
+          });
+
+          const { commitId } = await pushCommit(request, changes, {
+            parentId: head.commitId,
+            projectId,
+            pageId,
+            userId,
+          });
+
+          // pushに成功したら、localにも変更を反映する
+          head.commitId = commitId;
+          head.persistent = true;
+          head.lines = applyCommit(head.lines, changes, {
+            updated: commitId,
+            userId,
+          });
           break;
         } catch (_e: unknown) {
           if (i === 2) {
@@ -122,9 +108,13 @@ export async function joinPageRoom(
           );
           try {
             const page = await ensureEditablePage(project, title);
-            parentId = page.commitId;
-            created = page.persistent;
-            lines = page.lines;
+            head = {
+              persistent: page.persistent,
+              lines: page.lines,
+              image: page.image,
+              commitId: page.commitId,
+              linksLc: page.links.map((link) => toTitleLc(link)),
+            };
           } catch (e: unknown) {
             throw e;
           }
diff --git a/browser/websocket/shortcuts.ts b/browser/websocket/shortcuts.ts
@@ -1,9 +1,9 @@
-import { Change, socketIO, wrap } from "../../deps/socket.ts";
+import { socketIO, wrap } from "../../deps/socket.ts";
 import { getProjectId, getUserId } from "./id.ts";
-import { diffToChanges } from "./patch.ts";
-import { applyCommit } from "./applyCommit.ts";
+import { makeChanges } from "./makeChanges.ts";
 import { pinNumber } from "./pin.ts";
 import type { Line } from "../../deps/scrapbox.ts";
+import { toTitleLc } from "../../title.ts";
 import { ensureEditablePage, pushCommit, pushWithRetry } from "./_fetch.ts";
 
 /** 指定したページを削除する
@@ -68,53 +68,32 @@ export async function patch(
     getUserId(),
   ]);
 
-  let persistent = page.persistent;
-  let lines = page.lines;
-  let parentId = page.commitId;
+  let head = {
+    persistent: page.persistent,
+    lines: page.lines,
+    image: page.image,
+    commitId: page.commitId,
+    linksLc: page.links.map((link) => toTitleLc(link)),
+  };
   const pageId = page.id;
 
   const io = await socketIO();
   try {
     const { request } = wrap(io);
 
-    const tryPush = async () => {
-      const pending = update(lines);
-      const newLines = pending instanceof Promise ? await pending : pending;
-      const changes: Change[] = [
-        ...diffToChanges(lines, newLines, { userId }),
-      ];
-
-      // 変更後のlinesを計算する
-      const changedLines = applyCommit(lines, changes, {
-        userId,
-      });
-      // タイトルの変更チェック
-      // 空ページの場合もタイトル変更commitを入れる
-      if (lines[0].text !== changedLines[0].text || !persistent) {
-        changes.push({ title: changedLines[0].text });
-      }
-      // サムネイルの変更チェック
-      const oldDescriptions = lines.slice(1, 6).map((line) => line.text);
-      const newDescriptions = changedLines.slice(1, 6).map((lines) =>
-        lines.text
-      );
-      if (oldDescriptions.join("\n") !== newDescriptions.join("\n")) {
-        changes.push({ descriptions: newDescriptions });
-      }
-
-      // pushする
-      await pushCommit(request, changes, {
-        parentId,
-        projectId,
-        pageId,
-        userId,
-      });
-    };
-
     // 3回retryする
     for (let i = 0; i < 3; i++) {
       try {
-        await tryPush();
+        const pending = update(head.lines);
+        const newLines = pending instanceof Promise ? await pending : pending;
+        const changes = makeChanges(head.lines, newLines, { userId, head });
+
+        await pushCommit(request, changes, {
+          parentId: head.commitId,
+          projectId,
+          pageId,
+          userId,
+        });
         break;
       } catch (_e: unknown) {
         if (i === 2) {
@@ -125,9 +104,13 @@ export async function patch(
         );
         try {
           const page = await ensureEditablePage(project, title);
-          parentId = page.commitId;
-          persistent = page.persistent;
-          lines = page.lines;
+          head = {
+            persistent: page.persistent,
+            lines: page.lines,
+            image: page.image,
+            commitId: page.commitId,
+            linksLc: page.links.map((link) => toTitleLc(link)),
+          };
         } catch (e: unknown) {
           throw e;
         }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { diffToChanges } from "./patch.ts";`
	`1`	`+import { diffToChanges } from "./diffToChanges.ts";`
`2`	`2`	`import type { Line } from "../../deps/scrapbox.ts";`
`3`	`3`	`import {`
`4`	`4`	`Block,`