+
+
![]()
@@ -68,6 +69,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._notification.pollEnded }}
{{ i18n.ts._notification.newNote }}:
{{ i18n.ts._achievements._types['_' + notification.achievement].title }}
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index 70af2c7962..bd57e72dcc 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -35,11 +35,11 @@ import { customEmojisMap } from '@/custom-emojis.js';
import * as os from '@/os.js';
import { misskeyApi, misskeyApiGet } from '@/utility/misskey-api.js';
import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
-import * as sound from '@/utility/sound.js';
import { i18n } from '@/i18n.js';
import MkCustomEmojiDetailedDialog from '@/components/MkCustomEmojiDetailedDialog.vue';
import { $i } from '@/i.js';
import { prefer } from '@/preferences.js';
+import { DI } from '@/di.js';
const props = defineProps<{
name: string;
@@ -53,7 +53,7 @@ const props = defineProps<{
fallbackToImage?: boolean;
}>();
-const react = inject<((name: string) => void) | null>('react', null);
+const react = inject(DI.mfmEmojiReactCallback);
const customEmojiName = computed(() => (props.name[0] === ':' ? props.name.substring(1, props.name.length - 1) : props.name).replace('@.', ''));
const isLocal = computed(() => !props.host && (customEmojiName.value.endsWith('@.') || !customEmojiName.value.includes('@')));
@@ -111,7 +111,6 @@ function onClick(ev: MouseEvent) {
icon: 'ph-smiley ph-bold ph-lg',
action: () => {
react(`:${props.name}:`);
- sound.playMisskeySfx('reaction');
},
});
}
diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index 432de24478..f5323690d0 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -15,9 +15,9 @@ import { char2fluentEmojiFilePath, char2twemojiFilePath, char2tossfaceFilePath }
import type { MenuItem } from '@/types/menu.js';
import * as os from '@/os.js';
import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
-import * as sound from '@/utility/sound.js';
import { i18n } from '@/i18n.js';
import { prefer } from '@/preferences.js';
+import { DI } from '@/di.js';
const props = defineProps<{
emoji: string;
@@ -25,7 +25,7 @@ const props = defineProps<{
menuReaction?: boolean;
}>();
-const react = inject<((name: string) => void) | null>('react', null);
+const react = inject(DI.mfmEmojiReactCallback);
const char2path = prefer.s.emojiStyle === 'twemoji' ? char2twemojiFilePath : prefer.s.emojiStyle === 'tossface' ? char2tossfaceFilePath : char2fluentEmojiFilePath;
@@ -61,7 +61,6 @@ function onClick(ev: MouseEvent) {
icon: 'ph-smiley ph-bold ph-lg',
action: () => {
react(props.emoji);
- sound.playMisskeySfx('reaction');
},
});
}
diff --git a/packages/frontend/src/di.ts b/packages/frontend/src/di.ts
index f9fc282315..b58c8c9659 100644
--- a/packages/frontend/src/di.ts
+++ b/packages/frontend/src/di.ts
@@ -14,4 +14,5 @@ export const DI = {
viewId: Symbol() as InjectionKey,
currentStickyTop: Symbol() as InjectionKey>,
currentStickyBottom: Symbol() as InjectionKey>,
+ mfmEmojiReactCallback: Symbol() as InjectionKey<(emoji: string) => void>,
};
diff --git a/packages/frontend/src/navbar.ts b/packages/frontend/src/navbar.ts
index 9d4988338a..7c15c9666a 100644
--- a/packages/frontend/src/navbar.ts
+++ b/packages/frontend/src/navbar.ts
@@ -132,7 +132,7 @@ export const navbarItemDef = reactive({
},
chat: {
title: i18n.ts.chat,
- icon: 'ti ti-message',
+ icon: 'ti ti-messages',
to: '/chat',
indicated: computed(() => $i != null && $i.hasUnreadChatMessages),
},
diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue
index 3142c5a45d..b1bd45baab 100644
--- a/packages/frontend/src/pages/admin/index.vue
+++ b/packages/frontend/src/pages/admin/index.vue
@@ -354,7 +354,6 @@ defineExpose({
&.wide {
display: flex;
margin: 0 auto;
- height: 100%;
> .nav {
position: sticky;
diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue
index 67db9ed6d3..5ea1c7f599 100644
--- a/packages/frontend/src/pages/admin/modlog.ModLog.vue
+++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue
@@ -58,6 +58,7 @@ SPDX-License-Identifier: AGPL-3.0-only
'deletePage',
'deleteFlash',
'deleteGalleryPost',
+ 'deleteChatRoom',
'clearUserFiles',
'clearRemoteFiles',
'clearOwnerlessFiles',
@@ -115,6 +116,7 @@ SPDX-License-Identifier: AGPL-3.0-only
: @{{ log.info.pageUserUsername }}
: @{{ log.info.flashUserUsername }}
: @{{ log.info.postUserUsername }}
+ : @{{ log.info.room.name }}
: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}
: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}
: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}
diff --git a/packages/frontend/src/pages/chat/XMessage.vue b/packages/frontend/src/pages/chat/XMessage.vue
index 1e7f8e20ea..cbb817de05 100644
--- a/packages/frontend/src/pages/chat/XMessage.vue
+++ b/packages/frontend/src/pages/chat/XMessage.vue
@@ -7,9 +7,19 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ notification.role.name }}
+
+ {{ notification.invitation.room.name }}
+
+
([]);
+const invitations = ref([]);
onMounted(async () => {
memberships.value = await misskeyApi('chat/rooms/members', {
roomId: props.room.id,
limit: 50,
});
+
+ if (isOwner.value) {
+ invitations.value = await misskeyApi('chat/rooms/invitations/outbox', {
+ roomId: props.room.id,
+ limit: 50,
+ });
+ }
});
@@ -65,9 +85,15 @@ onMounted(async () => {
flex: 1;
min-width: 0;
margin-right: 8px;
+}
- &:hover {
- text-decoration: none;
- }
+.invitation {
+ display: flex;
+}
+
+.invitationBody {
+ flex: 1;
+ min-width: 0;
+ margin-right: 8px;
}
diff --git a/packages/frontend/src/pages/chat/room.vue b/packages/frontend/src/pages/chat/room.vue
index 15e9f43db2..5938fd2688 100644
--- a/packages/frontend/src/pages/chat/room.vue
+++ b/packages/frontend/src/pages/chat/room.vue
@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
@@ -31,7 +41,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:moveClass="prefer.s.animation ? $style.transition_reaction_move : ''"
tag="div" :class="$style.reactions"
>
-
+ +
@@ -47,12 +59,20 @@ const isOwner = computed(() => {
});
const memberships = ref
+
diff --git a/packages/frontend/src/pages/chat/message.vue b/packages/frontend/src/pages/chat/message.vue
index be8be7e5d1..975d1a2be9 100644
--- a/packages/frontend/src/pages/chat/message.vue
+++ b/packages/frontend/src/pages/chat/message.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+{{ i18n.ts._chat.deleteRoom }}
+
{{ i18n.ts._chat.muteThisRoom }}
@@ -34,7 +36,9 @@ import { ensureSignin } from '@/i.js';
import MkInput from '@/components/MkInput.vue';
import MkTextarea from '@/components/MkTextarea.vue';
import MkSwitch from '@/components/MkSwitch.vue';
+import { useRouter } from '@/router.js';
+const router = useRouter();
const $i = ensureSignin();
const props = defineProps<{
@@ -56,6 +60,19 @@ function save() {
});
}
+async function del() {
+ const { canceled } = await os.confirm({
+ type: 'warning',
+ text: i18n.ts.areYouSure,
+ });
+ if (canceled) return;
+
+ misskeyApi('chat/rooms/delete', {
+ roomId: props.room.id,
+ });
+ router.push('/chat');
+}
+
const isMuted = ref(props.room.isMuted);
watch(isMuted, async () => {
diff --git a/packages/frontend/src/pages/chat/room.members.vue b/packages/frontend/src/pages/chat/room.members.vue
index d20216a81c..2b31efab38 100644
--- a/packages/frontend/src/pages/chat/room.members.vue
+++ b/packages/frontend/src/pages/chat/room.members.vue
@@ -18,6 +18,18 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
-
diff --git a/packages/frontend/src/pages/chat/room.form.vue b/packages/frontend/src/pages/chat/room.form.vue
index aba9d6061f..27ddbeb565 100644
--- a/packages/frontend/src/pages/chat/room.form.vue
+++ b/packages/frontend/src/pages/chat/room.form.vue
@@ -151,8 +151,16 @@ function onDrop(ev: DragEvent): void {
}
function onKeydown(ev: KeyboardEvent) {
- if ((ev.key === 'Enter') && (ev.ctrlKey || ev.metaKey)) {
- send();
+ if (ev.key === 'Enter') {
+ if (prefer.s['chat.sendOnEnter']) {
+ if (!(ev.ctrlKey || ev.metaKey || ev.shiftKey)) {
+ send();
+ }
+ } else {
+ if ((ev.ctrlKey || ev.metaKey)) {
+ send();
+ }
+ }
}
}
diff --git a/packages/frontend/src/pages/chat/room.info.vue b/packages/frontend/src/pages/chat/room.info.vue
index 7d38d07b3a..7e10336fd3 100644
--- a/packages/frontend/src/pages/chat/room.info.vue
+++ b/packages/frontend/src/pages/chat/room.info.vue
@@ -17,6 +17,8 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+ +
{{ i18n.ts._chat.sentInvitations }}
+
+
+
+
+
+
{{ i18n.ts._chat.thisUserAllowsChatOnlyFromFollowers }}
{{ i18n.ts._chat.thisUserAllowsChatOnlyFromFollowing }}
{{ i18n.ts._chat.thisUserAllowsChatOnlyFromMutualFollowing }}
- {{ i18n.ts._chat.thisUserNotAllowedChatAnyone }}
+ {{ i18n.ts._chat.thisUserNotAllowedChatAnyone }}
{{ i18n.ts._chat.inviteUserToChat }}
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
{{ i18n.ts.loadMore }}
@@ -75,7 +75,7 @@ SPDX-License-Identifier: AGPL-3.0-only