shareでより多くの情報を渡せるように
This commit is contained in:
tamaina
parent
6d1d7b5366
commit
d35b1722c2
|
|
@ -107,11 +107,28 @@ export default defineComponent({
|
|||
type: String,
|
||||
required: false
|
||||
},
|
||||
initialVisibility: {
|
||||
type: String,
|
||||
required: false
|
||||
},
|
||||
initialFiles: {
|
||||
type: Array,
|
||||
required: false
|
||||
},
|
||||
initialLocalOnly: {
|
||||
type: Boolean,
|
||||
required: false
|
||||
},
|
||||
visibleUsers: {
|
||||
type: Array,
|
||||
required: false,
|
||||
default: () => []
|
||||
},
|
||||
initialNote: {
|
||||
type: Object,
|
||||
required: false
|
||||
},
|
||||
instant: {
|
||||
share: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: false
|
||||
|
|
@ -139,8 +156,7 @@ export default defineComponent({
|
|||
useCw: false,
|
||||
cw: null,
|
||||
localOnly: this.$store.state.rememberNoteVisibility ? this.$store.state.localOnly : this.$store.state.defaultNoteLocalOnly,
|
||||
visibility: this.$store.state.rememberNoteVisibility ? this.$store.state.visibility : this.$store.state.defaultNoteVisibility,
|
||||
visibleUsers: [],
|
||||
visibility: (this.$store.state.rememberNoteVisibility ? this.$store.state.visibility : this.$store.state.defaultNoteVisibility) as typeof noteVisibilities[number],
|
||||
autocomplete: null,
|
||||
draghover: false,
|
||||
quoteId: null,
|
||||
|
|
@ -232,6 +248,18 @@ export default defineComponent({
|
|||
this.text = this.initialText;
|
||||
}
|
||||
|
||||
if (this.initialVisibility) {
|
||||
this.visibility = this.initialVisibility;
|
||||
}
|
||||
|
||||
if (this.initialFiles) {
|
||||
this.files = this.initialFiles;
|
||||
}
|
||||
|
||||
if (typeof this.initialLocalOnly === 'boolean') {
|
||||
this.localOnly = this.initialLocalOnly;
|
||||
}
|
||||
|
||||
if (this.mention) {
|
||||
this.text = this.mention.host ? `@${this.mention.username}@${toASCII(this.mention.host)}` : `@${this.mention.username}`;
|
||||
this.text += ' ';
|
||||
|
|
@ -306,7 +334,7 @@ export default defineComponent({
|
|||
|
||||
this.$nextTick(() => {
|
||||
// 書きかけの投稿を復元
|
||||
if (!this.instant && !this.mention && !this.specified) {
|
||||
if (!this.share && !this.mention && !this.specified) {
|
||||
const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[this.draftKey];
|
||||
if (draft) {
|
||||
this.text = draft.data.text;
|
||||
|
|
@ -562,8 +590,6 @@ export default defineComponent({
|
|||
},
|
||||
|
||||
saveDraft() {
|
||||
if (this.instant) return;
|
||||
|
||||
const data = JSON.parse(localStorage.getItem('drafts') || '{}');
|
||||
|
||||
data[this.draftKey] = {
|
||||
|
|
|
|||
|
|
@ -3,19 +3,35 @@
|
|||
<section class="_section">
|
||||
<div class="_title" v-if="title">{{ title }}</div>
|
||||
<div class="_content">
|
||||
<XPostForm v-if="!posted" fixed :instant="true" :initial-text="initialText" @posted="posted = true" class="_panel"/>
|
||||
<MkButton v-else primary @click="close()">{{ $ts.close }}</MkButton>
|
||||
<XPostForm
|
||||
v-if="state === 'writing'"
|
||||
fixed
|
||||
:share="true"
|
||||
:initial-text="initialText"
|
||||
:initial-visibility="visibility"
|
||||
:initial-files="files"
|
||||
:initial-local-only="localOnly"
|
||||
:reply="reply"
|
||||
:renote="renote"
|
||||
:visible-users="visibleUsers"
|
||||
@posted="state = 'posted'"
|
||||
class="_panel"
|
||||
/>
|
||||
<MkButton v-else-if="state === 'posted'" primary @click="close()">{{ $ts.close }}</MkButton>
|
||||
</div>
|
||||
<div class="_footer" v-if="url">{{ url }}</div>
|
||||
</section>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
// SPECIFICATION: https://wiki.misskey.io/ja/advanced-functions/share
|
||||
|
||||
import { defineComponent } from 'vue';
|
||||
import MkButton from '@client/components/ui/button.vue';
|
||||
import XPostForm from '@client/components/post-form.vue';
|
||||
import * as os from '@client/os';
|
||||
import { noteVisibilities } from '@/types';
|
||||
import { parseAcct } from '@/misc/acct';
|
||||
import * as symbols from '@client/symbols';
|
||||
|
||||
export default defineComponent({
|
||||
|
|
@ -30,26 +46,107 @@ export default defineComponent({
|
|||
title: this.$ts.share,
|
||||
icon: 'fas fa-share-alt'
|
||||
},
|
||||
title: null,
|
||||
text: null,
|
||||
url: null,
|
||||
initialText: null,
|
||||
posted: false,
|
||||
state: 'fetching' as 'fetching' | 'writing' | 'posted',
|
||||
|
||||
title: null as string | null,
|
||||
initialText: null as string | null,
|
||||
reply: null as any,
|
||||
renote: null as any,
|
||||
visibility: null as string | null,
|
||||
localOnly: null as boolean | null,
|
||||
files: null as any[] | null,
|
||||
visibleUsers: [] as any[],
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
created() {
|
||||
async created() {
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
this.title = urlParams.get('title');
|
||||
this.text = urlParams.get('text');
|
||||
this.url = urlParams.get('url');
|
||||
|
||||
let text = '';
|
||||
if (this.title) text += `【${this.title}】\n`;
|
||||
if (this.text) text += `${this.text}\n`;
|
||||
if (this.url) text += `${this.url}`;
|
||||
this.initialText = text.trim();
|
||||
this.title = urlParams.get('title');
|
||||
const text = urlParams.get('text');
|
||||
const url = urlParams.get('url');
|
||||
|
||||
let noteText = '';
|
||||
if (this.title) noteText += `【${this.title}】\n`;
|
||||
// Googleニュース対策
|
||||
if (text?.startsWith(`${this.title}.\n`)) noteText += text.replace(`${this.title}.\n`, '');
|
||||
else if (text && this.title !== text) noteText += `${text}\n`;
|
||||
if (url) noteText += `${url}`;
|
||||
this.initialText = noteText.trim();
|
||||
|
||||
const visibility = urlParams.get('visibility');
|
||||
if (noteVisibilities.includes(visibility)) {
|
||||
this.visibility = visibility;
|
||||
}
|
||||
|
||||
if (this.visibility === 'specified') {
|
||||
const visibleUserIds = urlParams.get('visibleUserIds');
|
||||
const visibleAccts = urlParams.get('visibleAccts');
|
||||
this.visibleUsers = await [
|
||||
...(visibleUserIds ? visibleUserIds.split(',').map(userId => ({ userId })) : []),
|
||||
...(visibleAccts ? visibleAccts.split(',').map(parseAcct) : [])
|
||||
].map(q => os.api('users/show', q)
|
||||
.catch(() => Error(`invalid user query: ${JSON.stringify(q)}`)));
|
||||
}
|
||||
|
||||
const localOnly = urlParams.get('localOnly');
|
||||
if (localOnly === '0') this.localOnly = false;
|
||||
else if (localOnly === '1') this.localOnly = true;
|
||||
|
||||
|
||||
try {
|
||||
//#region Reply
|
||||
const replyId = urlParams.get('replyId');
|
||||
const replyUri = urlParams.get('replyUri');
|
||||
if (replyId) {
|
||||
this.reply = await os.api('notes/show', {
|
||||
noteId: replyId
|
||||
});
|
||||
} else if (replyUri) {
|
||||
const obj = await os.api('ap/show', {
|
||||
uri: replyUri
|
||||
}) as any;
|
||||
if (obj.type === 'Note') {
|
||||
this.reply = obj.object;
|
||||
}
|
||||
}
|
||||
//#endregion
|
||||
|
||||
//#region Renote
|
||||
const renoteId = urlParams.get('renoteId');
|
||||
const renoteUri = urlParams.get('renoteUri');
|
||||
if (renoteId) {
|
||||
this.renote = await os.api('notes/show', {
|
||||
noteId: renoteId
|
||||
});
|
||||
} else if (renoteUri) {
|
||||
const obj = await os.api('ap/show', {
|
||||
uri: renoteUri
|
||||
}) as any;
|
||||
if (obj.type === 'Note') {
|
||||
this.renote = obj.object;
|
||||
}
|
||||
}
|
||||
//#endregion
|
||||
|
||||
//#region Drive files
|
||||
const fileIds = urlParams.get('fileIds');
|
||||
if (fileIds) {
|
||||
const promises = Promise.all(fileIds.split(',')
|
||||
.map(fileId => os.api('drive/files/show', { fileId }).catch(() => Error(`invalid fileId: ${fileId}`))));
|
||||
await promises.then(files => this.files = files);
|
||||
}
|
||||
//#endregion
|
||||
} catch (e) {
|
||||
os.dialog({
|
||||
type: 'error',
|
||||
title: e.message,
|
||||
text: e.name
|
||||
});
|
||||
}
|
||||
|
||||
this.state = 'writing';
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue