usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into notification-read-api

This commit is contained in:
tamaina 2021-12-25 23:03:21 +09:00
parent a456a63e34 85740dd09f
commit a921f6064e
20 changed files with 20 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@
## 12.x.x (unreleased)
### Improvements
- クライアント: ノートプレビューの精度を改善
### Bugfixes
- クライアント: 一部のコンポーネントが裏に隠れるのを修正

4
packages/client/src/components/note-preview.vue
View File

@ -7,7 +7,7 @@
</div>
<div class="body">
<div class="content">
<Mfm :text="text" :author="$i" :i="$i"/>
<Mfm :text="text.trim()" :author="$i" :i="$i"/>
</div>
</div>
</div>
@ -61,6 +61,7 @@ export default defineComponent({
width: 40px;
height: 40px;
border-radius: 8px;
pointer-events: none;
}
> .main {
@ -69,6 +70,7 @@ export default defineComponent({
> .header {
margin-bottom: 2px;
font-weight: bold;
}
> .body {

3
packages/client/src/pages/admin/file-dialog.vue
View File

@ -40,7 +40,6 @@ import MkButton from '@/components/ui/button.vue';
import MkSwitch from '@/components/form/switch.vue';
import XModalWindow from '@/components/ui/modal-window.vue';
import MkDriveFileThumbnail from '@/components/drive-file-thumbnail.vue';
import Progress from '@/scripts/loading';
import bytes from '@/filters/bytes';
import * as os from '@/os';
@ -74,11 +73,9 @@ export default defineComponent({
methods: {
async fetch() {
Progress.start();
this.file = await os.api('drive/files/show', { fileId: this.fileId });
this.info = await os.api('admin/drive/show-file', { fileId: this.fileId });
this.isSensitive = this.file.isSensitive;
Progress.done();
},
showUser() {

11
packages/client/src/pages/antenna-timeline.vue
View File

@ -7,8 +7,6 @@
src="antenna"
:antenna="antennaId"
:sound="true"
@before="before()"
@after="after()"
@queue="queueUpdated"
/>
</div>
@ -17,7 +15,6 @@
<script lang="ts">
import { defineComponent, defineAsyncComponent, computed } from 'vue';
import Progress from '@/scripts/loading';
import XTimeline from '@/components/timeline.vue';
import { scroll } from '@/scripts/scroll';
import * as os from '@/os';
@ -76,14 +73,6 @@ export default defineComponent({
},
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
},
queueUpdated(q) {
this.queue = q;
},

13
packages/client/src/pages/favorites.vue
View File

@ -1,14 +1,13 @@
<template>
<div class="jmelgwjh">
<div class="body">
<XNotes class="notes" :pagination="pagination" :detail="true" :prop="'note'" @before="before()" @after="after()"/>
<XNotes class="notes" :pagination="pagination" :detail="true" :prop="'note'"/>
</div>
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import Progress from '@/scripts/loading';
import XNotes from '@/components/notes.vue';
import * as os from '@/os';
import * as symbols from '@/symbols';
@ -33,16 +32,6 @@ export default defineComponent({
},
};
},
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
}
}
});
</script>

13
packages/client/src/pages/featured.vue
View File

@ -1,12 +1,11 @@
<template>
<MkSpacer :content-max="800">
<XNotes ref="notes" :pagination="pagination" @before="before" @after="after"/>
<XNotes ref="notes" :pagination="pagination"/>
</MkSpacer>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import Progress from '@/scripts/loading';
import XNotes from '@/components/notes.vue';
import * as symbols from '@/symbols';
@ -29,15 +28,5 @@ export default defineComponent({
},
};
},
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
}
}
});
</script>

13
packages/client/src/pages/mentions.vue
View File

@ -1,12 +1,11 @@
<template>
<MkSpacer :content-max="800">
<XNotes :pagination="pagination" @before="before()" @after="after()"/>
<XNotes :pagination="pagination"/>
</MkSpacer>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import Progress from '@/scripts/loading';
import XNotes from '@/components/notes.vue';
import * as symbols from '@/symbols';
@ -28,15 +27,5 @@ export default defineComponent({
},
};
},
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
}
}
});
</script>

13
packages/client/src/pages/messages.vue
View File

@ -1,12 +1,11 @@
<template>
<MkSpacer :content-max="800">
<XNotes :pagination="pagination" @before="before()" @after="after()"/>
<XNotes :pagination="pagination"/>
</MkSpacer>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import Progress from '@/scripts/loading';
import XNotes from '@/components/notes.vue';
import * as symbols from '@/symbols';
@ -31,15 +30,5 @@ export default defineComponent({
},
};
},
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
}
}
});
</script>

3
packages/client/src/pages/my-groups/group.vue
View File

@ -35,7 +35,6 @@
<script lang="ts">
import { computed, defineComponent } from 'vue';
import Progress from '@/scripts/loading';
import MkButton from '@/components/ui/button.vue';
import * as os from '@/os';
import * as symbols from '@/symbols';
@ -73,7 +72,6 @@ export default defineComponent({
methods: {
fetch() {
Progress.start();
os.api('users/groups/show', {
groupId: this.groupId
}).then(group => {
@ -82,7 +80,6 @@ export default defineComponent({
userIds: this.group.userIds
}).then(users => {
this.users = users;
Progress.done();
});
});
},

3
packages/client/src/pages/my-lists/list.vue
View File

@ -36,7 +36,6 @@
<script lang="ts">
import { computed, defineComponent } from 'vue';
import Progress from '@/scripts/loading';
import MkButton from '@/components/ui/button.vue';
import * as os from '@/os';
import * as symbols from '@/symbols';
@ -68,7 +67,6 @@ export default defineComponent({
methods: {
fetch() {
Progress.start();
os.api('users/lists/show', {
listId: this.$route.params.list
}).then(list => {
@ -77,7 +75,6 @@ export default defineComponent({
userIds: this.list.userIds
}).then(users => {
this.users = users;
Progress.done();
});
});
},

11
packages/client/src/pages/notifications.vue
View File

@ -1,14 +1,13 @@
<template>
<MkSpacer :content-max="800">
<div class="clupoqwt">
<XNotifications class="notifications" :include-types="includeTypes" :unread-only="tab === 'unread'" @before="before" @after="after"/>
<XNotifications class="notifications" :include-types="includeTypes" :unread-only="tab === 'unread'"/>
</div>
</MkSpacer>
</template>
<script lang="ts">
import { computed, defineComponent } from 'vue';
import Progress from '@/scripts/loading';
import XNotifications from '@/components/notifications.vue';
import * as os from '@/os';
import * as symbols from '@/symbols';
@ -53,14 +52,6 @@ export default defineComponent({
},
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
},
setFilter(ev) {
const typeItems = notificationTypes.map(t => ({
text: this.$t(`_notification._types.${t}`),

13
packages/client/src/pages/search.vue
View File

@ -1,14 +1,13 @@
<template>
<div class="_section">
<div class="_content">
<XNotes ref="notes" :pagination="pagination" @before="before" @after="after"/>
<XNotes ref="notes" :pagination="pagination"/>
</div>
</div>
</template>
<script lang="ts">
import { computed, defineComponent } from 'vue';
import Progress from '@/scripts/loading';
import XNotes from '@/components/notes.vue';
import * as symbols from '@/symbols';
@ -39,15 +38,5 @@ export default defineComponent({
(this.$refs.notes as any).reload();
}
},
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
}
}
});
</script>

13
packages/client/src/pages/tag.vue
View File

@ -1,12 +1,11 @@
<template>
<div class="_section">
<XNotes ref="notes" class="_content" :pagination="pagination" @before="before" @after="after"/>
<XNotes ref="notes" class="_content" :pagination="pagination"/>
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import Progress from '@/scripts/loading';
import XNotes from '@/components/notes.vue';
import * as symbols from '@/symbols';
@ -43,15 +42,5 @@ export default defineComponent({
(this.$refs.notes as any).reload();
}
},
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
}
}
});
</script>

11
packages/client/src/pages/timeline.vue
View File

@ -10,8 +10,6 @@
class="tl"
:src="src"
:sound="true"
@before="before()"
@after="after()"
@queue="queueUpdated"
/>
</div>
@ -21,7 +19,6 @@
<script lang="ts">
import { defineComponent, defineAsyncComponent, computed } from 'vue';
import Progress from '@/scripts/loading';
import XTimeline from '@/components/timeline.vue';
import XPostForm from '@/components/post-form.vue';
import { scroll } from '@/scripts/scroll';
@ -118,14 +115,6 @@ export default defineComponent({
},
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
},
queueUpdated(q) {
this.queue = q;
},

11
packages/client/src/pages/user-list-timeline.vue
View File

@ -7,8 +7,6 @@
src="list"
:list="listId"
:sound="true"
@before="before()"
@after="after()"
@queue="queueUpdated"
/>
</div>
@ -17,7 +15,6 @@
<script lang="ts">
import { defineComponent, defineAsyncComponent, computed } from 'vue';
import Progress from '@/scripts/loading';
import XTimeline from '@/components/timeline.vue';
import { scroll } from '@/scripts/scroll';
import * as os from '@/os';
@ -76,14 +73,6 @@ export default defineComponent({
},
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
},
queueUpdated(q) {
this.queue = q;
},

4
packages/client/src/pages/user/index.vue
View File

@ -205,7 +205,6 @@ import MkFolder from '@/components/ui/folder.vue';
import MkRemoteCaution from '@/components/remote-caution.vue';
import MkTab from '@/components/tab.vue';
import MkInfo from '@/components/ui/info.vue';
import Progress from '@/scripts/loading';
import * as Acct from 'misskey-js/built/acct';
import { getScrollPosition } from '@/scripts/scroll';
import { getUserMenu } from '@/scripts/get-user-menu';
@ -328,13 +327,10 @@ export default defineComponent({
fetch() {
if (this.acct == null) return;
this.user = null;
Progress.start();
os.api('users/show', Acct.parse(this.acct)).then(user => {
this.user = user;
}).catch(e => {
this.error = e;
}).finally(() => {
Progress.done();
});
},

11
packages/client/src/scripts/loading.ts
View File

@ -1,11 +0,0 @@
export default {
start: () => {
// TODO
},
done: () => {
// TODO
},
set: val => {
// TODO
}
};

13
packages/client/src/ui/_common_/sidebar.vue
View File

@ -170,6 +170,8 @@ export default defineComponent({
}
&:hover, &.active {
color: var(--accent);
&:before {
content: "";
display: block;
@ -283,8 +285,10 @@ export default defineComponent({
}
&:before {
width: 100%;
border-radius: 0;
width: auto;
height: 100%;
aspect-ratio: 1/1;
border-radius: 8px;
}
&.post {
@ -296,8 +300,9 @@ export default defineComponent({
}
&.post:before {
width: calc(100% - 32px);
height: calc(100% - 32px);
width: calc(100% - 28px);
height: auto;
aspect-ratio: 1/1;
border-radius: 100%;
}
}

11
packages/client/src/ui/deck/direct-column.vue
View File

@ -8,7 +8,6 @@
<script lang="ts">
import { defineComponent } from 'vue';
import Progress from '@/scripts/loading';
import XColumn from './column.vue';
import XNotes from '@/components/notes.vue';
import * as os from '@/os';
@ -41,15 +40,5 @@ export default defineComponent({
},
}
},
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
}
}
});
</script>

11
packages/client/src/ui/deck/mentions-column.vue
View File

@ -8,7 +8,6 @@
<script lang="ts">
import { defineComponent } from 'vue';
import Progress from '@/scripts/loading';
import XColumn from './column.vue';
import XNotes from '@/components/notes.vue';
import * as os from '@/os';
@ -38,15 +37,5 @@ export default defineComponent({
},
}
},
methods: {
before() {
Progress.start();
},
after() {
Progress.done();
}
}
});
</script>