CHANGELOG.md

@@ -73,7 +73,6 @@
 - Fix: キャプションが空の画像をクロップするとキャプションにnullという文字列が入ってしまう問題の修正
 - Fix: プロフィールを編集してもリロードするまで反映されない問題を修正
 - Fix: エラー画像URLを設定した後解除すると，デフォルトの画像が表示されない問題の修正
-- Fix: MkCodeEditorで行がずれていってしまう問題の修正
 
 ### Server
 - Enhance: 連合先のレートリミットに引っかかった際にリトライするようになりました
@@ -88,7 +87,6 @@
 - Fix: properly handle cc followers
 - Fix: ジョブに関する設定の名前を修正 relashionshipJobPerSec -> relationshipJobPerSec
 - Fix: コントロールパネル->モデレーション->「誰でも新規登録できるようにする」の初期値をONからOFFに変更 #13122
-- Enhance: 連合向けのノート配信を軽量化 #13192
 
 ### Service Worker
 - Enhance: オフライン表示のデザインを改善・多言語対応

packages/backend/src/core/MfmService.ts

@@ -419,10 +419,6 @@ export class MfmService {
 			},
 
 			text: (node) => {
-				if (!node.props.text.match(/[\r\n]/)) {
-					return doc.createTextNode(node.props.text);
-				}
-
 				const el = doc.createElement('span');
 				const nodes = node.props.text.split(/\r\n|\r|\n/).map(x => doc.createTextNode(x));
 

packages/backend/src/core/activitypub/ApMfmService.ts

@@ -25,21 +25,8 @@ export class ApMfmService {
 	}
 
 	@bindThis
-	public getNoteHtml(note: MiNote, apAppend?: string) {
+	public getNoteHtml(note: MiNote): string | null {
-		let noMisskeyContent = false;
+		if (!note.text) return '';
-		const srcMfm = (note.text ?? '') + (apAppend ?? '');
+		return this.mfmService.toHtml(mfm.parse(note.text), note.mentionedRemoteUsers ? JSON.parse(note.mentionedRemoteUsers) : []);
-
-		const parsed = mfm.parse(srcMfm);
-
-		if (!apAppend && parsed?.every(n => ['text', 'unicodeEmoji', 'emojiCode', 'mention', 'hashtag', 'url'].includes(n.type))) {
-			noMisskeyContent = true;
-		}
-
-		const content = this.mfmService.toHtml(parsed, JSON.parse(note.mentionedRemoteUsers));
-
-		return {
-			content,
-			noMisskeyContent,
-		};
 	}
 }

packages/backend/src/core/activitypub/ApRendererService.ts

@@ -409,15 +409,17 @@ export class ApRendererService {
 			poll = await this.pollsRepository.findOneBy({ noteId: note.id });
 		}
 
-		let apAppend = '';
+		let apText = text;
 
 		if (quote) {
-			apAppend += `\n\nRE: ${quote}`;
+			apText += `\n\nRE: ${quote}`;
 		}
 
 		const summary = note.cw === '' ? String.fromCharCode(0x200B) : note.cw;
 
-		const { content, noMisskeyContent } = this.apMfmService.getNoteHtml(note, apAppend);
+		const content = this.apMfmService.getNoteHtml(Object.assign({}, note, {
+			text: apText,
+		}));
 
 		const emojis = await this.getEmojis(note.emojis);
 		const apemojis = emojis.filter(emoji => !emoji.localOnly).map(emoji => this.renderEmoji(emoji));
@@ -430,6 +432,9 @@ export class ApRendererService {
 
 		const asPoll = poll ? {
 			type: 'Question',
+			content: this.apMfmService.getNoteHtml(Object.assign({}, note, {
+				text: text,
+			})),
 			[poll.expiresAt && poll.expiresAt < new Date() ? 'closed' : 'endTime']: poll.expiresAt,
 			[poll.multiple ? 'anyOf' : 'oneOf']: poll.choices.map((text, i) => ({
 				type: 'Note',
@@ -447,13 +452,11 @@ export class ApRendererService {
 			attributedTo,
 			summary: summary ?? undefined,
 			content: content ?? undefined,
-			...(noMisskeyContent ? {} : {
 			_misskey_content: text,
 			source: {
 				content: text,
 				mediaType: 'text/x.misskeymarkdown',
 			},
-			}),
 			_misskey_quote: quote,
 			quoteUrl: quote,
 			quoteUri: quote,

packages/backend/test/unit/ApMfmService.ts

@@ -1,44 +0,0 @@
-import * as assert from 'assert';
-import { Test } from '@nestjs/testing';
-
-import { CoreModule } from '@/core/CoreModule.js';
-import { ApMfmService } from '@/core/activitypub/ApMfmService.js';
-import { GlobalModule } from '@/GlobalModule.js';
-import { MiNote } from '@/models/Note.js';
-
-describe('ApMfmService', () => {
-	let apMfmService: ApMfmService;
-
-	beforeAll(async () => {
-		const app = await Test.createTestingModule({
-			imports: [GlobalModule, CoreModule],
-		}).compile();
-		apMfmService = app.get<ApMfmService>(ApMfmService);
-	});
-
-	describe('getNoteHtml', () => {
-		test('Do not provide _misskey_content for simple text', () => {
-			const note: MiNote = {
-				text: 'テキスト #タグ @mention 🍊 :emoji: https://example.com',
-				mentionedRemoteUsers: '[]',
-			} as any;
-
-			const { content, noMisskeyContent } = apMfmService.getNoteHtml(note);
-
-			assert.equal(noMisskeyContent, true, 'noMisskeyContent');
-			assert.equal(content, '<p>テキスト <a href="http://misskey.local/tags/タグ" rel="tag">#タグ</a> <a href="http://misskey.local/@mention" class="u-url mention">@mention</a> 🍊 ​:emoji:​ <a href="https://example.com">https://example.com</a></p>', 'content');
-		});
-
-		test('Provide _misskey_content for MFM', () => {
-			const note: MiNote = {
-				text: '$[tada foo]',
-				mentionedRemoteUsers: '[]',
-			} as any;
-
-			const { content, noMisskeyContent } = apMfmService.getNoteHtml(note);
-
-			assert.equal(noMisskeyContent, false, 'noMisskeyContent');
-			assert.equal(content, '<p><i>foo</i></p>', 'content');
-		});
-	});
-});

packages/backend/test/unit/MfmService.ts

@@ -33,12 +33,6 @@ describe('MfmService', () => {
 			const output = '<p><span>foo<br>bar<br>baz</span></p>';
 			assert.equal(mfmService.toHtml(mfm.parse(input)), output);
 		});
-
-		test('Do not generate unnecessary span', () => {
-			const input = 'foo $[tada bar]';
-			const output = '<p>foo <i>bar</i></p>';
-			assert.equal(mfmService.toHtml(mfm.parse(input)), output);
-		});
 	});
 
 	describe('fromHtml', () => {

packages/frontend/src/components/MkCode.core.vue

@@ -93,7 +93,6 @@ watch(() => props.lang, (to) => {
 	overflow: auto;
 	border-radius: var(--radius-sm);
 	border: 1px solid var(--divider);
-	font-family: Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
 
 	color: var(--shiki-fallback);
 	background-color: var(--shiki-fallback-bg);

packages/frontend/src/components/MkHorizontalSwipe.vue

@@ -25,11 +25,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</Transition>
 </div>
 </template>
+
 <script lang="ts" setup>
 import { ref, shallowRef, computed, nextTick, watch } from 'vue';
 import type { Tab } from '@/components/global/MkPageHeader.tabs.vue';
 import { defaultStore } from '@/store.js';
-import { isHorizontalSwipeSwiping as isSwiping } from '@/scripts/touch.js';
 
 const rootEl = shallowRef<HTMLDivElement>();
 
@@ -49,16 +49,16 @@ const shouldAnimate = computed(() => defaultStore.reactiveState.enableHorizontal
 // ▼ しきい値 ▼ //
 
 // スワイプと判定される最小の距離
-const MIN_SWIPE_DISTANCE = 20;
+const MIN_SWIPE_DISTANCE = 50;
 
 // スワイプ時の動作を発火する最小の距離
-const SWIPE_DISTANCE_THRESHOLD = 70;
+const SWIPE_DISTANCE_THRESHOLD = 125;
 
 // スワイプを中断するY方向の移動距離
 const SWIPE_ABORT_Y_THRESHOLD = 75;
 
 // スワイプできる最大の距離
-const MAX_SWIPE_DISTANCE = 120;
+const MAX_SWIPE_DISTANCE = 150;
 
 // ▲ しきい値 ▲ //
 
@@ -68,6 +68,7 @@ let startScreenY: number | null = null;
 const currentTabIndex = computed(() => props.tabs.findIndex(tab => tab.key === tabModel.value));
 
 const pullDistance = ref(0);
+const isSwiping = ref(false);
 const isSwipingForClass = ref(false);
 let swipeAborted = false;
 
@@ -76,8 +77,6 @@ function touchStart(event: TouchEvent) {
 
 	if (event.touches.length !== 1) return;
 
-	if (hasSomethingToDoWithXSwipe(event.target as HTMLElement)) return;
-
 	startScreenX = event.touches[0].screenX;
 	startScreenY = event.touches[0].screenY;
 }
@@ -91,8 +90,6 @@ function touchMove(event: TouchEvent) {
 
 	if (swipeAborted) return;
 
-	if (hasSomethingToDoWithXSwipe(event.target as HTMLElement)) return;
-
 	let distanceX = event.touches[0].screenX - startScreenX;
 	let distanceY = event.touches[0].screenY - startScreenY;
 
@@ -142,8 +139,6 @@ function touchEnd(event: TouchEvent) {
 
 	if (!isSwiping.value) return;
 
-	if (hasSomethingToDoWithXSwipe(event.target as HTMLElement)) return;
-
 	const distance = event.changedTouches[0].screenX - startScreenX;
 
 	if (Math.abs(distance) > SWIPE_DISTANCE_THRESHOLD) {
@@ -167,24 +162,6 @@ function touchEnd(event: TouchEvent) {
 	}, 400);
 }
 
-/** 横スワイプに関与する可能性のある要素を調べる */
-function hasSomethingToDoWithXSwipe(el: HTMLElement) {
-	if (['INPUT', 'TEXTAREA'].includes(el.tagName)) return true;
-	if (el.isContentEditable) return true;
-	if (el.scrollWidth > el.clientWidth) return true;
-
-	const style = window.getComputedStyle(el);
-	if (['absolute', 'fixed', 'sticky'].includes(style.position)) return true;
-	if (['scroll', 'auto'].includes(style.overflowX)) return true;
-	if (style.touchAction === 'pan-x') return true;
-
-	if (el.parentElement && el.parentElement !== rootEl.value) {
-		return hasSomethingToDoWithXSwipe(el.parentElement);
-	} else {
-		return false;
-	}
-}
-
 const transitionName = ref<'swipeAnimationLeft' | 'swipeAnimationRight' | undefined>(undefined);
 
 watch(tabModel, (newTab, oldTab) => {
@@ -205,7 +182,6 @@ watch(tabModel, (newTab, oldTab) => {
 
 <style lang="scss" module>
 .transitionRoot {
-	touch-action: pan-y pinch-zoom;
 	display: grid;
 	grid-template-columns: 100%;
 	overflow: clip;

packages/frontend/src/components/MkPullToRefresh.vue

@@ -26,7 +26,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { onMounted, onUnmounted, ref, shallowRef } from 'vue';
 import { i18n } from '@/i18n.js';
 import { getScrollContainer } from '@/scripts/scroll.js';
-import { isHorizontalSwipeSwiping } from '@/scripts/touch.js';
 
 const SCROLL_STOP = 10;
 const MAX_PULL_DISTANCE = Infinity;
@@ -130,7 +129,7 @@ function moveEnd() {
 function moving(event: TouchEvent | PointerEvent) {
 	if (!isPullStart.value || isRefreshing.value || disabled) return;
 
-	if ((scrollEl?.scrollTop ?? 0) > (supportPointerDesktop ? SCROLL_STOP : SCROLL_STOP + pullDistance.value) || isHorizontalSwipeSwiping.value) {
+	if ((scrollEl?.scrollTop ?? 0) > (supportPointerDesktop ? SCROLL_STOP : SCROLL_STOP + pullDistance.value)) {
 		pullDistance.value = 0;
 		isPullEnd.value = false;
 		moveEnd();
@@ -149,10 +148,6 @@ function moving(event: TouchEvent | PointerEvent) {
 		if (event.cancelable) event.preventDefault();
 	}
 
-	if (pullDistance.value > SCROLL_STOP) {
-		event.stopPropagation();
-	}
-
 	isPullEnd.value = pullDistance.value >= FIRE_THRESHOLD;
 }
 

packages/frontend/src/scripts/touch.ts

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { ref } from 'vue';
 import { deviceKind } from '@/scripts/device-kind.js';
 
 const isTouchSupported = 'maxTouchPoints' in navigator && navigator.maxTouchPoints > 0;
@@ -17,6 +16,3 @@ if (isTouchSupported && !isTouchUsing) {
 		isTouchUsing = true;
 	}, { passive: true });
 }
-
-/** (MkHorizontalSwipe) 横スワイプ中か？ */
-export const isHorizontalSwipeSwiping = ref(false);

packages/misskey-js/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.2.0-beta.10",
+	"version": "2024.2.0-beta.8",
 	"description": "Misskey SDK for JavaScript",
 	"types": "./built/dts/index.d.ts",
 	"exports": {