summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-10-04 12:05:01 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-10-04 12:05:01 +0900
commitb40329887f6f383a7236ac022b8dfde9217cdbae (patch)
tree35dc1a543ec8be95c49ab1a692e8d5d7fac8d71d /packages/frontend/src
parentfix flaky test (diff)
downloadsharkey-b40329887f6f383a7236ac022b8dfde9217cdbae.tar.gz
sharkey-b40329887f6f383a7236ac022b8dfde9217cdbae.tar.bz2
sharkey-b40329887f6f383a7236ac022b8dfde9217cdbae.zip
revert: note editing
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/components/MkNoteDetailed.vue3
-rw-r--r--packages/frontend/src/components/MkNoteHeader.vue1
-rw-r--r--packages/frontend/src/components/MkPostForm.vue4
-rw-r--r--packages/frontend/src/components/MkPostFormDialog.vue1
-rw-r--r--packages/frontend/src/const.ts1
-rw-r--r--packages/frontend/src/pages/admin/roles.editor.vue20
-rw-r--r--packages/frontend/src/pages/admin/roles.vue8
-rw-r--r--packages/frontend/src/scripts/get-note-menu.ts9
-rw-r--r--packages/frontend/src/scripts/use-note-capture.ts7
9 files changed, 1 insertions, 53 deletions
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index a9da5a3a62..a1360aba9d 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -93,9 +93,6 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
<footer>
<div :class="$style.noteFooterInfo">
- <div v-if="appearNote.updatedAt">
- {{ i18n.ts.edited }}: <MkTime :time="appearNote.updatedAt" mode="detail"/>
- </div>
<MkA :to="notePage(appearNote)">
<MkTime :time="appearNote.createdAt" mode="detail"/>
</MkA>
diff --git a/packages/frontend/src/components/MkNoteHeader.vue b/packages/frontend/src/components/MkNoteHeader.vue
index 05f98c638e..dda7238d27 100644
--- a/packages/frontend/src/components/MkNoteHeader.vue
+++ b/packages/frontend/src/components/MkNoteHeader.vue
@@ -14,7 +14,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<img v-for="role in note.user.badgeRoles" :key="role.id" v-tooltip="role.name" :class="$style.badgeRole" :src="role.iconUrl"/>
</div>
<div :class="$style.info">
- <span v-if="note.updatedAt" style="margin-right: 0.5em;" :title="i18n.ts.edited"><i class="ti ti-pencil"></i></span>
<MkA :to="notePage(note)">
<MkTime :time="note.createdAt"/>
</MkA>
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index b82ca3ef19..f6981cea72 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -143,7 +143,6 @@ const props = withDefaults(defineProps<{
fixed?: boolean;
autofocus?: boolean;
freezeAfterPosted?: boolean;
- updateMode?: boolean;
}>(), {
initialVisibleUsers: () => [],
autofocus: true,
@@ -710,7 +709,6 @@ async function post(ev?: MouseEvent) {
visibility: visibility,
visibleUserIds: visibility === 'specified' ? visibleUsers.map(u => u.id) : undefined,
reactionAcceptance,
- noteId: props.updateMode ? props.initialNote?.id : undefined,
};
if (withHashtags && hashtags && hashtags.trim() !== '') {
@@ -733,7 +731,7 @@ async function post(ev?: MouseEvent) {
}
posting = true;
- os.api(props.updateMode ? 'notes/update' : 'notes/create', postData, token).then(() => {
+ os.api('notes/create', postData, token).then(() => {
if (props.freezeAfterPosted) {
posted = true;
} else {
diff --git a/packages/frontend/src/components/MkPostFormDialog.vue b/packages/frontend/src/components/MkPostFormDialog.vue
index f33d498f93..c07a166a83 100644
--- a/packages/frontend/src/components/MkPostFormDialog.vue
+++ b/packages/frontend/src/components/MkPostFormDialog.vue
@@ -30,7 +30,6 @@ const props = defineProps<{
instant?: boolean;
fixed?: boolean;
autofocus?: boolean;
- updateMode?: boolean;
}>();
const emit = defineEmits<{
diff --git a/packages/frontend/src/const.ts b/packages/frontend/src/const.ts
index f4ce0a096d..3998df9efe 100644
--- a/packages/frontend/src/const.ts
+++ b/packages/frontend/src/const.ts
@@ -61,7 +61,6 @@ export const ROLE_POLICIES = [
'gtlAvailable',
'ltlAvailable',
'canPublicNote',
- 'canEditNote',
'canInvite',
'inviteLimit',
'inviteLimitCycle',
diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
index 8015bb7a7f..ead2250af2 100644
--- a/packages/frontend/src/pages/admin/roles.editor.vue
+++ b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -160,26 +160,6 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</MkFolder>
- <MkFolder v-if="matchQuery([i18n.ts._role._options.canEditNote, 'canEditNote'])">
- <template #label>{{ i18n.ts._role._options.canEditNote }}</template>
- <template #suffix>
- <span v-if="role.policies.canEditNote.useDefault" :class="$style.useDefaultLabel">{{ i18n.ts._role.useBaseValue }}</span>
- <span v-else>{{ role.policies.canEditNote.value ? i18n.ts.yes : i18n.ts.no }}</span>
- <span :class="$style.priorityIndicator"><i :class="getPriorityIcon(role.policies.canEditNote)"></i></span>
- </template>
- <div class="_gaps">
- <MkSwitch v-model="role.policies.canEditNote.useDefault" :readonly="readonly">
- <template #label>{{ i18n.ts._role.useBaseValue }}</template>
- </MkSwitch>
- <MkSwitch v-model="role.policies.canEditNote.value" :disabled="role.policies.canEditNote.useDefault" :readonly="readonly">
- <template #label>{{ i18n.ts.enable }}</template>
- </MkSwitch>
- <MkRange v-model="role.policies.canEditNote.priority" :min="0" :max="2" :step="1" easing :textConverter="(v) => v === 0 ? i18n.ts._role._priority.low : v === 1 ? i18n.ts._role._priority.middle : v === 2 ? i18n.ts._role._priority.high : ''">
- <template #label>{{ i18n.ts._role.priority }}</template>
- </MkRange>
- </div>
- </MkFolder>
-
<MkFolder v-if="matchQuery([i18n.ts._role._options.canInvite, 'canInvite'])">
<template #label>{{ i18n.ts._role._options.canInvite }}</template>
<template #suffix>
diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
index 001cf3490e..74de9f7396 100644
--- a/packages/frontend/src/pages/admin/roles.vue
+++ b/packages/frontend/src/pages/admin/roles.vue
@@ -48,14 +48,6 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkSwitch>
</MkFolder>
- <MkFolder v-if="matchQuery([i18n.ts._role._options.canEditNote, 'canEditNote'])">
- <template #label>{{ i18n.ts._role._options.canEditNote }}</template>
- <template #suffix>{{ policies.canEditNote ? i18n.ts.yes : i18n.ts.no }}</template>
- <MkSwitch v-model="policies.canEditNote">
- <template #label>{{ i18n.ts.enable }}</template>
- </MkSwitch>
- </MkFolder>
-
<MkFolder v-if="matchQuery([i18n.ts._role._options.canInvite, 'canInvite'])">
<template #label>{{ i18n.ts._role._options.canInvite }}</template>
<template #suffix>{{ policies.canInvite ? i18n.ts.yes : i18n.ts.no }}</template>
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 62d9aab91b..e399145fc9 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -172,10 +172,6 @@ export function getNoteMenu(props: {
});
}
- function edit(): void {
- os.post({ initialNote: appearNote, renote: appearNote.renote, reply: appearNote.reply, channel: appearNote.channel, updateMode: true });
- }
-
function toggleFavorite(favorite: boolean): void {
claimAchievement('noteFavorited1');
os.apiWithDialog(favorite ? 'notes/favorites/create' : 'notes/favorites/delete', {
@@ -356,11 +352,6 @@ export function getNoteMenu(props: {
),
...(appearNote.userId === $i.id || $i.isModerator || $i.isAdmin ? [
null,
- appearNote.userId === $i.id && $i.policies.canEditNote ? {
- icon: 'ti ti-edit',
- text: i18n.ts.edit,
- action: edit,
- } : undefined,
appearNote.userId === $i.id ? {
icon: 'ti ti-edit',
text: i18n.ts.deleteAndEdit,
diff --git a/packages/frontend/src/scripts/use-note-capture.ts b/packages/frontend/src/scripts/use-note-capture.ts
index a4c913749e..c618532570 100644
--- a/packages/frontend/src/scripts/use-note-capture.ts
+++ b/packages/frontend/src/scripts/use-note-capture.ts
@@ -71,13 +71,6 @@ export function useNoteCapture(props: {
break;
}
- case 'updated': {
- note.value.updatedAt = new Date().toISOString();
- note.value.cw = body.cw;
- note.value.text = body.text;
- break;
- }
-
case 'deleted': {
props.isDeletedRef.value = true;
break;