mirror of
				https://codeberg.org/yeentown/barkey.git
				synced 2025-11-04 07:24:13 +00:00 
			
		
		
		
	refactor
This commit is contained in:
		
							parent
							
								
									3cb0cc7989
								
							
						
					
					
						commit
						f0a70a70c3
					
				
					 10 changed files with 28 additions and 28 deletions
				
			
		| 
						 | 
					@ -19,7 +19,7 @@
 | 
				
			||||||
				:ad="true"
 | 
									:ad="true"
 | 
				
			||||||
				:class="$style.notes"
 | 
									:class="$style.notes"
 | 
				
			||||||
			>
 | 
								>
 | 
				
			||||||
				<XNote :key="note._featuredId_ || note._prId_ || note.id" :class="$style.note" :note="note"/>
 | 
									<MkNote :key="note._featuredId_ || note._prId_ || note.id" :class="$style.note" :note="note"/>
 | 
				
			||||||
			</MkDateSeparatedList>
 | 
								</MkDateSeparatedList>
 | 
				
			||||||
		</div>
 | 
							</div>
 | 
				
			||||||
	</template>
 | 
						</template>
 | 
				
			||||||
| 
						 | 
					@ -28,7 +28,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<script lang="ts" setup>
 | 
					<script lang="ts" setup>
 | 
				
			||||||
import { shallowRef } from 'vue';
 | 
					import { shallowRef } from 'vue';
 | 
				
			||||||
import XNote from '@/components/MkNote.vue';
 | 
					import MkNote from '@/components/MkNote.vue';
 | 
				
			||||||
import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
 | 
					import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
 | 
				
			||||||
import MkPagination, { Paging } from '@/components/MkPagination.vue';
 | 
					import MkPagination, { Paging } from '@/components/MkPagination.vue';
 | 
				
			||||||
import { i18n } from '@/i18n';
 | 
					import { i18n } from '@/i18n';
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,7 +9,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<template #default="{ items: notifications }">
 | 
						<template #default="{ items: notifications }">
 | 
				
			||||||
		<MkDateSeparatedList v-slot="{ item: notification }" :class="$style.list" :items="notifications" :no-gap="true">
 | 
							<MkDateSeparatedList v-slot="{ item: notification }" :class="$style.list" :items="notifications" :no-gap="true">
 | 
				
			||||||
			<XNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="notification.id" :note="notification.note"/>
 | 
								<MkNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="notification.id" :note="notification.note"/>
 | 
				
			||||||
			<XNotification v-else :key="notification.id" :notification="notification" :with-time="true" :full="true" class="_panel notification"/>
 | 
								<XNotification v-else :key="notification.id" :notification="notification" :with-time="true" :full="true" class="_panel notification"/>
 | 
				
			||||||
		</MkDateSeparatedList>
 | 
							</MkDateSeparatedList>
 | 
				
			||||||
	</template>
 | 
						</template>
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,7 @@ import { onUnmounted, onMounted, computed, shallowRef } from 'vue';
 | 
				
			||||||
import MkPagination, { Paging } from '@/components/MkPagination.vue';
 | 
					import MkPagination, { Paging } from '@/components/MkPagination.vue';
 | 
				
			||||||
import XNotification from '@/components/MkNotification.vue';
 | 
					import XNotification from '@/components/MkNotification.vue';
 | 
				
			||||||
import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
 | 
					import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
 | 
				
			||||||
import XNote from '@/components/MkNote.vue';
 | 
					import MkNote from '@/components/MkNote.vue';
 | 
				
			||||||
import { stream } from '@/stream';
 | 
					import { stream } from '@/stream';
 | 
				
			||||||
import { $i } from '@/account';
 | 
					import { $i } from '@/account';
 | 
				
			||||||
import { i18n } from '@/i18n';
 | 
					import { i18n } from '@/i18n';
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -52,7 +52,7 @@
 | 
				
			||||||
		<input v-show="withHashtags" ref="hashtagsInputEl" v-model="hashtags" :class="$style.hashtags" :placeholder="i18n.ts.hashtags" list="hashtags">
 | 
							<input v-show="withHashtags" ref="hashtagsInputEl" v-model="hashtags" :class="$style.hashtags" :placeholder="i18n.ts.hashtags" list="hashtags">
 | 
				
			||||||
		<XPostFormAttaches v-model="files" :class="$style.attaches" @detach="detachFile" @change-sensitive="updateFileSensitive" @change-name="updateFileName"/>
 | 
							<XPostFormAttaches v-model="files" :class="$style.attaches" @detach="detachFile" @change-sensitive="updateFileSensitive" @change-name="updateFileName"/>
 | 
				
			||||||
		<MkPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/>
 | 
							<MkPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/>
 | 
				
			||||||
		<XNotePreview v-if="showPreview" :class="$style.preview" :text="text"/>
 | 
							<MkNotePreview v-if="showPreview" :class="$style.preview" :text="text"/>
 | 
				
			||||||
		<div v-if="showingOptions" style="padding: 0 16px;">
 | 
							<div v-if="showingOptions" style="padding: 0 16px;">
 | 
				
			||||||
			<MkSelect v-model="reactionAcceptance" small>
 | 
								<MkSelect v-model="reactionAcceptance" small>
 | 
				
			||||||
				<template #label>{{ i18n.ts.reactionAcceptance }}</template>
 | 
									<template #label>{{ i18n.ts.reactionAcceptance }}</template>
 | 
				
			||||||
| 
						 | 
					@ -87,7 +87,7 @@ import { toASCII } from 'punycode/';
 | 
				
			||||||
import * as Acct from 'misskey-js/built/acct';
 | 
					import * as Acct from 'misskey-js/built/acct';
 | 
				
			||||||
import MkSelect from './MkSelect.vue';
 | 
					import MkSelect from './MkSelect.vue';
 | 
				
			||||||
import MkNoteSimple from '@/components/MkNoteSimple.vue';
 | 
					import MkNoteSimple from '@/components/MkNoteSimple.vue';
 | 
				
			||||||
import XNotePreview from '@/components/MkNotePreview.vue';
 | 
					import MkNotePreview from '@/components/MkNotePreview.vue';
 | 
				
			||||||
import XPostFormAttaches from '@/components/MkPostFormAttaches.vue';
 | 
					import XPostFormAttaches from '@/components/MkPostFormAttaches.vue';
 | 
				
			||||||
import MkPollEditor from '@/components/MkPollEditor.vue';
 | 
					import MkPollEditor from '@/components/MkPollEditor.vue';
 | 
				
			||||||
import { host, url } from '@/config';
 | 
					import { host, url } from '@/config';
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,21 +1,21 @@
 | 
				
			||||||
<template>
 | 
					<template>
 | 
				
			||||||
<div class="voxdxuby">
 | 
					<div class="voxdxuby">
 | 
				
			||||||
	<XNote v-if="note && !block.detailed" :key="note.id + ':normal'" v-model:note="note"/>
 | 
						<MkNote v-if="note && !block.detailed" :key="note.id + ':normal'" v-model:note="note"/>
 | 
				
			||||||
	<XNoteDetailed v-if="note && block.detailed" :key="note.id + ':detail'" v-model:note="note"/>
 | 
						<MkNoteDetailed v-if="note && block.detailed" :key="note.id + ':detail'" v-model:note="note"/>
 | 
				
			||||||
</div>
 | 
					</div>
 | 
				
			||||||
</template>
 | 
					</template>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<script lang="ts">
 | 
					<script lang="ts">
 | 
				
			||||||
import { defineComponent, onMounted, PropType, Ref, ref } from 'vue';
 | 
					import { defineComponent, onMounted, PropType, Ref, ref } from 'vue';
 | 
				
			||||||
import XNote from '@/components/MkNote.vue';
 | 
					import MkNote from '@/components/MkNote.vue';
 | 
				
			||||||
import XNoteDetailed from '@/components/MkNoteDetailed.vue';
 | 
					import MkNoteDetailed from '@/components/MkNoteDetailed.vue';
 | 
				
			||||||
import * as os from '@/os';
 | 
					import * as os from '@/os';
 | 
				
			||||||
import { NoteBlock } from '@/scripts/hpml/block';
 | 
					import { NoteBlock } from '@/scripts/hpml/block';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default defineComponent({
 | 
					export default defineComponent({
 | 
				
			||||||
	components: {
 | 
						components: {
 | 
				
			||||||
		XNote,
 | 
							MkNote,
 | 
				
			||||||
		XNoteDetailed,
 | 
							MkNoteDetailed,
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
	props: {
 | 
						props: {
 | 
				
			||||||
		block: {
 | 
							block: {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			<template #default="{ items }">
 | 
								<template #default="{ items }">
 | 
				
			||||||
				<MkDateSeparatedList v-slot="{ item }" :items="items" :direction="'down'" :no-gap="false" :ad="false">
 | 
									<MkDateSeparatedList v-slot="{ item }" :items="items" :direction="'down'" :no-gap="false" :ad="false">
 | 
				
			||||||
					<XNote :key="item.id" :note="item.note" :class="$style.note"/>
 | 
										<MkNote :key="item.id" :note="item.note" :class="$style.note"/>
 | 
				
			||||||
				</MkDateSeparatedList>
 | 
									</MkDateSeparatedList>
 | 
				
			||||||
			</template>
 | 
								</template>
 | 
				
			||||||
		</MkPagination>
 | 
							</MkPagination>
 | 
				
			||||||
| 
						 | 
					@ -22,7 +22,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<script lang="ts" setup>
 | 
					<script lang="ts" setup>
 | 
				
			||||||
import MkPagination from '@/components/MkPagination.vue';
 | 
					import MkPagination from '@/components/MkPagination.vue';
 | 
				
			||||||
import XNote from '@/components/MkNote.vue';
 | 
					import MkNote from '@/components/MkNote.vue';
 | 
				
			||||||
import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
 | 
					import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
 | 
				
			||||||
import { i18n } from '@/i18n';
 | 
					import { i18n } from '@/i18n';
 | 
				
			||||||
import { definePageMetadata } from '@/scripts/page-metadata';
 | 
					import { definePageMetadata } from '@/scripts/page-metadata';
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,7 +13,7 @@
 | 
				
			||||||
						<MkButton v-if="!showNext && hasNext" class="load next" @click="showNext = true"><i class="ti ti-chevron-up"></i></MkButton>
 | 
											<MkButton v-if="!showNext && hasNext" class="load next" @click="showNext = true"><i class="ti ti-chevron-up"></i></MkButton>
 | 
				
			||||||
						<div class="note _margin _gaps_s">
 | 
											<div class="note _margin _gaps_s">
 | 
				
			||||||
							<MkRemoteCaution v-if="note.user.host != null" :href="note.url ?? note.uri"/>
 | 
												<MkRemoteCaution v-if="note.user.host != null" :href="note.url ?? note.uri"/>
 | 
				
			||||||
							<XNoteDetailed :key="note.id" v-model:note="note" class="note"/>
 | 
												<MkNoteDetailed :key="note.id" v-model:note="note" class="note"/>
 | 
				
			||||||
						</div>
 | 
											</div>
 | 
				
			||||||
						<div v-if="clips && clips.length > 0" class="clips _margin">
 | 
											<div v-if="clips && clips.length > 0" class="clips _margin">
 | 
				
			||||||
							<div class="title">{{ i18n.ts.clip }}</div>
 | 
												<div class="title">{{ i18n.ts.clip }}</div>
 | 
				
			||||||
| 
						 | 
					@ -41,7 +41,7 @@
 | 
				
			||||||
<script lang="ts" setup>
 | 
					<script lang="ts" setup>
 | 
				
			||||||
import { computed, watch } from 'vue';
 | 
					import { computed, watch } from 'vue';
 | 
				
			||||||
import * as misskey from 'misskey-js';
 | 
					import * as misskey from 'misskey-js';
 | 
				
			||||||
import XNoteDetailed from '@/components/MkNoteDetailed.vue';
 | 
					import MkNoteDetailed from '@/components/MkNoteDetailed.vue';
 | 
				
			||||||
import MkNotes from '@/components/MkNotes.vue';
 | 
					import MkNotes from '@/components/MkNotes.vue';
 | 
				
			||||||
import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
 | 
					import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
 | 
				
			||||||
import MkButton from '@/components/MkButton.vue';
 | 
					import MkButton from '@/components/MkButton.vue';
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,8 +10,8 @@
 | 
				
			||||||
		</MkInput>
 | 
							</MkInput>
 | 
				
			||||||
		<MkSwitch v-model="props.modelValue.detailed"><span>{{ $ts._pages.blocks._note.detailed }}</span></MkSwitch>
 | 
							<MkSwitch v-model="props.modelValue.detailed"><span>{{ $ts._pages.blocks._note.detailed }}</span></MkSwitch>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		<XNote v-if="note && !props.modelValue.detailed" :key="note.id + ':normal'" v-model:note="note" style="margin-bottom: 16px;"/>
 | 
							<MkNote v-if="note && !props.modelValue.detailed" :key="note.id + ':normal'" v-model:note="note" style="margin-bottom: 16px;"/>
 | 
				
			||||||
		<XNoteDetailed v-if="note && props.modelValue.detailed" :key="note.id + ':detail'" v-model:note="note" style="margin-bottom: 16px;"/>
 | 
							<MkNoteDetailed v-if="note && props.modelValue.detailed" :key="note.id + ':detail'" v-model:note="note" style="margin-bottom: 16px;"/>
 | 
				
			||||||
	</section>
 | 
						</section>
 | 
				
			||||||
</XContainer>
 | 
					</XContainer>
 | 
				
			||||||
</template>
 | 
					</template>
 | 
				
			||||||
| 
						 | 
					@ -22,8 +22,8 @@ import { watch } from 'vue';
 | 
				
			||||||
import XContainer from '../page-editor.container.vue';
 | 
					import XContainer from '../page-editor.container.vue';
 | 
				
			||||||
import MkInput from '@/components/MkInput.vue';
 | 
					import MkInput from '@/components/MkInput.vue';
 | 
				
			||||||
import MkSwitch from '@/components/MkSwitch.vue';
 | 
					import MkSwitch from '@/components/MkSwitch.vue';
 | 
				
			||||||
import XNote from '@/components/MkNote.vue';
 | 
					import MkNote from '@/components/MkNote.vue';
 | 
				
			||||||
import XNoteDetailed from '@/components/MkNoteDetailed.vue';
 | 
					import MkNoteDetailed from '@/components/MkNoteDetailed.vue';
 | 
				
			||||||
import * as os from '@/os';
 | 
					import * as os from '@/os';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const props = defineProps<{
 | 
					const props = defineProps<{
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -93,7 +93,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			<div class="contents _gaps">
 | 
								<div class="contents _gaps">
 | 
				
			||||||
				<div v-if="user.pinnedNotes.length > 0" class="_gaps">
 | 
									<div v-if="user.pinnedNotes.length > 0" class="_gaps">
 | 
				
			||||||
					<XNote v-for="note in user.pinnedNotes" :key="note.id" class="note _panel" :note="note" :pinned="true"/>
 | 
										<MkNote v-for="note in user.pinnedNotes" :key="note.id" class="note _panel" :note="note" :pinned="true"/>
 | 
				
			||||||
				</div>
 | 
									</div>
 | 
				
			||||||
				<MkInfo v-else-if="$i && $i.id === user.id">{{ i18n.ts.userPagePinTip }}</MkInfo>
 | 
									<MkInfo v-else-if="$i && $i.id === user.id">{{ i18n.ts.userPagePinTip }}</MkInfo>
 | 
				
			||||||
				<template v-if="narrow">
 | 
									<template v-if="narrow">
 | 
				
			||||||
| 
						 | 
					@ -115,7 +115,7 @@
 | 
				
			||||||
import { defineAsyncComponent, computed, onMounted, onUnmounted } from 'vue';
 | 
					import { defineAsyncComponent, computed, onMounted, onUnmounted } from 'vue';
 | 
				
			||||||
import calcAge from 's-age';
 | 
					import calcAge from 's-age';
 | 
				
			||||||
import * as misskey from 'misskey-js';
 | 
					import * as misskey from 'misskey-js';
 | 
				
			||||||
import XNote from '@/components/MkNote.vue';
 | 
					import MkNote from '@/components/MkNote.vue';
 | 
				
			||||||
import MkFollowButton from '@/components/MkFollowButton.vue';
 | 
					import MkFollowButton from '@/components/MkFollowButton.vue';
 | 
				
			||||||
import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
 | 
					import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
 | 
				
			||||||
import MkOmit from '@/components/MkOmit.vue';
 | 
					import MkOmit from '@/components/MkOmit.vue';
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -38,12 +38,12 @@
 | 
				
			||||||
<script lang="ts">
 | 
					<script lang="ts">
 | 
				
			||||||
import { defineComponent } from 'vue';
 | 
					import { defineComponent } from 'vue';
 | 
				
			||||||
import { toUnicode } from 'punycode/';
 | 
					import { toUnicode } from 'punycode/';
 | 
				
			||||||
 | 
					import XTimeline from './welcome.timeline.vue';
 | 
				
			||||||
import XSigninDialog from '@/components/MkSigninDialog.vue';
 | 
					import XSigninDialog from '@/components/MkSigninDialog.vue';
 | 
				
			||||||
import XSignupDialog from '@/components/MkSignupDialog.vue';
 | 
					import XSignupDialog from '@/components/MkSignupDialog.vue';
 | 
				
			||||||
import MkButton from '@/components/MkButton.vue';
 | 
					import MkButton from '@/components/MkButton.vue';
 | 
				
			||||||
import XNote from '@/components/MkNote.vue';
 | 
					import MkNote from '@/components/MkNote.vue';
 | 
				
			||||||
import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
 | 
					import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
 | 
				
			||||||
import XTimeline from './welcome.timeline.vue';
 | 
					 | 
				
			||||||
import { host, instanceName } from '@/config';
 | 
					import { host, instanceName } from '@/config';
 | 
				
			||||||
import * as os from '@/os';
 | 
					import * as os from '@/os';
 | 
				
			||||||
import number from '@/filters/number';
 | 
					import number from '@/filters/number';
 | 
				
			||||||
| 
						 | 
					@ -51,7 +51,7 @@ import number from '@/filters/number';
 | 
				
			||||||
export default defineComponent({
 | 
					export default defineComponent({
 | 
				
			||||||
	components: {
 | 
						components: {
 | 
				
			||||||
		MkButton,
 | 
							MkButton,
 | 
				
			||||||
		XNote,
 | 
							MkNote,
 | 
				
			||||||
		XTimeline,
 | 
							XTimeline,
 | 
				
			||||||
		MkFeaturedPhotos,
 | 
							MkFeaturedPhotos,
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
| 
						 | 
					@ -118,7 +118,7 @@ export default defineComponent({
 | 
				
			||||||
				text: this.$ts.help,
 | 
									text: this.$ts.help,
 | 
				
			||||||
				icon: 'ti ti-question-circle',
 | 
									icon: 'ti ti-question-circle',
 | 
				
			||||||
				action: () => {
 | 
									action: () => {
 | 
				
			||||||
					window.open(`https://misskey-hub.net/help.md`, '_blank');
 | 
										window.open('https://misskey-hub.net/help.md', '_blank');
 | 
				
			||||||
				},
 | 
									},
 | 
				
			||||||
			}], ev.currentTarget ?? ev.target);
 | 
								}], ev.currentTarget ?? ev.target);
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -61,7 +61,7 @@ import { toUnicode } from 'punycode/';
 | 
				
			||||||
import XSigninDialog from '@/components/MkSigninDialog.vue';
 | 
					import XSigninDialog from '@/components/MkSigninDialog.vue';
 | 
				
			||||||
import XSignupDialog from '@/components/MkSignupDialog.vue';
 | 
					import XSignupDialog from '@/components/MkSignupDialog.vue';
 | 
				
			||||||
import MkButton from '@/components/MkButton.vue';
 | 
					import MkButton from '@/components/MkButton.vue';
 | 
				
			||||||
import XNote from '@/components/MkNote.vue';
 | 
					import MkNote from '@/components/MkNote.vue';
 | 
				
			||||||
import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
 | 
					import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
 | 
				
			||||||
import XTimeline from './welcome.timeline.vue';
 | 
					import XTimeline from './welcome.timeline.vue';
 | 
				
			||||||
import { host, instanceName } from '@/config';
 | 
					import { host, instanceName } from '@/config';
 | 
				
			||||||
| 
						 | 
					@ -71,7 +71,7 @@ import number from '@/filters/number';
 | 
				
			||||||
export default defineComponent({
 | 
					export default defineComponent({
 | 
				
			||||||
	components: {
 | 
						components: {
 | 
				
			||||||
		MkButton,
 | 
							MkButton,
 | 
				
			||||||
		XNote,
 | 
							MkNote,
 | 
				
			||||||
		MkFeaturedPhotos,
 | 
							MkFeaturedPhotos,
 | 
				
			||||||
		XTimeline,
 | 
							XTimeline,
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue