Merge branch 'develop'

This commit is contained in:
syuilo 2022-01-27 18:00:32 +09:00
commit 97885d3def
7 changed files with 17 additions and 7 deletions

View File

@ -7,8 +7,16 @@
--> -->
## 12.102.1 (2022/01/27)
### Bugfixes
- チャットが表示できない問題を修正
## 12.102.0 (2022/01/27) ## 12.102.0 (2022/01/27)
### NOTE
アップデート後、一部カスタム絵文字が表示できなくなる場合があります。その場合、一旦絵文字管理ページから絵文字を一括エクスポートし、再度コントロールパネルから一括インポートすると直ります。
⚠ 12.102.0以前にエクスポートされたzipとは互換性がありません。アップデートしてからエクスポートを行なってください。
### Changes ### Changes
- Room機能が削除されました - Room機能が削除されました
- 後日別リポジトリとして復活予定です - 後日別リポジトリとして復活予定です

View File

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "12.102.0", "version": "12.102.1",
"codename": "indigo", "codename": "indigo",
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -102,7 +102,7 @@ const props = withDefaults(defineProps<{
initialLocalOnly?: boolean; initialLocalOnly?: boolean;
initialVisibleUsers?: misskey.entities.User[]; initialVisibleUsers?: misskey.entities.User[];
initialNote?: misskey.entities.Note; initialNote?: misskey.entities.Note;
share?: boolean; instant?: boolean;
fixed?: boolean; fixed?: boolean;
autofocus?: boolean; autofocus?: boolean;
}>(), { }>(), {
@ -641,7 +641,7 @@ onMounted(() => {
nextTick(() => { nextTick(() => {
// 稿 // 稿
if (!props.share && !props.mention && !props.specified) { if (!props.instant && !props.mention && !props.specified) {
const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[draftKey]; const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[draftKey];
if (draft) { if (draft) {
text = draft.data.text; text = draft.data.text;

View File

@ -182,6 +182,7 @@ function gravity() {
function iLoveMisskey() { function iLoveMisskey() {
os.post({ os.post({
initialText: 'I $[jelly ❤] #Misskey', initialText: 'I $[jelly ❤] #Misskey',
instant: true,
}); });
} }

View File

@ -24,7 +24,7 @@
<script lang="ts"> <script lang="ts">
import { defineComponent, defineAsyncComponent } from 'vue'; import { defineComponent, defineAsyncComponent } from 'vue';
import insertTextAtCursor from 'insert-text-at-cursor'; import insertTextAtCursor from 'insert-text-at-cursor';
import * as autosize from 'autosize'; import autosize from 'autosize';
import { formatTimeString } from '@/scripts/format-time-string'; import { formatTimeString } from '@/scripts/format-time-string';
import { selectFile } from '@/scripts/select-file'; import { selectFile } from '@/scripts/select-file';
import * as os from '@/os'; import * as os from '@/os';
@ -76,7 +76,8 @@ export default defineComponent({
autosize(this.$refs.text); autosize(this.$refs.text);
// TODO: detach when unmount // TODO: detach when unmount
new Autocomplete(this.$refs.text, this, { model: 'text' }); // TODO
//new Autocomplete(this.$refs.text, this, { model: 'text' });
// 稿 // 稿
const draft = JSON.parse(localStorage.getItem('message_drafts') || '{}')[this.draftKey]; const draft = JSON.parse(localStorage.getItem('message_drafts') || '{}')[this.draftKey];

View File

@ -11,7 +11,7 @@
<button v-show="existMoreMessages" ref="loadMore" class="more _button" :class="{ fetching: fetchingMoreMessages }" :disabled="fetchingMoreMessages" @click="fetchMoreMessages"> <button v-show="existMoreMessages" ref="loadMore" class="more _button" :class="{ fetching: fetchingMoreMessages }" :disabled="fetchingMoreMessages" @click="fetchMoreMessages">
<template v-if="fetchingMoreMessages"><i class="fas fa-spinner fa-pulse fa-fw"></i></template>{{ fetchingMoreMessages ? $ts.loading : $ts.loadMore }} <template v-if="fetchingMoreMessages"><i class="fas fa-spinner fa-pulse fa-fw"></i></template>{{ fetchingMoreMessages ? $ts.loading : $ts.loadMore }}
</button> </button>
<XList v-slot="{ item: message }" class="messages" :items="messages" direction="up" reversed> <XList v-if="messages.length > 0" v-slot="{ item: message }" class="messages" :items="messages" direction="up" reversed>
<XMessage :key="message.id" :message="message" :is-group="group != null"/> <XMessage :key="message.id" :message="message" :is-group="group != null"/>
</XList> </XList>
</div> </div>

View File

@ -5,7 +5,7 @@
<XPostForm <XPostForm
v-if="state === 'writing'" v-if="state === 'writing'"
fixed fixed
:share="true" :instant="true"
:initial-text="initialText" :initial-text="initialText"
:initial-visibility="visibility" :initial-visibility="visibility"
:initial-files="files" :initial-files="files"