feat(frontend): ノート・ユーザータイムライン埋め込み (#13929)
* fix * navhookをbootに移動 * サーバーサイドのbootも分けるように * 埋め込みページかどうかの判定は最初の一回だけに * tooltipは出せるように * fix design * 埋め込み独自のtooltipを削除 * ロジックの分岐が多かったMkNoteDetailedを分離 * fix indent * プレビュー用iframeにフォーカスが当たるのを修正 * popupの制御を出す側で行うように * パラメータが逆になっていたのを修正 * Update MkEmbedCodeGenDialog.vue * fix * eliminate misskey-js lint warns * fix * add appropriate attributes to embed html * enhance: サーバーサイドのembed系をさらに分離 * enhance: embed routerを分離(route定義をboot時に変更できるようにする改修を含む) * type * lint * fix indent * server-side styleを完全に分離 * Revert "refactor: 画面サイズのしきい値をconstにまとめる" This reverts commit05ca36f400. * fix * revert all changes in base.pug * embedドメインをまとめた * embedドメインをまとめた * prevent calling contextmenu in embed page by stopping at the caller * fix import * fix import * improve directory structure * fix import * register timeline ui as a container * wa- * rename * wa- * Update EmMediaList.vue * Update EmMediaList.vue * Update EmMediaList.vue * Update EmMediaImage.vue * Update EmNote.vue * revert mkmedialist changes * 戻し漏れ * wip * tweak embed media ui * revert original media components * Update boot.embed.js * rename * wip * Update MkNote.vue * wip * Update MkSubNoteContent.vue * Update EmNote.vue * Update packages/frontend/src/router/definition.ts * Revert "Update packages/frontend/src/router/definition.ts" This reverts commit937ae44521. * refactor EmMediaImage * fix import * remove unused imports * Update router.ts * wip * Update boot.ts * wip * wip * wip * wip * Update EmNote.vue * Update EmNote.vue * Create EmA.vue * Create EmAvatar.vue * Update EmAvatar.vue * wip * wip * wip * Create EmImgWithBlurhash.vue * Update EmImgWithBlurhash.vue * Create EmPagination.vue * wip * Update boot.ts * wip * wip * wi@p * wip * wip * wiop * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update boot.ts * wip * Update MkMisskeyFlavoredMarkdown.ts * wip * wip * wip * wip * wip * Update post-message.ts * wip * Update EmNoteDetailed.vue * Update EmNoteDetailed.vue * Create instance.ts * Update EmNoteDetailed.vue * wip * Update EmNoteDetailed.vue * wip * wip * wip * Update pnpm-lock.yaml * wip * wip * wp * wip * Update ClientServerService.ts * wip * Update boot.ts * Update vite.config.local-dev.ts * Update vite.config.ts * Create index.html * wa- * wip * Update boot.ts * wip * wip * wip * wip * wip * wip * wip * wip * wip * Create EmLink.vue * Create EmMention.vue * Update EmMfm.ts * wip * wip * wip * wip * Update vite.config.ts * Update boot.ts * Update EmA.vue * うぃp * wip * wip * Create EmError.vue * wip * Update MkEmbedCodeGenDialog.vue * Update EmNote.vue * wip * wip * Update user-timeline.vue * Update check-spdx-license-id.yml * wip * wip * style(frontend-shared): lint fixes on build.js * fix(frontend-shared): include `*.{js,json}` files in js-built * wip * use alias * refactor * refactor * Update scroll.ts * refactor * refactor * refactor * wip * wip * wip * wip * Update roles.vue * Update branding.vue * wip * wip * wip * Update page.vue * wip * fix import * add missing css variables * 絵文字をtwemojiに変更 クライアントデフォルトにあわせるため * force empoll readonly * fix compiler error * fix broken imports * tweak button style * run api extractor * fix storybook theme preloads * fix storybook instance imports * Update preview.ts * Update preview.ts * Update preview.ts * Revert "Update preview.ts" This reverts commit12bab1c6fb. * Revert "Update preview.ts" This reverts commit5c0ce01dbd. * Revert "Update preview.ts" This reverts commitf4863524d7. * Revert "fix storybook instance imports" This reverts commited8eabb246. * Revert "wip" This reverts commitd3c1926519. * Revert "Update page.vue" This reverts commit27c7900b0c. * Revert "Update branding.vue" This reverts commitc08ccb65ba. * Revert "Update roles.vue" This reverts commit1488b67066. * Revert "wip" This reverts commitaab1c76981. * refactor: use common media proxy * fix imports * fix * fix: MediaProxyの初期化を保証する(storybook対策?) * enhance(frontend-embed): improve embedParams provide * fix(backend): MK_DEV_PREFER=backendのときにembed viteが読み込めないのを修正 * fix * embed-pageを共通化 * fix import * fix import * fix import * const.jsを共通化 (たぶんrevertしすぎた) * fix type error * fix duplicated import * fix lint * fix * コメントとして残す * sharedとembedをlint対象にする * lint * attempt to fix eslint (frontend-shared) * lint fixes --------- Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
This commit is contained in:
		| @@ -3,51 +3,32 @@ | ||||
|  * SPDX-License-Identifier: AGPL-3.0-only | ||||
|  */ | ||||
|  | ||||
| import { query } from '@/scripts/url.js'; | ||||
| import { MediaProxy } from '@@/js/media-proxy.js'; | ||||
| import { url } from '@/config.js'; | ||||
| import { instance } from '@/instance.js'; | ||||
|  | ||||
| export function getProxiedImageUrl(imageUrl: string, type?: 'preview' | 'emoji' | 'avatar', mustOrigin = false, noFallback = false): string { | ||||
| 	const localProxy = `${url}/proxy`; | ||||
| let _mediaProxy: MediaProxy | null = null; | ||||
|  | ||||
| 	if (imageUrl.startsWith(instance.mediaProxy + '/') || imageUrl.startsWith('/proxy/') || imageUrl.startsWith(localProxy + '/')) { | ||||
| 		// もう既にproxyっぽそうだったらurlを取り出す | ||||
| 		imageUrl = (new URL(imageUrl)).searchParams.get('url') ?? imageUrl; | ||||
| export function getProxiedImageUrl(...args: Parameters<MediaProxy['getProxiedImageUrl']>): string { | ||||
| 	if (_mediaProxy == null) { | ||||
| 		_mediaProxy = new MediaProxy(instance, url); | ||||
| 	} | ||||
|  | ||||
| 	return `${mustOrigin ? localProxy : instance.mediaProxy}/${ | ||||
| 		type === 'preview' ? 'preview.webp' | ||||
| 		: 'image.webp' | ||||
| 	}?${query({ | ||||
| 		url: imageUrl, | ||||
| 		...(!noFallback ? { 'fallback': '1' } : {}), | ||||
| 		...(type ? { [type]: '1' } : {}), | ||||
| 		...(mustOrigin ? { origin: '1' } : {}), | ||||
| 	})}`; | ||||
| 	return _mediaProxy.getProxiedImageUrl(...args); | ||||
| } | ||||
|  | ||||
| export function getProxiedImageUrlNullable(imageUrl: string | null | undefined, type?: 'preview'): string | null { | ||||
| 	if (imageUrl == null) return null; | ||||
| 	return getProxiedImageUrl(imageUrl, type); | ||||
| } | ||||
|  | ||||
| export function getStaticImageUrl(baseUrl: string): string { | ||||
| 	const u = baseUrl.startsWith('http') ? new URL(baseUrl) : new URL(baseUrl, url); | ||||
|  | ||||
| 	if (u.href.startsWith(`${url}/emoji/`)) { | ||||
| 		// もう既にemojiっぽそうだったらsearchParams付けるだけ | ||||
| 		u.searchParams.set('static', '1'); | ||||
| 		return u.href; | ||||
| export function getProxiedImageUrlNullable(...args: Parameters<MediaProxy['getProxiedImageUrlNullable']>): string | null { | ||||
| 	if (_mediaProxy == null) { | ||||
| 		_mediaProxy = new MediaProxy(instance, url); | ||||
| 	} | ||||
|  | ||||
| 	if (u.href.startsWith(instance.mediaProxy + '/')) { | ||||
| 		// もう既にproxyっぽそうだったらsearchParams付けるだけ | ||||
| 		u.searchParams.set('static', '1'); | ||||
| 		return u.href; | ||||
| 	return _mediaProxy.getProxiedImageUrlNullable(...args); | ||||
| } | ||||
|  | ||||
| export function getStaticImageUrl(...args: Parameters<MediaProxy['getStaticImageUrl']>): string { | ||||
| 	if (_mediaProxy == null) { | ||||
| 		_mediaProxy = new MediaProxy(instance, url); | ||||
| 	} | ||||
|  | ||||
| 	return `${instance.mediaProxy}/static.webp?${query({ | ||||
| 		url: u.href, | ||||
| 		static: '1', | ||||
| 	})}`; | ||||
| 	return _mediaProxy.getStaticImageUrl(...args); | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 かっこかり
					かっこかり