Skip to content

Commit 92aba4a

Browse files
authored
Merge pull request #10 from takker99/prevent-newline
✨ Prevent newline characters from being contained in each line
2 parents 41deacb + 001367c commit 92aba4a

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

browser/websocket/makeChanges.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,26 @@ export function makeChanges(
2626
right: string[],
2727
{ userId, head }: Init,
2828
) {
29+
// 改行文字が入るのを防ぐ
30+
const right_ = right.flatMap((text) => text.split("\n"));
2931
// 本文の差分
30-
const changes: Change[] = [...diffToChanges(left, right, { userId })];
32+
const changes: Change[] = [...diffToChanges(left, right_, { userId })];
3133

3234
// titleの差分を入れる
3335
// 空ページの場合もタイトル変更commitを入れる
34-
if (left[0].text !== right[0] || !head.persistent) {
35-
changes.push({ title: right[0] });
36+
if (left[0].text !== right_[0] || !head.persistent) {
37+
changes.push({ title: right_[0] });
3638
}
3739

3840
// descriptionsの差分を入れる
3941
const leftDescriptions = left.slice(1, 6).map((line) => line.text);
40-
const rightDescriptions = right.slice(1, 6);
42+
const rightDescriptions = right_.slice(1, 6);
4143
if (leftDescriptions.join("") !== rightDescriptions.join("")) {
4244
changes.push({ descriptions: rightDescriptions });
4345
}
4446

4547
// リンクと画像の差分を入れる
46-
const [linksLc, image] = findLinksAndImage(right.join("\n"));
48+
const [linksLc, image] = findLinksAndImage(right_.join("\n"));
4749
if (
4850
head.linksLc.length !== linksLc.length ||
4951
!head.linksLc.every((link) => linksLc.includes(link))

0 commit comments

Comments
 (0)