summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2025-08-28 19:47:58 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2025-08-28 19:47:58 +0900
commitf0833cffe9342cca0dc4ea7420acee56e686f643 (patch)
tree843af8795f60e173992b965f8e2595a36c4fd877 /packages/frontend/src
parentBump version to 2025.8.0-beta.5 (diff)
downloadmisskey-f0833cffe9342cca0dc4ea7420acee56e686f643.tar.gz
misskey-f0833cffe9342cca0dc4ea7420acee56e686f643.tar.bz2
misskey-f0833cffe9342cca0dc4ea7420acee56e686f643.zip
refactor
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/components/global/MkAvatar.vue1
-rw-r--r--packages/frontend/src/components/global/RouterView.vue12
-rw-r--r--packages/frontend/src/pages/settings/webhook.new.vue3
-rw-r--r--packages/frontend/src/preferences/manager.ts2
4 files changed, 8 insertions, 10 deletions
diff --git a/packages/frontend/src/components/global/MkAvatar.vue b/packages/frontend/src/components/global/MkAvatar.vue
index 8a9cc5286a..c2548cc7be 100644
--- a/packages/frontend/src/components/global/MkAvatar.vue
+++ b/packages/frontend/src/components/global/MkAvatar.vue
@@ -84,7 +84,6 @@ const bound = computed(() => props.link
: {});
const url = computed(() => {
- if (props.user.avatarUrl == null) return null;
if (prefer.s.disableShowingAnimatedImages || prefer.s.dataSaver.avatar) return getStaticImageUrl(props.user.avatarUrl);
return props.user.avatarUrl;
});
diff --git a/packages/frontend/src/components/global/RouterView.vue b/packages/frontend/src/components/global/RouterView.vue
index 3a508eaca0..d42beb531d 100644
--- a/packages/frontend/src/components/global/RouterView.vue
+++ b/packages/frontend/src/components/global/RouterView.vue
@@ -54,14 +54,10 @@ router.useListener('change', ({ resolved }) => {
if (resolved == null || 'redirect' in resolved.route) return;
if (resolved.route.path === currentRoutePath && deepEqual(resolved.props, currentPageProps.value)) return;
- function _() {
- currentPageComponent.value = resolved.route.component;
- currentPageProps.value = resolved.props;
- key.value = router.getCurrentFullPath();
- currentRoutePath = resolved.route.path;
- }
-
- _();
+ currentPageComponent.value = resolved.route.component;
+ currentPageProps.value = resolved.props;
+ key.value = router.getCurrentFullPath();
+ currentRoutePath = resolved.route.path;
});
</script>
diff --git a/packages/frontend/src/pages/settings/webhook.new.vue b/packages/frontend/src/pages/settings/webhook.new.vue
index 6c4dff5551..5f36e6bcfc 100644
--- a/packages/frontend/src/pages/settings/webhook.new.vue
+++ b/packages/frontend/src/pages/settings/webhook.new.vue
@@ -40,6 +40,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { ref, computed } from 'vue';
+import * as Misskey from 'misskey-js';
import MkInput from '@/components/MkInput.vue';
import FormSection from '@/components/form/section.vue';
import MkSwitch from '@/components/MkSwitch.vue';
@@ -61,7 +62,7 @@ const event_reaction = ref(true);
const event_mention = ref(true);
async function create(): Promise<void> {
- const events: string[] = [];
+ const events = [] as Misskey.entities.UserWebhook['on'];
if (event_follow.value) events.push('follow');
if (event_followed.value) events.push('followed');
if (event_note.value) events.push('note');
diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts
index 9157ba05d4..d26d590851 100644
--- a/packages/frontend/src/preferences/manager.ts
+++ b/packages/frontend/src/preferences/manager.ts
@@ -469,6 +469,8 @@ export class PreferencesManager {
return local;
} else if (choice === 'merge') {
return mergedValue!;
+ } else { // TSを黙らすため
+ return undefined;
}
}