mirror of
https://activitypub.software/TransFem-org/Sharkey.git
synced 2024-12-16 18:29:01 +01:00
a6a91fec3a
* add: safeFloatParserを追加 * fix: 欠けていた型を追加 * refactor: pageBlockTypesをjson-schemaに移植 * refactor: components/global内の型エラーが出ている箇所を修正 * lint: fix null check style * refactor: fix type error * refactor: fix some type errors * fix: 翻訳が抜けていた箇所を修正 * refactor: getJsonSchemaで正しいスキーマが返されるように修正 * fix: MkChartの型エラーとbytesオプションが機能していない問題を修正 * fix(misskey-js): `drive`->`folderUpdated`のpayloadの型が間違っていたのを修正 * refactor: fix some type errors * change: Captcha読み込み中の文言をLoadingに変更 * refactor(backend/misskey-js): MainEventの型を改善 * refactor: chartjs-plugin-gradientが二重でpluginに登録されていたのを修正 * update: misskey-js.api.md * refactor: fix some type errors * fix: backendのtypecheckが落ちていたのを修正 * update: misskey-js.api.md * add: json-schemaのnoteにpollの型定義を追加 * refactor: noteのjson-schemaの型を改善 * refactor: MkPoll * refactor: fix some type errors * change: UserLiteにisLockedを持たせるように * fix: notificationスキーマにroleが含まれていないのを修正 * Revert "change: UserLiteにisLockedを持たせるように" This reverts commit 1bb0c8e7a9b19a4e9f21bf7381712b98f27672a5. * fix: フォロー通知から鍵垢へのフォローを行うと処理中のまま止まってしまう問題を修正 * refactor: noteスキーマのvisibilityにenumを追加 * change: deepCloneのCloneableTypeにundefinedを追加 * refactor: fix some type errors * refactor: `allowEmpty: false`を使用していた箇所を`minLength: 1`に置き換え * enhance: API 'retension' のresponseの型を追加 * fix: Chart関連のtooltipが正しい位置に表示されない問題を修正 * refactor: fix some type errors * fix: 型情報が不足していたのを修正 * enhance: announcementスキーマにenumを追加 * enhance: ロールポリシーの型定義をRoleServiceからjson-schemaに移植 * refactor: policiesを`ref: RolePolicies`に統一 * fix: API `meta` のレスポンスの型にpoliciesが含まれていないのを修正 * refactor: fix some type errors * fix: backendのlintが落ちているのを修正 * fix: MkFoldableSectionの開閉時のanimationが適用されていない問題を修正 * fix: backendのtypecheckが落ちているのを修正 * update: run build-misskey-js-with-types * fix: MkDialogのmount時に文字数制限の判定が行われない問題を修正 * update: CHANGELOG.md * refactor: MkUserSelectDialogの型を改善 * fix: deepCloneでundefinedはcloneしないように (#9207) * change: frontendのcloneをbackend側にも反映 * update: CHANGELOG.md * fix: RoleServiceからPackを通して型RolePoliciesに依存させないように * Update packages/frontend/src/scripts/get-note-summary.ts * revert RoleService.ts changes * change: optional chaining -> non-null assertion * remove: unused import * fix: propsで渡されたuserがUserLiteの場合に意図しない動作になってしまうのを修正 * change: fix null check style * refactor: fix type error * change: fix null check style * Update packages/frontend/src/components/MkDrive.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: css moduleでglobalを使わないように * refactor: roleのiconUrlは必ず存在するものとして扱うように * enhance: MenuButtonのactiveにcomputedを受け付けられるように * Update packages/frontend/src/components/MkNotePreview.vue * Update MkWindow.vue * refactor: notification.noteは必ず存在するものとして扱うように * Update packages/frontend/src/components/MkNotification.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * fix: MkSignupDialogでdoneのemit時にresを含んでいなかったのを修正 * Update packages/frontend/src/scripts/clone.ts Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: 不要な返り値の型を削除 * refactor: 不要なnullチェックを削除 * update: misskey-js-autogen * update: clone.ts * refactor * Update MkNotification.vue * Update MkNotification.vue * ✌️ * Update MkNotification.vue * Update MkNotification.vue * Update MkNotification.vue * Update MkNotifications.vue * Update MkUserSetupDialog.Profile.vue * Update MkUserCardMini.vue * ✌️ * Update MkMenu.vue --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
273 lines
7 KiB
Vue
273 lines
7 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<MkPullToRefresh ref="prComponent" :refresher="() => reloadTimeline()">
|
|
<MkNotes
|
|
v-if="paginationQuery"
|
|
ref="tlComponent"
|
|
:pagination="paginationQuery"
|
|
:noGap="!defaultStore.state.showGapBetweenNotesInTimeline"
|
|
@queue="emit('queue', $event)"
|
|
@status="prComponent?.setDisabled($event)"
|
|
/>
|
|
</MkPullToRefresh>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { computed, watch, onUnmounted, provide, ref, shallowRef } from 'vue';
|
|
import Misskey from 'misskey-js';
|
|
import { Connection } from 'misskey-js/built/streaming.js';
|
|
import MkNotes from '@/components/MkNotes.vue';
|
|
import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
|
|
import { useStream } from '@/stream.js';
|
|
import * as sound from '@/scripts/sound.js';
|
|
import { $i } from '@/account.js';
|
|
import { instance } from '@/instance.js';
|
|
import { defaultStore } from '@/store.js';
|
|
import { Paging } from '@/components/MkPagination.vue';
|
|
|
|
const props = withDefaults(defineProps<{
|
|
src: 'home' | 'local' | 'social' | 'global' | 'mentions' | 'directs' | 'list' | 'antenna' | 'channel' | 'role';
|
|
list?: string;
|
|
antenna?: string;
|
|
channel?: string;
|
|
role?: string;
|
|
sound?: boolean;
|
|
withRenotes?: boolean;
|
|
withReplies?: boolean;
|
|
onlyFiles?: boolean;
|
|
}>(), {
|
|
withRenotes: true,
|
|
withReplies: false,
|
|
onlyFiles: false,
|
|
});
|
|
|
|
const emit = defineEmits<{
|
|
(ev: 'note'): void;
|
|
(ev: 'queue', count: number): void;
|
|
}>();
|
|
|
|
provide('inTimeline', true);
|
|
provide('inChannel', computed(() => props.src === 'channel'));
|
|
|
|
type TimelineQueryType = {
|
|
antennaId?: string,
|
|
withRenotes?: boolean,
|
|
withReplies?: boolean,
|
|
withFiles?: boolean,
|
|
visibility?: string,
|
|
listId?: string,
|
|
channelId?: string,
|
|
roleId?: string
|
|
}
|
|
|
|
const prComponent = shallowRef<InstanceType<typeof MkPullToRefresh>>();
|
|
const tlComponent = shallowRef<InstanceType<typeof MkNotes>>();
|
|
|
|
let tlNotesCount = 0;
|
|
|
|
function prepend(note) {
|
|
if (tlComponent.value == null) return;
|
|
|
|
tlNotesCount++;
|
|
|
|
if (instance.notesPerOneAd > 0 && tlNotesCount % instance.notesPerOneAd === 0) {
|
|
note._shouldInsertAd_ = true;
|
|
}
|
|
|
|
tlComponent.value.pagingComponent?.prepend(note);
|
|
|
|
emit('note');
|
|
|
|
if (props.sound) {
|
|
sound.playMisskeySfx($i && (note.userId === $i.id) ? 'noteMy' : 'note');
|
|
}
|
|
}
|
|
|
|
let connection: Connection;
|
|
let connection2: Connection;
|
|
let paginationQuery: Paging | null = null;
|
|
|
|
const stream = useStream();
|
|
|
|
function connectChannel() {
|
|
if (props.src === 'antenna') {
|
|
if (props.antenna == null) return;
|
|
connection = stream.useChannel('antenna', {
|
|
antennaId: props.antenna,
|
|
});
|
|
} else if (props.src === 'home') {
|
|
connection = stream.useChannel('homeTimeline', {
|
|
withRenotes: props.withRenotes,
|
|
withFiles: props.onlyFiles ? true : undefined,
|
|
});
|
|
connection2 = stream.useChannel('main');
|
|
} else if (props.src === 'local') {
|
|
connection = stream.useChannel('localTimeline', {
|
|
withRenotes: props.withRenotes,
|
|
withReplies: props.withReplies,
|
|
withFiles: props.onlyFiles ? true : undefined,
|
|
});
|
|
} else if (props.src === 'social') {
|
|
connection = stream.useChannel('hybridTimeline', {
|
|
withRenotes: props.withRenotes,
|
|
withReplies: props.withReplies,
|
|
withFiles: props.onlyFiles ? true : undefined,
|
|
});
|
|
} else if (props.src === 'global') {
|
|
connection = stream.useChannel('globalTimeline', {
|
|
withRenotes: props.withRenotes,
|
|
withFiles: props.onlyFiles ? true : undefined,
|
|
});
|
|
} else if (props.src === 'mentions') {
|
|
connection = stream.useChannel('main');
|
|
connection.on('mention', prepend);
|
|
} else if (props.src === 'directs') {
|
|
const onNote = note => {
|
|
if (note.visibility === 'specified') {
|
|
prepend(note);
|
|
}
|
|
};
|
|
connection = stream.useChannel('main');
|
|
connection.on('mention', onNote);
|
|
} else if (props.src === 'list') {
|
|
if (props.list == null) return;
|
|
connection = stream.useChannel('userList', {
|
|
withRenotes: props.withRenotes,
|
|
withFiles: props.onlyFiles ? true : undefined,
|
|
listId: props.list,
|
|
});
|
|
} else if (props.src === 'channel') {
|
|
if (props.channel == null) return;
|
|
connection = stream.useChannel('channel', {
|
|
channelId: props.channel,
|
|
});
|
|
} else if (props.src === 'role') {
|
|
if (props.role == null) return;
|
|
connection = stream.useChannel('roleTimeline', {
|
|
roleId: props.role,
|
|
});
|
|
}
|
|
if (props.src !== 'directs' && props.src !== 'mentions') connection.on('note', prepend);
|
|
}
|
|
|
|
function disconnectChannel() {
|
|
if (connection) connection.dispose();
|
|
if (connection2) connection2.dispose();
|
|
}
|
|
|
|
function updatePaginationQuery() {
|
|
let endpoint: keyof Misskey.Endpoints | null;
|
|
let query: TimelineQueryType | null;
|
|
|
|
if (props.src === 'antenna') {
|
|
endpoint = 'antennas/notes';
|
|
query = {
|
|
antennaId: props.antenna,
|
|
};
|
|
} else if (props.src === 'home') {
|
|
endpoint = 'notes/timeline';
|
|
query = {
|
|
withRenotes: props.withRenotes,
|
|
withFiles: props.onlyFiles ? true : undefined,
|
|
};
|
|
} else if (props.src === 'local') {
|
|
endpoint = 'notes/local-timeline';
|
|
query = {
|
|
withRenotes: props.withRenotes,
|
|
withReplies: props.withReplies,
|
|
withFiles: props.onlyFiles ? true : undefined,
|
|
};
|
|
} else if (props.src === 'social') {
|
|
endpoint = 'notes/hybrid-timeline';
|
|
query = {
|
|
withRenotes: props.withRenotes,
|
|
withReplies: props.withReplies,
|
|
withFiles: props.onlyFiles ? true : undefined,
|
|
};
|
|
} else if (props.src === 'global') {
|
|
endpoint = 'notes/global-timeline';
|
|
query = {
|
|
withRenotes: props.withRenotes,
|
|
withFiles: props.onlyFiles ? true : undefined,
|
|
};
|
|
} else if (props.src === 'mentions') {
|
|
endpoint = 'notes/mentions';
|
|
query = null;
|
|
} else if (props.src === 'directs') {
|
|
endpoint = 'notes/mentions';
|
|
query = {
|
|
visibility: 'specified',
|
|
};
|
|
} else if (props.src === 'list') {
|
|
endpoint = 'notes/user-list-timeline';
|
|
query = {
|
|
withRenotes: props.withRenotes,
|
|
withFiles: props.onlyFiles ? true : undefined,
|
|
listId: props.list,
|
|
};
|
|
} else if (props.src === 'channel') {
|
|
endpoint = 'channels/timeline';
|
|
query = {
|
|
channelId: props.channel,
|
|
};
|
|
} else if (props.src === 'role') {
|
|
endpoint = 'roles/notes';
|
|
query = {
|
|
roleId: props.role,
|
|
};
|
|
} else {
|
|
endpoint = null;
|
|
query = null;
|
|
}
|
|
|
|
if (endpoint && query) {
|
|
paginationQuery = {
|
|
endpoint: endpoint,
|
|
limit: 10,
|
|
params: query,
|
|
};
|
|
} else {
|
|
paginationQuery = null;
|
|
}
|
|
}
|
|
|
|
function refreshEndpointAndChannel() {
|
|
if (!defaultStore.state.disableStreamingTimeline) {
|
|
disconnectChannel();
|
|
connectChannel();
|
|
}
|
|
|
|
updatePaginationQuery();
|
|
}
|
|
|
|
// デッキのリストカラムでwithRenotesを変更した場合に自動的に更新されるようにさせる
|
|
// IDが切り替わったら切り替え先のTLを表示させたい
|
|
watch(() => [props.list, props.antenna, props.channel, props.role, props.withRenotes], refreshEndpointAndChannel);
|
|
|
|
// 初回表示用
|
|
refreshEndpointAndChannel();
|
|
|
|
onUnmounted(() => {
|
|
disconnectChannel();
|
|
});
|
|
|
|
function reloadTimeline() {
|
|
return new Promise<void>((res) => {
|
|
if (tlComponent.value == null) return;
|
|
|
|
tlNotesCount = 0;
|
|
|
|
tlComponent.value.pagingComponent?.reload().then(() => {
|
|
res();
|
|
});
|
|
});
|
|
}
|
|
|
|
defineExpose({
|
|
reloadTimeline,
|
|
});
|
|
</script>
|