Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debug note edit #5

Merged
merged 6 commits into from
Sep 16, 2024
Merged

Debug note edit #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bca0224
remove duplication
seojangho Sep 16, 2024
72e96e8
revert some of c49a34811f
seojangho Sep 16, 2024
8dfc22c
eliminate mixed usage of updateMode and editMode
seojangho Sep 16, 2024
36af302
(revert me later: temporarily)
seojangho Sep 16, 2024
60dfc8f
fix updatedAtHistory is undefined
seojangho Sep 16, 2024
91a3eb8
remove openDetail();
seojangho Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions packages/frontend/src/components/MkPostForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ const props = withDefaults(defineProps<{
fixed?: boolean;
autofocus?: boolean;
freezeAfterPosted?: boolean;
updateMode?: boolean;
mock?: boolean;
editMode?: boolean;
}>(), {
Expand Down Expand Up @@ -709,7 +708,7 @@ function saveDraft() {
visibleUserIds: visibility.value === 'specified' ? visibleUsers.value.map(x => x.id) : undefined,
quoteId: quoteId.value,
reactionAcceptance: reactionAcceptance.value,
noteId: props.updateMode ? props.initialNote?.id : undefined,
noteId: props.editMode ? props.initialNote?.id : undefined,
},
};

Expand Down Expand Up @@ -791,12 +790,12 @@ async function post(ev?: MouseEvent) {
visibility: visibility.value,
visibleUserIds: visibility.value === 'specified' ? visibleUsers.value.map(u => u.id) : undefined,
reactionAcceptance: reactionAcceptance.value,
noteId: props.updateMode ? props.initialNote?.id : undefined,
noteId: props.editMode ? props.initialNote?.id : undefined,
};

if (props.initialNote && props.editMode) {
postData.updatedAt = new Date();
postData.updatedAtHistory = props.initialNote.updatedAtHistory;
postData.updatedAtHistory = props.initialNote.updatedAtHistory || [];
postData.updatedAtHistory.push(postData.updatedAt);
postData.id = props.initialNote.id;
}
Expand Down Expand Up @@ -835,7 +834,7 @@ async function post(ev?: MouseEvent) {
}

posting.value = true;
misskeyApi(props.updateMode ? 'notes/update' : 'notes/create', postData, token).then(() => {
misskeyApi(props.editMode ? 'notes/update' : 'notes/create', postData, token).then(() => {
if (props.freezeAfterPosted) {
posted.value = true;
} else {
Expand All @@ -852,7 +851,7 @@ async function post(ev?: MouseEvent) {
posting.value = false;
postAccount.value = null;

if (!props.updateMode) {
if (!props.editMode) {
incNotesCount();
if (notesCount === 1) {
claimAchievement('notes1');
Expand Down
3 changes: 1 addition & 2 deletions packages/frontend/src/components/MkPostFormDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ const props = withDefaults(defineProps<{
instant?: boolean;
fixed?: boolean;
autofocus?: boolean;
updateMode?: boolean;
editMode?: boolean;
}>(), {
initialLocalOnly: undefined,
editMode: false,
});

const emit = defineEmits<{
Expand Down
3 changes: 1 addition & 2 deletions packages/frontend/src/os.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,8 +700,7 @@ export function post(props: Record<string, any> = {}): Promise<void> {
// Vueが渡されたコンポーネントに内部的に__propsというプロパティを生やす影響で、
// 複数のpost formを開いたときに場合によってはエラーになる
// もちろん複数のpost formを開けること自体Misskeyサイドのバグなのだが
let dispose: () => void;
popup(MkPostFormDialog, props, {
const { dispose } = popup(MkPostFormDialog, props, {
closed: () => {
resolve();
dispose();
Expand Down
16 changes: 2 additions & 14 deletions packages/frontend/src/scripts/get-note-menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,6 @@ export function getNoteMenu(props: {

const cleanups = [] as (() => void)[];

function edit(): void {
os.post({ initialNote: appearNote, renote: appearNote.renote, reply: appearNote.reply, channel: appearNote.channel, updateMode: true });
}

function del(): void {
os.confirm({
type: 'warning',
Expand Down Expand Up @@ -221,10 +217,7 @@ export function getNoteMenu(props: {
text: i18n.ts.editConfirm,
}).then(({ canceled }) => {
if (canceled) return;
os.post({ initialNote: appearNote, renote: appearNote.renote, reply: appearNote.reply, channel: appearNote.channel, editMode: true })
.then(() => { openDetail(); });
// 노트 수정 사항이 바로 반영되지 않는 문제 수정을 위해 수정이 되면 노트를 띄우도록 변경. 다른 방법이 있다면 알려주세요.
// (기존 타임라인을 강제로 업데이트하는 건 어렵나..?)
os.post({ initialNote: appearNote, renote: appearNote.renote, reply: appearNote.reply, channel: appearNote.channel, editMode: true });
});
}

Expand Down Expand Up @@ -444,7 +437,7 @@ export function getNoteMenu(props: {
),
...(appearNote.userId === $i.id || $i.isModerator || $i.isAdmin ? [
{ type: 'divider' },
appearNote.userId === $i.id && $i.policies.canEditNote ? {
appearNote.userId === $i.id ? {
icon: 'ti ti-edit',
text: i18n.ts.edit,
action: edit,
Expand All @@ -454,11 +447,6 @@ export function getNoteMenu(props: {
text: i18n.ts.deleteAndEdit,
action: delEdit,
} : undefined,
$i.policies.canEditNote || $i.isModerator || $i.isAdmin ? {
icon: 'ti ti-edit',
text: i18n.ts.edit,
action: edit,
} : undefined,
{
icon: 'ti ti-trash',
text: i18n.ts.delete,
Expand Down
Loading