feat(editor): Respect default privacy setting of the account (#1699)

This commit is contained in:
Peter Budai 2023-02-11 18:04:41 +01:00 committed by GitHub
parent db2892c4c0
commit 3e648f6fbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View file

@ -27,7 +27,7 @@ const emit = defineEmits<{
const { t } = useI18n()
const draftState = useDraft(draftKey, initial)
const { draft } = $(draftState)
const { draft, isEmpty } = $(draftState)
const {
isExceedingAttachmentLimit, isUploading, failedAttachments, isOverDropZone,
@ -48,6 +48,8 @@ const { editor } = useTiptap({
set: (newVal) => {
draft.params.status = newVal
draft.lastUpdated = Date.now()
if (isEmpty)
clearEmptyDrafts()
},
}),
placeholder: computed(() => placeholder ?? draft.params.inReplyToId ? t('placeholder.replying') : t('placeholder.default_1')),

View file

@ -30,7 +30,7 @@ export function getDefaultDraft(options: Partial<Mutable<mastodon.v1.CreateStatu
params: {
status: status || '',
inReplyToId,
visibility: visibility || 'public',
visibility: currentUser.value?.account.source.privacy || visibility || 'public',
sensitive: sensitive ?? false,
spoilerText: spoilerText || '',
language: language || '', // auto inferred from current language on posting
@ -141,7 +141,7 @@ export function directMessageUser(account: mastodon.v1.Account) {
export function clearEmptyDrafts() {
for (const key in currentUserDrafts.value) {
if (builtinDraftKeys.includes(key))
if (builtinDraftKeys.includes(key) && !isEmptyDraft(currentUserDrafts.value[key]))
continue
if (!currentUserDrafts.value[key].params || isEmptyDraft(currentUserDrafts.value[key]))
delete currentUserDrafts.value[key]