From ecdaeea94f72d1bd6ae7d3cf50e3c128d537e157 Mon Sep 17 00:00:00 2001 From: Johann150 Date: Thu, 23 Jun 2022 13:26:47 +0200 Subject: enhance: word mute checks CW (#8873) --- packages/client/src/scripts/check-word-mute.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'packages/client/src/scripts') diff --git a/packages/client/src/scripts/check-word-mute.ts b/packages/client/src/scripts/check-word-mute.ts index fa74c09939..aafdd8920a 100644 --- a/packages/client/src/scripts/check-word-mute.ts +++ b/packages/client/src/scripts/check-word-mute.ts @@ -3,7 +3,9 @@ export function checkWordMute(note: Record, me: Record if (me && (note.userId === me.id)) return false; if (mutedWords.length > 0) { - if (note.text == null) return false; + const text = ((note.cw ?? '') + '\n' + (note.text ?? '')).trim(); + + if (text == '') return false; const matched = mutedWords.some(filter => { if (Array.isArray(filter)) { @@ -11,7 +13,7 @@ export function checkWordMute(note: Record, me: Record const filteredFilter = filter.filter(keyword => keyword !== ''); if (filteredFilter.length === 0) return false; - return filteredFilter.every(keyword => note.text!.includes(keyword)); + return filteredFilter.every(keyword => text.includes(keyword)); } else { // represents RegExp const regexp = filter.match(/^\/(.+)\/(.*)$/); @@ -20,7 +22,7 @@ export function checkWordMute(note: Record, me: Record if (!regexp) return false; try { - return new RegExp(regexp[1], regexp[2]).test(note.text!); + return new RegExp(regexp[1], regexp[2]).test(text); } catch (err) { // This should never happen due to input sanitisation. return false; -- cgit v1.2.3-freya From c9e9129373a41b1ffe3a8d345b10a3a9a0ce48ee Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 24 Jun 2022 00:47:55 +0900 Subject: fix #8861 --- packages/client/src/pages/theme-editor.vue | 146 +++++++++++++------------ packages/client/src/scripts/use-leave-guard.ts | 2 + 2 files changed, 76 insertions(+), 72 deletions(-) (limited to 'packages/client/src/scripts') diff --git a/packages/client/src/pages/theme-editor.vue b/packages/client/src/pages/theme-editor.vue index 38f3b90a6e..3525543531 100644 --- a/packages/client/src/pages/theme-editor.vue +++ b/packages/client/src/pages/theme-editor.vue @@ -1,68 +1,70 @@ - @@ -62,7 +63,7 @@ export default defineComponent({ const thumbEl = ref(); const rawValue = ref((props.modelValue - props.min) / (props.max - props.min)); - const steppedValue = computed(() => { + const steppedRawValue = computed(() => { if (props.step) { const step = props.step / (props.max - props.min); return (step * Math.round(rawValue.value / step)); @@ -71,7 +72,11 @@ export default defineComponent({ } }); const finalValue = computed(() => { - return (steppedValue.value * (props.max - props.min)) + props.min; + if (Number.isInteger(props.step)) { + return Math.round((steppedRawValue.value * (props.max - props.min)) + props.min); + } else { + return (steppedRawValue.value * (props.max - props.min)) + props.min; + } }); watch(finalValue, () => { context.emit('update:modelValue', finalValue.value); @@ -86,10 +91,10 @@ export default defineComponent({ if (containerEl.value == null) { thumbPosition.value = 0; } else { - thumbPosition.value = (containerEl.value.offsetWidth - thumbWidth.value) * steppedValue.value; + thumbPosition.value = (containerEl.value.offsetWidth - thumbWidth.value) * steppedRawValue.value; } }; - watch([steppedValue, containerEl], calcThumbPosition); + watch([steppedRawValue, containerEl], calcThumbPosition); let ro: ResizeObserver | undefined; @@ -154,7 +159,7 @@ export default defineComponent({ return { rawValue, finalValue, - steppedValue, + steppedRawValue, onMousedown, containerEl, thumbEl, diff --git a/packages/client/src/components/global/router-view.vue b/packages/client/src/components/global/router-view.vue index 56b53e0127..7138faaa9d 100644 --- a/packages/client/src/components/global/router-view.vue +++ b/packages/client/src/components/global/router-view.vue @@ -1,5 +1,5 @@ @@ -7,6 +7,7 @@ + + diff --git a/packages/client/src/scripts/upload.ts b/packages/client/src/scripts/upload.ts index 2f7b30b58d..2f907e5e84 100644 --- a/packages/client/src/scripts/upload.ts +++ b/packages/client/src/scripts/upload.ts @@ -1,9 +1,9 @@ import { reactive, ref } from 'vue'; +import * as Misskey from 'misskey-js'; +import { readAndCompressImage } from 'browser-image-resizer'; import { defaultStore } from '@/store'; import { apiUrl } from '@/config'; -import * as Misskey from 'misskey-js'; import { $i } from '@/account'; -import { readAndCompressImage } from 'browser-image-resizer'; import { alert } from '@/os'; type Uploading = { @@ -31,7 +31,7 @@ export function uploadFile( file: File, folder?: any, name?: string, - keepOriginal: boolean = defaultStore.state.keepOriginalUploading + keepOriginal: boolean = defaultStore.state.keepOriginalUploading, ): Promise { if (folder && typeof folder === 'object') folder = folder.id; @@ -45,7 +45,7 @@ export function uploadFile( name: name || file.name || 'untitled', progressMax: undefined, progressValue: undefined, - img: window.URL.createObjectURL(file) + img: window.URL.createObjectURL(file), }); uploads.value.push(ctx); @@ -86,7 +86,7 @@ export function uploadFile( alert({ type: 'error', title: 'Failed to upload', - text: `${JSON.stringify(ev.target?.response)}, ${JSON.stringify(xhr.response)}` + text: `${JSON.stringify(ev.target?.response)}, ${JSON.stringify(xhr.response)}`, }); reject(); -- cgit v1.2.3-freya From 9c6a2208107d8046c2f9c7eb302363cc214a8861 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 2 Jul 2022 22:07:04 +0900 Subject: chore(client): tweak ui --- packages/client/src/components/form/range.vue | 3 +- packages/client/src/components/marquee.vue | 4 +- packages/client/src/scripts/use-interval.ts | 2 + packages/client/src/widgets/rss-marquee.vue | 63 ++++++++++++++++----------- 4 files changed, 45 insertions(+), 27 deletions(-) (limited to 'packages/client/src/scripts') diff --git a/packages/client/src/components/form/range.vue b/packages/client/src/components/form/range.vue index d46174acc1..387ad26f3d 100644 --- a/packages/client/src/components/form/range.vue +++ b/packages/client/src/components/form/range.vue @@ -6,7 +6,7 @@

@@ -27,6 +27,7 @@ const props = withDefaults(defineProps<{ max: number; step?: number; textConverter?: (value: number) => string, + showTicks?: boolean; }>(), { step: 1, textConverter: (v) => v.toString(), diff --git a/packages/client/src/components/marquee.vue b/packages/client/src/components/marquee.vue index 2fd76a54f0..4685033517 100644 --- a/packages/client/src/components/marquee.vue +++ b/packages/client/src/components/marquee.vue @@ -1,5 +1,5 @@ diff --git a/packages/client/src/components/ui/menu.vue b/packages/client/src/components/ui/menu.vue index 6ad63c2ad7..26283ffe55 100644 --- a/packages/client/src/components/ui/menu.vue +++ b/packages/client/src/components/ui/menu.vue @@ -1,55 +1,67 @@ diff --git a/packages/client/src/components/MkAbuseReportWindow.vue b/packages/client/src/components/MkAbuseReportWindow.vue new file mode 100644 index 0000000000..6b8e36c4da --- /dev/null +++ b/packages/client/src/components/MkAbuseReportWindow.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/packages/client/src/components/MkAnalogClock.vue b/packages/client/src/components/MkAnalogClock.vue new file mode 100644 index 0000000000..b709a22548 --- /dev/null +++ b/packages/client/src/components/MkAnalogClock.vue @@ -0,0 +1,219 @@ + + + + + diff --git a/packages/client/src/components/MkAutocomplete.vue b/packages/client/src/components/MkAutocomplete.vue new file mode 100644 index 0000000000..144281e3c3 --- /dev/null +++ b/packages/client/src/components/MkAutocomplete.vue @@ -0,0 +1,474 @@ + + + + + + + diff --git a/packages/client/src/components/MkAvatars.vue b/packages/client/src/components/MkAvatars.vue new file mode 100644 index 0000000000..958e5db0a1 --- /dev/null +++ b/packages/client/src/components/MkAvatars.vue @@ -0,0 +1,24 @@ + + + diff --git a/packages/client/src/components/MkCaptcha.vue b/packages/client/src/components/MkCaptcha.vue new file mode 100644 index 0000000000..7360734914 --- /dev/null +++ b/packages/client/src/components/MkCaptcha.vue @@ -0,0 +1,114 @@ + + + diff --git a/packages/client/src/components/MkChannelFollowButton.vue b/packages/client/src/components/MkChannelFollowButton.vue new file mode 100644 index 0000000000..dff02beec0 --- /dev/null +++ b/packages/client/src/components/MkChannelFollowButton.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/packages/client/src/components/MkChannelPreview.vue b/packages/client/src/components/MkChannelPreview.vue new file mode 100644 index 0000000000..dd3794a657 --- /dev/null +++ b/packages/client/src/components/MkChannelPreview.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/packages/client/src/components/MkChart.vue b/packages/client/src/components/MkChart.vue new file mode 100644 index 0000000000..31e95404fa --- /dev/null +++ b/packages/client/src/components/MkChart.vue @@ -0,0 +1,880 @@ + + + + + diff --git a/packages/client/src/components/MkChartTooltip.vue b/packages/client/src/components/MkChartTooltip.vue new file mode 100644 index 0000000000..9b57a1b3d5 --- /dev/null +++ b/packages/client/src/components/MkChartTooltip.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/packages/client/src/components/MkCode.core.vue b/packages/client/src/components/MkCode.core.vue new file mode 100644 index 0000000000..b074028821 --- /dev/null +++ b/packages/client/src/components/MkCode.core.vue @@ -0,0 +1,20 @@ + + + + diff --git a/packages/client/src/components/MkCode.vue b/packages/client/src/components/MkCode.vue new file mode 100644 index 0000000000..1640258d5b --- /dev/null +++ b/packages/client/src/components/MkCode.vue @@ -0,0 +1,15 @@ + + + diff --git a/packages/client/src/components/MkCropperDialog.vue b/packages/client/src/components/MkCropperDialog.vue new file mode 100644 index 0000000000..c320b21d72 --- /dev/null +++ b/packages/client/src/components/MkCropperDialog.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue new file mode 100644 index 0000000000..dd906f9bf3 --- /dev/null +++ b/packages/client/src/components/MkCwButton.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/packages/client/src/components/MkDateSeparatedList.vue b/packages/client/src/components/MkDateSeparatedList.vue new file mode 100644 index 0000000000..f63d9782b6 --- /dev/null +++ b/packages/client/src/components/MkDateSeparatedList.vue @@ -0,0 +1,187 @@ + + + diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue new file mode 100644 index 0000000000..b090f3cb4e --- /dev/null +++ b/packages/client/src/components/MkDialog.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/packages/client/src/components/MkDigitalClock.vue b/packages/client/src/components/MkDigitalClock.vue new file mode 100644 index 0000000000..9ed8d63d19 --- /dev/null +++ b/packages/client/src/components/MkDigitalClock.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/packages/client/src/components/MkDrive.file.vue b/packages/client/src/components/MkDrive.file.vue new file mode 100644 index 0000000000..22916d5680 --- /dev/null +++ b/packages/client/src/components/MkDrive.file.vue @@ -0,0 +1,340 @@ + + + + + diff --git a/packages/client/src/components/MkDrive.folder.vue b/packages/client/src/components/MkDrive.folder.vue new file mode 100644 index 0000000000..e55fa4f0f2 --- /dev/null +++ b/packages/client/src/components/MkDrive.folder.vue @@ -0,0 +1,315 @@ + + + + + diff --git a/packages/client/src/components/MkDrive.navFolder.vue b/packages/client/src/components/MkDrive.navFolder.vue new file mode 100644 index 0000000000..5482703317 --- /dev/null +++ b/packages/client/src/components/MkDrive.navFolder.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/packages/client/src/components/MkDrive.vue b/packages/client/src/components/MkDrive.vue new file mode 100644 index 0000000000..9f0016adc2 --- /dev/null +++ b/packages/client/src/components/MkDrive.vue @@ -0,0 +1,786 @@ + + + + + diff --git a/packages/client/src/components/MkDriveFileThumbnail.vue b/packages/client/src/components/MkDriveFileThumbnail.vue new file mode 100644 index 0000000000..de65d2f25b --- /dev/null +++ b/packages/client/src/components/MkDriveFileThumbnail.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/packages/client/src/components/MkDriveSelectDialog.vue b/packages/client/src/components/MkDriveSelectDialog.vue new file mode 100644 index 0000000000..95a9a6fdb5 --- /dev/null +++ b/packages/client/src/components/MkDriveSelectDialog.vue @@ -0,0 +1,58 @@ + + + diff --git a/packages/client/src/components/MkDriveWindow.vue b/packages/client/src/components/MkDriveWindow.vue new file mode 100644 index 0000000000..113aabb9f3 --- /dev/null +++ b/packages/client/src/components/MkDriveWindow.vue @@ -0,0 +1,30 @@ + + + diff --git a/packages/client/src/components/MkEmojiPicker.section.vue b/packages/client/src/components/MkEmojiPicker.section.vue new file mode 100644 index 0000000000..e2a80d5466 --- /dev/null +++ b/packages/client/src/components/MkEmojiPicker.section.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue new file mode 100644 index 0000000000..3de0afbf50 --- /dev/null +++ b/packages/client/src/components/MkEmojiPicker.vue @@ -0,0 +1,562 @@ + + + + + diff --git a/packages/client/src/components/MkEmojiPickerDialog.vue b/packages/client/src/components/MkEmojiPickerDialog.vue new file mode 100644 index 0000000000..94e66b971a --- /dev/null +++ b/packages/client/src/components/MkEmojiPickerDialog.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/packages/client/src/components/MkEmojiPickerWindow.vue b/packages/client/src/components/MkEmojiPickerWindow.vue new file mode 100644 index 0000000000..a1a2fd9328 --- /dev/null +++ b/packages/client/src/components/MkEmojiPickerWindow.vue @@ -0,0 +1,180 @@ + + + + + diff --git a/packages/client/src/components/MkFeaturedPhotos.vue b/packages/client/src/components/MkFeaturedPhotos.vue new file mode 100644 index 0000000000..e58b5d2849 --- /dev/null +++ b/packages/client/src/components/MkFeaturedPhotos.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/packages/client/src/components/MkFileListForAdmin.vue b/packages/client/src/components/MkFileListForAdmin.vue new file mode 100644 index 0000000000..e03b8b94d8 --- /dev/null +++ b/packages/client/src/components/MkFileListForAdmin.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/packages/client/src/components/MkFileTypeIcon.vue b/packages/client/src/components/MkFileTypeIcon.vue new file mode 100644 index 0000000000..11d28188cc --- /dev/null +++ b/packages/client/src/components/MkFileTypeIcon.vue @@ -0,0 +1,15 @@ + + + diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue new file mode 100644 index 0000000000..efee795e43 --- /dev/null +++ b/packages/client/src/components/MkFollowButton.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/packages/client/src/components/MkForgotPassword.vue b/packages/client/src/components/MkForgotPassword.vue new file mode 100644 index 0000000000..6ed89d45d7 --- /dev/null +++ b/packages/client/src/components/MkForgotPassword.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/packages/client/src/components/MkFormDialog.vue b/packages/client/src/components/MkFormDialog.vue new file mode 100644 index 0000000000..f05dde16f8 --- /dev/null +++ b/packages/client/src/components/MkFormDialog.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/packages/client/src/components/MkFormula.vue b/packages/client/src/components/MkFormula.vue new file mode 100644 index 0000000000..65a2fee930 --- /dev/null +++ b/packages/client/src/components/MkFormula.vue @@ -0,0 +1,24 @@ + + + diff --git a/packages/client/src/components/MkFormulaCore.vue b/packages/client/src/components/MkFormulaCore.vue new file mode 100644 index 0000000000..8db8932fcd --- /dev/null +++ b/packages/client/src/components/MkFormulaCore.vue @@ -0,0 +1,34 @@ + + + + + + diff --git a/packages/client/src/components/MkGalleryPostPreview.vue b/packages/client/src/components/MkGalleryPostPreview.vue new file mode 100644 index 0000000000..cef9b2a394 --- /dev/null +++ b/packages/client/src/components/MkGalleryPostPreview.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/packages/client/src/components/MkGoogle.vue b/packages/client/src/components/MkGoogle.vue new file mode 100644 index 0000000000..bb4b439ee8 --- /dev/null +++ b/packages/client/src/components/MkGoogle.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/packages/client/src/components/MkImageViewer.vue b/packages/client/src/components/MkImageViewer.vue new file mode 100644 index 0000000000..7bc88399ef --- /dev/null +++ b/packages/client/src/components/MkImageViewer.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/packages/client/src/components/MkImgWithBlurhash.vue b/packages/client/src/components/MkImgWithBlurhash.vue new file mode 100644 index 0000000000..80d7c201a4 --- /dev/null +++ b/packages/client/src/components/MkImgWithBlurhash.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/packages/client/src/components/MkInstanceCardMini.vue b/packages/client/src/components/MkInstanceCardMini.vue new file mode 100644 index 0000000000..f6e2f4eaa7 --- /dev/null +++ b/packages/client/src/components/MkInstanceCardMini.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/packages/client/src/components/MkInstanceStats.vue b/packages/client/src/components/MkInstanceStats.vue new file mode 100644 index 0000000000..0437e05fad --- /dev/null +++ b/packages/client/src/components/MkInstanceStats.vue @@ -0,0 +1,220 @@ + + + + + diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue new file mode 100644 index 0000000000..d9f196f887 --- /dev/null +++ b/packages/client/src/components/MkInstanceTicker.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/packages/client/src/components/MkKeyValue.vue b/packages/client/src/components/MkKeyValue.vue new file mode 100644 index 0000000000..586f7a3f9d --- /dev/null +++ b/packages/client/src/components/MkKeyValue.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/packages/client/src/components/MkLaunchPad.vue b/packages/client/src/components/MkLaunchPad.vue new file mode 100644 index 0000000000..7891f61bf1 --- /dev/null +++ b/packages/client/src/components/MkLaunchPad.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/packages/client/src/components/MkLink.vue b/packages/client/src/components/MkLink.vue new file mode 100644 index 0000000000..649523abc2 --- /dev/null +++ b/packages/client/src/components/MkLink.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/packages/client/src/components/MkMarquee.vue b/packages/client/src/components/MkMarquee.vue new file mode 100644 index 0000000000..5ca04b0b48 --- /dev/null +++ b/packages/client/src/components/MkMarquee.vue @@ -0,0 +1,106 @@ + + + diff --git a/packages/client/src/components/MkMediaBanner.vue b/packages/client/src/components/MkMediaBanner.vue new file mode 100644 index 0000000000..5093f11e97 --- /dev/null +++ b/packages/client/src/components/MkMediaBanner.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/packages/client/src/components/MkMediaCaption.vue b/packages/client/src/components/MkMediaCaption.vue new file mode 100644 index 0000000000..feed3854f9 --- /dev/null +++ b/packages/client/src/components/MkMediaCaption.vue @@ -0,0 +1,263 @@ + + + + + diff --git a/packages/client/src/components/MkMediaImage.vue b/packages/client/src/components/MkMediaImage.vue new file mode 100644 index 0000000000..92f1bd2dbd --- /dev/null +++ b/packages/client/src/components/MkMediaImage.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue new file mode 100644 index 0000000000..c6f8612182 --- /dev/null +++ b/packages/client/src/components/MkMediaList.vue @@ -0,0 +1,189 @@ + + + + + + + diff --git a/packages/client/src/components/MkMediaVideo.vue b/packages/client/src/components/MkMediaVideo.vue new file mode 100644 index 0000000000..5c38691e69 --- /dev/null +++ b/packages/client/src/components/MkMediaVideo.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/packages/client/src/components/MkMention.vue b/packages/client/src/components/MkMention.vue new file mode 100644 index 0000000000..3091b435e4 --- /dev/null +++ b/packages/client/src/components/MkMention.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/packages/client/src/components/MkMiniChart.vue b/packages/client/src/components/MkMiniChart.vue new file mode 100644 index 0000000000..c64ce163f9 --- /dev/null +++ b/packages/client/src/components/MkMiniChart.vue @@ -0,0 +1,73 @@ + + + diff --git a/packages/client/src/components/MkModalPageWindow.vue b/packages/client/src/components/MkModalPageWindow.vue new file mode 100644 index 0000000000..2fed0d35e8 --- /dev/null +++ b/packages/client/src/components/MkModalPageWindow.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue new file mode 100644 index 0000000000..efe786ba4b --- /dev/null +++ b/packages/client/src/components/MkNote.vue @@ -0,0 +1,648 @@ + + + + + diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue new file mode 100644 index 0000000000..0bf8f330ba --- /dev/null +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -0,0 +1,601 @@ + + + + + diff --git a/packages/client/src/components/MkNoteHeader.vue b/packages/client/src/components/MkNoteHeader.vue new file mode 100644 index 0000000000..333c3ddbd9 --- /dev/null +++ b/packages/client/src/components/MkNoteHeader.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/packages/client/src/components/MkNotePreview.vue b/packages/client/src/components/MkNotePreview.vue new file mode 100644 index 0000000000..a78b499654 --- /dev/null +++ b/packages/client/src/components/MkNotePreview.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/packages/client/src/components/MkNoteSimple.vue b/packages/client/src/components/MkNoteSimple.vue new file mode 100644 index 0000000000..1bbbe0e1a6 --- /dev/null +++ b/packages/client/src/components/MkNoteSimple.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index 9ae773bfb6..a69336f8a1 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -10,7 +10,7 @@

- +

@@ -27,9 +27,9 @@ + + diff --git a/packages/client/src/components/MkNotification.vue b/packages/client/src/components/MkNotification.vue new file mode 100644 index 0000000000..c00e9fbf42 --- /dev/null +++ b/packages/client/src/components/MkNotification.vue @@ -0,0 +1,309 @@ + + + + + diff --git a/packages/client/src/components/MkNotificationSettingWindow.vue b/packages/client/src/components/MkNotificationSettingWindow.vue new file mode 100644 index 0000000000..bf0a148f59 --- /dev/null +++ b/packages/client/src/components/MkNotificationSettingWindow.vue @@ -0,0 +1,87 @@ + + + diff --git a/packages/client/src/components/MkNotificationToast.vue b/packages/client/src/components/MkNotificationToast.vue new file mode 100644 index 0000000000..398f64d544 --- /dev/null +++ b/packages/client/src/components/MkNotificationToast.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/packages/client/src/components/MkNotifications.vue b/packages/client/src/components/MkNotifications.vue new file mode 100644 index 0000000000..1ee091a229 --- /dev/null +++ b/packages/client/src/components/MkNotifications.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/packages/client/src/components/MkNumberDiff.vue b/packages/client/src/components/MkNumberDiff.vue new file mode 100644 index 0000000000..e7d4a5472a --- /dev/null +++ b/packages/client/src/components/MkNumberDiff.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/packages/client/src/components/MkObjectView.value.vue b/packages/client/src/components/MkObjectView.value.vue new file mode 100644 index 0000000000..0c7230d783 --- /dev/null +++ b/packages/client/src/components/MkObjectView.value.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/packages/client/src/components/MkObjectView.vue b/packages/client/src/components/MkObjectView.vue new file mode 100644 index 0000000000..55578a37f6 --- /dev/null +++ b/packages/client/src/components/MkObjectView.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/packages/client/src/components/MkPagePreview.vue b/packages/client/src/components/MkPagePreview.vue new file mode 100644 index 0000000000..009582e540 --- /dev/null +++ b/packages/client/src/components/MkPagePreview.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/packages/client/src/components/MkPageWindow.vue b/packages/client/src/components/MkPageWindow.vue new file mode 100644 index 0000000000..76eb77825f --- /dev/null +++ b/packages/client/src/components/MkPageWindow.vue @@ -0,0 +1,144 @@ + + + + + diff --git a/packages/client/src/components/MkPoll.vue b/packages/client/src/components/MkPoll.vue new file mode 100644 index 0000000000..d90af1cfee --- /dev/null +++ b/packages/client/src/components/MkPoll.vue @@ -0,0 +1,152 @@ + + + + + diff --git a/packages/client/src/components/MkPollEditor.vue b/packages/client/src/components/MkPollEditor.vue new file mode 100644 index 0000000000..6c1a4cc89f --- /dev/null +++ b/packages/client/src/components/MkPollEditor.vue @@ -0,0 +1,219 @@ + + + + + diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue new file mode 100644 index 0000000000..a499a62dde --- /dev/null +++ b/packages/client/src/components/MkPostForm.vue @@ -0,0 +1,987 @@ + - - - - diff --git a/packages/client/src/components/media-image.vue b/packages/client/src/components/media-image.vue deleted file mode 100644 index 9d417bd99f..0000000000 --- a/packages/client/src/components/media-image.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - - - diff --git a/packages/client/src/components/media-list.vue b/packages/client/src/components/media-list.vue deleted file mode 100644 index 7e330575e1..0000000000 --- a/packages/client/src/components/media-list.vue +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - diff --git a/packages/client/src/components/media-video.vue b/packages/client/src/components/media-video.vue deleted file mode 100644 index 5c38691e69..0000000000 --- a/packages/client/src/components/media-video.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - - - diff --git a/packages/client/src/components/mention.vue b/packages/client/src/components/mention.vue deleted file mode 100644 index 3091b435e4..0000000000 --- a/packages/client/src/components/mention.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts index 16ae45bfe1..688857a499 100644 --- a/packages/client/src/components/mfm.ts +++ b/packages/client/src/components/mfm.ts @@ -1,15 +1,15 @@ import { VNode, defineComponent, h } from 'vue'; import * as mfm from 'mfm-js'; -import MkUrl from '@/components/global/url.vue'; -import MkLink from '@/components/link.vue'; -import MkMention from '@/components/mention.vue'; -import MkEmoji from '@/components/global/emoji.vue'; +import MkUrl from '@/components/global/MkUrl.vue'; +import MkLink from '@/components/MkLink.vue'; +import MkMention from '@/components/MkMention.vue'; +import MkEmoji from '@/components/global/MkEmoji.vue'; import { concat } from '@/scripts/array'; -import MkFormula from '@/components/formula.vue'; -import MkCode from '@/components/code.vue'; -import MkGoogle from '@/components/google.vue'; -import MkSparkle from '@/components/sparkle.vue'; -import MkA from '@/components/global/a.vue'; +import MkFormula from '@/components/MkFormula.vue'; +import MkCode from '@/components/MkCode.vue'; +import MkGoogle from '@/components/MkGoogle.vue'; +import MkSparkle from '@/components/MkSparkle.vue'; +import MkA from '@/components/global/MkA.vue'; import { host } from '@/config'; import { MFM_TAGS } from '@/scripts/mfm-tags'; diff --git a/packages/client/src/components/mini-chart.vue b/packages/client/src/components/mini-chart.vue deleted file mode 100644 index c64ce163f9..0000000000 --- a/packages/client/src/components/mini-chart.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - diff --git a/packages/client/src/components/modal-page-window.vue b/packages/client/src/components/modal-page-window.vue deleted file mode 100644 index 2fed0d35e8..0000000000 --- a/packages/client/src/components/modal-page-window.vue +++ /dev/null @@ -1,181 +0,0 @@ - - - - - diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue deleted file mode 100644 index 1e0625b6c9..0000000000 --- a/packages/client/src/components/note-detailed.vue +++ /dev/null @@ -1,601 +0,0 @@ - - - - - diff --git a/packages/client/src/components/note-header.vue b/packages/client/src/components/note-header.vue deleted file mode 100644 index 0b05498566..0000000000 --- a/packages/client/src/components/note-header.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - - - diff --git a/packages/client/src/components/note-preview.vue b/packages/client/src/components/note-preview.vue deleted file mode 100644 index a78b499654..0000000000 --- a/packages/client/src/components/note-preview.vue +++ /dev/null @@ -1,92 +0,0 @@ - - - - - diff --git a/packages/client/src/components/note-simple.vue b/packages/client/src/components/note-simple.vue deleted file mode 100644 index b813b9a2b9..0000000000 --- a/packages/client/src/components/note-simple.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - - - diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue deleted file mode 100644 index 0279f014c6..0000000000 --- a/packages/client/src/components/note.vue +++ /dev/null @@ -1,648 +0,0 @@ - - - - - diff --git a/packages/client/src/components/notes.vue b/packages/client/src/components/notes.vue deleted file mode 100644 index e351a76eb5..0000000000 --- a/packages/client/src/components/notes.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - diff --git a/packages/client/src/components/notification-setting-window.vue b/packages/client/src/components/notification-setting-window.vue deleted file mode 100644 index bf0a148f59..0000000000 --- a/packages/client/src/components/notification-setting-window.vue +++ /dev/null @@ -1,87 +0,0 @@ - - - diff --git a/packages/client/src/components/notification-toast.vue b/packages/client/src/components/notification-toast.vue deleted file mode 100644 index b808647bb4..0000000000 --- a/packages/client/src/components/notification-toast.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - - diff --git a/packages/client/src/components/notification.vue b/packages/client/src/components/notification.vue deleted file mode 100644 index 9589970a44..0000000000 --- a/packages/client/src/components/notification.vue +++ /dev/null @@ -1,309 +0,0 @@ - - - - - diff --git a/packages/client/src/components/notifications.vue b/packages/client/src/components/notifications.vue deleted file mode 100644 index baac2fdca2..0000000000 --- a/packages/client/src/components/notifications.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - - - diff --git a/packages/client/src/components/number-diff.vue b/packages/client/src/components/number-diff.vue deleted file mode 100644 index e7d4a5472a..0000000000 --- a/packages/client/src/components/number-diff.vue +++ /dev/null @@ -1,47 +0,0 @@ - - - - - diff --git a/packages/client/src/components/object-view.value.vue b/packages/client/src/components/object-view.value.vue deleted file mode 100644 index 0c7230d783..0000000000 --- a/packages/client/src/components/object-view.value.vue +++ /dev/null @@ -1,160 +0,0 @@ - - - - - diff --git a/packages/client/src/components/object-view.vue b/packages/client/src/components/object-view.vue deleted file mode 100644 index db66049fce..0000000000 --- a/packages/client/src/components/object-view.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/packages/client/src/components/page-preview.vue b/packages/client/src/components/page-preview.vue deleted file mode 100644 index 009582e540..0000000000 --- a/packages/client/src/components/page-preview.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - - diff --git a/packages/client/src/components/page-window.vue b/packages/client/src/components/page-window.vue deleted file mode 100644 index 43d75b0cf9..0000000000 --- a/packages/client/src/components/page-window.vue +++ /dev/null @@ -1,144 +0,0 @@ - - - - - diff --git a/packages/client/src/components/page/page.image.vue b/packages/client/src/components/page/page.image.vue index 6e38a9f424..8ba70c5855 100644 --- a/packages/client/src/components/page/page.image.vue +++ b/packages/client/src/components/page/page.image.vue @@ -6,7 +6,7 @@ - - diff --git a/packages/client/src/components/poll.vue b/packages/client/src/components/poll.vue deleted file mode 100644 index d90af1cfee..0000000000 --- a/packages/client/src/components/poll.vue +++ /dev/null @@ -1,152 +0,0 @@ - - - - - diff --git a/packages/client/src/components/post-form-attaches.vue b/packages/client/src/components/post-form-attaches.vue deleted file mode 100644 index 98bf2df09a..0000000000 --- a/packages/client/src/components/post-form-attaches.vue +++ /dev/null @@ -1,192 +0,0 @@ - - - - - diff --git a/packages/client/src/components/post-form-dialog.vue b/packages/client/src/components/post-form-dialog.vue deleted file mode 100644 index dc4e842059..0000000000 --- a/packages/client/src/components/post-form-dialog.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/client/src/components/post-form.vue b/packages/client/src/components/post-form.vue deleted file mode 100644 index 6dfb2edcb8..0000000000 --- a/packages/client/src/components/post-form.vue +++ /dev/null @@ -1,987 +0,0 @@ -

{{ page.title }}

{{ page.title }}