sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into swn

Browse Source
This commit is contained in:
tamaina
2021-10-21 02:21:22 +09:00
parent 20649f5ae1 69b56f6658
commit 2cbee47c73
20 changed files with 412 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/components/global/header.vue
View File

@@ -203,6 +203,12 @@ export default defineComponent({
&.thin {
--height: 50px;
> .buttons {
> .button {
font-size: 0.9em;
}
}
}
&.slim {

2
src/client/components/mfm.ts
View File

@@ -185,7 +185,7 @@ export default defineComponent({
}
}
if (style == null) {
return h('span', {}, ['[', token.props.name, ' ', ...genEl(token.children), ']']);
return h('span', {}, ['$[', token.props.name, ' ', ...genEl(token.children), ']']);
} else {
return h('span', {
style: 'display: inline-block;' + style,

20
src/client/pages/settings/import-export.vue
View File

@@ -16,11 +16,13 @@
</FormSection>
<FormSection>
<template #label>{{ $ts._exportOrImport.muteList }}</template>
<MkButton :class="$style.button" inline @click="doExport('mute')"><i class="fas fa-download"></i> {{ $ts.export }}</MkButton>
<MkButton :class="$style.button" inline @click="doExport('muting')"><i class="fas fa-download"></i> {{ $ts.export }}</MkButton>
<MkButton :class="$style.button" inline @click="doImport('muting', $event)"><i class="fas fa-upload"></i> {{ $ts.import }}</MkButton>
</FormSection>
<FormSection>
<template #label>{{ $ts._exportOrImport.blockingList }}</template>
<MkButton :class="$style.button" inline @click="doExport('blocking')"><i class="fas fa-download"></i> {{ $ts.export }}</MkButton>
<MkButton :class="$style.button" inline @click="doImport('blocking', $event)"><i class="fas fa-upload"></i> {{ $ts.import }}</MkButton>
</FormSection>
</div>
</template>
@@ -58,11 +60,11 @@ export default defineComponent({
methods: {
doExport(target) {
os.api(
target == 'notes' ? 'i/export-notes' :
target == 'following' ? 'i/export-following' :
target == 'blocking' ? 'i/export-blocking' :
target == 'user-lists' ? 'i/export-user-lists' :
target == 'mute' ? 'i/export-mute' :
target === 'notes' ? 'i/export-notes' :
target === 'following' ? 'i/export-following' :
target === 'blocking' ? 'i/export-blocking' :
target === 'user-lists' ? 'i/export-user-lists' :
target === 'muting' ? 'i/export-mute' :
null, {})
.then(() => {
os.dialog({
@@ -81,8 +83,10 @@ export default defineComponent({
const file = await selectFile(e.currentTarget || e.target);
os.api(
target == 'following' ? 'i/import-following' :
target == 'user-lists' ? 'i/import-user-lists' :
target === 'following' ? 'i/import-following' :
target === 'user-lists' ? 'i/import-user-lists' :
target === 'muting' ? 'i/import-muting' :
target === 'blocking' ? 'i/import-blocking' :
null, {
fileId: file.id
}).then(() => {