+ {{ i18n.ts.notificationSettingDesc }}
+
+ {{ i18n.t(`_notification._types.${ntype}`) }}
+
+
-
-
- {{ i18n.ts.useGlobalSetting }}
- {{ i18n.ts.useGlobalSettingDesc }}
-
-
-
- {{ i18n.ts.notificationSettingDesc }}
-
- {{ i18n.t(`_notification._types.${ntype}`) }}
-
-
-
-
@@ -129,6 +129,7 @@ import { deepClone } from '@/scripts/clone.js';
import MkRippleEffect from '@/components/MkRippleEffect.vue';
import { miLocalStorage } from '@/local-storage.js';
import { claimAchievement } from '@/scripts/achievements.js';
+import { vibrate } from '@/scripts/vibrate.js';
const modal = inject('modal');
@@ -148,6 +149,7 @@ const props = withDefaults(defineProps<{
fixed?: boolean;
autofocus?: boolean;
freezeAfterPosted?: boolean;
+ updateMode?: boolean;
}>(), {
initialVisibleUsers: () => [],
autofocus: true,
@@ -743,19 +745,20 @@ async function post(ev?: MouseEvent) {
}
let postData = {
- text: text === '' ? undefined : text,
+ text: text === '' ? null : text,
fileIds: files.length > 0 ? files.map(f => f.id) : undefined,
replyId: props.reply ? props.reply.id : undefined,
renoteId: props.renote ? props.renote.id : quoteId ? quoteId : undefined,
channelId: props.channel ? props.channel.id : undefined,
poll: poll,
event: event,
- cw: useCw ? cw ?? '' : undefined,
+ cw: useCw ? cw ?? '' : null,
localOnly: localOnly,
visibility: visibility,
visibleUserIds: visibility === 'specified' ? visibleUsers.map(u => u.id) : undefined,
reactionAcceptance,
disableRightClick: disableRightClick,
+ noteId: props.updateMode ? props.initialNote?.id : undefined,
};
if (withHashtags && hashtags && hashtags.trim() !== '') {
@@ -778,16 +781,19 @@ async function post(ev?: MouseEvent) {
}
posting = true;
- os.api('notes/create', postData, token).then(() => {
+ os.api(props.updateMode ? 'notes/update' : 'notes/create', postData, token).then(() => {
if (props.freezeAfterPosted) {
posted = true;
} else {
clear();
}
nextTick(() => {
+ if (props.reply) os.noteToast(i18n.ts.replied, 'reply');
+ else if (props.renote) os.noteToast(i18n.ts.quoted, 'quote');
+ else os.noteToast(i18n.ts.posted, 'posted');
+
deleteDraft();
emit('posted');
- os.noteToast(i18n.ts.posted);
if (postData.text && postData.text !== '') {
const hashtags_ = mfm.parse(postData.text).filter(x => x.type === 'hashtag').map(x => x.props.hashtag);
const history = JSON.parse(miLocalStorage.getItem('hashtags') ?? '[]') as string[];
@@ -845,6 +851,7 @@ async function post(ev?: MouseEvent) {
text: err.message + '\n' + (err as any).id,
});
});
+ vibrate([10, 20, 10, 20, 10, 20, 60]);
}
function cancel() {
@@ -867,8 +874,10 @@ function showActions(ev) {
action: () => {
action.handler({
text: text,
+ cw: cw,
}, (key, value) => {
if (key === 'text') { text = value; }
+ if (key === 'cw') { useCw = value !== null; cw = value; }
});
},
})), ev.currentTarget ?? ev.target);
@@ -1007,6 +1016,10 @@ defineExpose({
display: inline-flex;
vertical-align: bottom;
flex: 0 1 50px;
+
+ &.fixed {
+ margin: 0 0 0 12px;
+ }
}
.avatar {
diff --git a/packages/frontend/src/components/MkPostFormDialog.vue b/packages/frontend/src/components/MkPostFormDialog.vue
index b232b8b291..53349aca9a 100644
--- a/packages/frontend/src/components/MkPostFormDialog.vue
+++ b/packages/frontend/src/components/MkPostFormDialog.vue
@@ -30,6 +30,7 @@ const props = defineProps<{
instant?: boolean;
fixed?: boolean;
autofocus?: boolean;
+ updateMode?: boolean;
}>();
const emit = defineEmits<{
@@ -55,5 +56,9 @@ function onModalClosed() {
max-height: calc(100% - env(safe-area-inset-bottom));
margin: 0 auto auto auto;
overflow: scroll;
+
+ &::-webkit-scrollbar {
+ display: none;
+ }
}
diff --git a/packages/frontend/src/components/MkPostFormSimple.vue b/packages/frontend/src/components/MkPostFormSimple.vue
index fcad574752..6aa15aa98a 100644
--- a/packages/frontend/src/components/MkPostFormSimple.vue
+++ b/packages/frontend/src/components/MkPostFormSimple.vue
@@ -17,10 +17,10 @@ SPDX-License-Identifier: AGPL-3.0-only
:enterFromClass="defaultStore.state.animation ? $style.transition_header_enterFrom : ''"
:leaveToClass="defaultStore.state.animation ? $style.transition_header_leaveTo : ''"
>
-
-
@@ -59,9 +59,9 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.quoteAttached }}
-
+ {{ i18n.ts.notSpecifiedMentionWarning }} -
-
-
- {{ i18n.ts.quoteAttached }}
+
{{ i18n.ts.recipient }}
-
@@ -71,25 +71,25 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+ {{ i18n.ts.notSpecifiedMentionWarning }} -
+
+ (null);
const hashtagsInputEl = $shallowRef(null);
const visibilityButton = $shallowRef(null);
-let formClick = $ref(false);
+let showForm = $ref(false);
let posting = $ref(false);
let posted = $ref(false);
@@ -237,7 +240,9 @@ const draftKey = $computed((): string => {
});
const placeholder = $computed((): string => {
- if (props.renote) {
+ if (!$i) {
+ return i18n.ts._postForm.signinRequiredPlaceholder;
+ } else if (props.renote) {
return i18n.ts._postForm.quotePlaceholder;
} else if (props.reply) {
return i18n.ts._postForm.replyPlaceholder;
@@ -257,13 +262,15 @@ const placeholder = $computed((): string => {
});
const submitText = $computed((): string => {
- return props.renote
- ? i18n.ts.quote
- : props.reply
- ? i18n.ts.reply
- : defaultStore.state.renameTheButtonInPostFormToNya
- ? i18n.ts.nya
- : i18n.ts.note;
+ return !$i
+ ? i18n.ts.login
+ : props.renote
+ ? i18n.ts.quote
+ : props.reply
+ ? i18n.ts.reply
+ : defaultStore.state.renameTheButtonInPostFormToNya
+ ? i18n.ts.nya
+ : i18n.ts.note;
});
const textLength = $computed((): number => {
@@ -319,8 +326,6 @@ if (props.reply && props.reply.text != null) {
// 重複は除外
if (text.includes(`${mention} `)) continue;
-
- text += `${mention} `;
}
}
@@ -761,19 +766,20 @@ async function post(ev?: MouseEvent) {
}
let postData = {
- text: text === '' ? undefined : text,
+ text: text === '' ? null : text,
fileIds: files.length > 0 ? files.map(f => f.id) : undefined,
replyId: props.reply ? props.reply.id : undefined,
renoteId: props.renote ? props.renote.id : quoteId ? quoteId : undefined,
channelId: props.channel ? props.channel.id : undefined,
poll: poll,
event: event,
- cw: useCw ? cw ?? '' : undefined,
+ cw: useCw ? cw ?? '' : null,
localOnly: localOnly,
visibility: visibility,
visibleUserIds: visibility === 'specified' ? visibleUsers.map(u => u.id) : undefined,
reactionAcceptance,
disableRightClick: disableRightClick,
+ noteId: props.updateMode ? props.initialNote?.id : undefined,
};
if (withHashtags && hashtags && hashtags.trim() !== '') {
@@ -796,16 +802,19 @@ async function post(ev?: MouseEvent) {
}
posting = true;
- os.api('notes/create', postData, token).then(() => {
+ os.api(props.updateMode ? 'notes/update' : 'notes/create', postData, token).then(() => {
if (props.freezeAfterPosted) {
posted = true;
} else {
clear();
}
nextTick(() => {
+ if (props.reply) os.noteToast(i18n.ts.replied, 'reply');
+ else if (props.renote) os.noteToast(i18n.ts.quoted, 'quote');
+ else os.noteToast(i18n.ts.posted, 'posted');
+
deleteDraft();
emit('posted');
- os.noteToast(i18n.ts.posted);
if (postData.text && postData.text !== '') {
const hashtags_ = mfm.parse(postData.text).filter(x => x.type === 'hashtag').map(x => x.props.hashtag);
const history = JSON.parse(miLocalStorage.getItem('hashtags') ?? '[]') as string[];
@@ -863,6 +872,7 @@ async function post(ev?: MouseEvent) {
text: err.message + '\n' + (err as any).id,
});
});
+ vibrate([10, 20, 10, 20, 10, 20, 60]);
}
function cancel() {
@@ -885,8 +895,10 @@ function showActions(ev) {
action: () => {
action.handler({
text: text,
+ cw: cw,
}, (key, value) => {
if (key === 'text') { text = value; }
+ if (key === 'cw') { useCw = value !== null; cw = value; }
});
},
})), ev.currentTarget ?? ev.target);
@@ -913,6 +925,37 @@ function openAccountMenu(ev: MouseEvent) {
}, ev);
}
+function formClick() {
+ if ($i) showForm = true;
+
+ if (props.reply && props.reply.text != null) {
+ const ast = mfm.parse(props.reply.text);
+ const otherHost = props.reply.user.host;
+
+ for (const x of extractMentions(ast)) {
+ const mention = x.host ?
+ `@${x.username}@${toASCII(x.host)}` :
+ (otherHost == null || otherHost === host) ?
+ `@${x.username}` :
+ `@${x.username}@${toASCII(otherHost)}`;
+
+ // 自分は除外
+ if ($i.username === x.username && (x.host == null || x.host === host)) continue;
+
+ // 重複は除外
+ if (text.includes(`${mention} `)) continue;
+
+ text += `${mention} `;
+ }
+ }
+}
+
+function signin() {
+ os.popup(XSigninDialog, {
+ autoSet: true,
+ }, {}, 'closed');
+}
+
onMounted(() => {
if (props.autofocus) {
focus();
@@ -1044,7 +1087,10 @@ defineExpose({
display: inline-flex;
vertical-align: bottom;
flex: 0 1 50px;
- margin: 0 0 0 12px;
+
+ &.fixed {
+ margin: 0 0 0 12px;
+ }
}
.avatar {
@@ -1217,7 +1263,7 @@ defineExpose({
padding-top: 8px;
}
- &.formClick {
+ &.showForm {
margin-top: 20px;
}
}
diff --git a/packages/frontend/src/components/MkRadio.vue b/packages/frontend/src/components/MkRadio.vue
index 04ccc67cec..021d53dcdf 100644
--- a/packages/frontend/src/components/MkRadio.vue
+++ b/packages/frontend/src/components/MkRadio.vue
@@ -6,6 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
-
- {{ maxTextLength - textLength }}
-
+
+
-
-
@@ -149,6 +149,8 @@ import { deepClone } from '@/scripts/clone.js';
import MkRippleEffect from '@/components/MkRippleEffect.vue';
import { miLocalStorage } from '@/local-storage.js';
import { claimAchievement } from '@/scripts/achievements.js';
+import { vibrate } from '@/scripts/vibrate.js';
+import XSigninDialog from '@/components/MkSigninDialog.vue';
const modal = inject('modal');
@@ -168,6 +170,7 @@ const props = withDefaults(defineProps<{
fixed?: boolean;
autofocus?: boolean;
freezeAfterPosted?: boolean;
+ updateMode?: boolean;
}>(), {
initialVisibleUsers: () => [],
autofocus: false,
@@ -184,7 +187,7 @@ const cwInputEl = $shallowRef
import { computed, defineAsyncComponent, onMounted, onUnmounted, ref, watch, shallowRef } from 'vue';
import * as os from '@/os.js';
+import { vibrate } from '@/scripts/vibrate.js';
const props = withDefaults(defineProps<{
modelValue: number;
@@ -100,6 +101,8 @@ const steps = computed(() => {
});
const onMousedown = (ev: MouseEvent | TouchEvent) => {
+ vibrate(10);
+
ev.preventDefault();
const tooltipShowing = ref(true);
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index c9a9c80f98..320e1e4849 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only