sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into Ncat

Browse Source
This commit is contained in:
nullnyat
2022-01-29 06:03:44 +09:00
parent 89120d45c0 97885d3def
commit ed0eafbfd0
25 changed files with 21495 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/src/pages/about-misskey.vue
View File

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

5
packages/client/src/pages/messaging/messaging-room.form.vue
View File

@ -24,7 +24,7 @@
<script lang="ts">
import { defineComponent, defineAsyncComponent } from 'vue';
import insertTextAtCursor from 'insert-text-at-cursor';
import * as autosize from 'autosize';
import autosize from 'autosize';
import { formatTimeString } from '@/scripts/format-time-string';
import { selectFile } from '@/scripts/select-file';
import * as os from '@/os';
@ -76,7 +76,8 @@ export default defineComponent({
autosize(this.$refs.text);
// 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];

2
packages/client/src/pages/messaging/messaging-room.vue
View File

@ -11,7 +11,7 @@
<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 }}
</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"/>
</XList>
</div>

2
packages/client/src/pages/share.vue
View File

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

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

@ -19,7 +19,7 @@
<MkUserName class="name" :user="user" :nowrap="true"/>
<div class="bottom">
<span class="username"><MkAcct :user="user" :detail="true" /></span>
<span v-if="user.isAdmin" :title="$ts.isAdmin" style="color: var(--badge);"><img style="height: 20px; transform: translateY(4px);" src="https://s3.nca10.net/misskey/e322f15e-ac35-40bd-a457-6a7b07b8764f.svg"/></span>
<span v-if="user.isAdmin" :title="$ts.isAdmin" style="color: var(--badge);"><i class="fas fa-bookmark"></i></span>
<span v-if="!user.isAdmin && user.isModerator" :title="$ts.isModerator" style="color: var(--badge);"><i class="far fa-bookmark"></i></span>
<span v-if="user.isLocked" :title="$ts.isLocked"><i class="fas fa-lock"></i></span>
<span v-if="user.isBot" :title="$ts.isBot"><i class="fas fa-robot"></i></span>
@ -36,7 +36,7 @@
<MkUserName :user="user" :nowrap="false" class="name"/>
<div class="bottom">
<span class="username"><MkAcct :user="user" :detail="true" /></span>
<span v-if="user.isAdmin" :title="$ts.isAdmin" style="color: var(--badge);"><img style="height: 20px; transform: translateY(4px);" src="https://s3.nca10.net/misskey/e322f15e-ac35-40bd-a457-6a7b07b8764f.svg"/></span>
<span v-if="user.isAdmin" :title="$ts.isAdmin" style="color: var(--badge);"><i class="fas fa-bookmark"></i></span>
<span v-if="!user.isAdmin && user.isModerator" :title="$ts.isModerator" style="color: var(--badge);"><i class="far fa-bookmark"></i></span>
<span v-if="user.isLocked" :title="$ts.isLocked"><i class="fas fa-lock"></i></span>
<span v-if="user.isBot" :title="$ts.isBot"><i class="fas fa-robot"></i></span>