profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolve #2230

Browse source
This commit is contained in:
syuilo 2020-01-31 11:35:18 +09:00
parent 259254aca8
commit acd64f58e3
5 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/client/components/notification.vue
View file

@ -37,7 +37,7 @@
<router-link v-if="notification.type === 'quote'" class="text" :to="notification.note | notePage" :title="getNoteSummary(notification.note)"> <router-link v-if="notification.type === 'quote'" class="text" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
<mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="nowrap" :custom-emojis="notification.note.emojis"/> <mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="nowrap" :custom-emojis="notification.note.emojis"/>
</router-link> </router-link>
<span v-if="notification.type === 'follow'" class="text" style="opacity: 0.6;">{{ $t('youGotNewFollower') }}</span> <span v-if="notification.type === 'follow'" class="text" style="opacity: 0.6;">{{ $t('youGotNewFollower') }}<div v-if="!nowrap"><mk-follow-button :user="notification.user"/></div></span>
<span v-if="notification.type === 'followRequestAccepted'" class="text" style="opacity: 0.6;">{{ $t('followRequestAccepted') }}</span> <span v-if="notification.type === 'followRequestAccepted'" class="text" style="opacity: 0.6;">{{ $t('followRequestAccepted') }}</span>
<span v-if="notification.type === 'receiveFollowRequest'" class="text" style="opacity: 0.6;">{{ $t('receiveFollowRequest') }}<div v-if="!nowrap && !followRequestDone"><button class="_textButton" @click="acceptFollowRequest()">{{ $t('accept') }}</button> | <button class="_textButton" @click="rejectFollowRequest()">{{ $t('reject') }}</button></div></span> <span v-if="notification.type === 'receiveFollowRequest'" class="text" style="opacity: 0.6;">{{ $t('receiveFollowRequest') }}<div v-if="!nowrap && !followRequestDone"><button class="_textButton" @click="acceptFollowRequest()">{{ $t('accept') }}</button> | <button class="_textButton" @click="rejectFollowRequest()">{{ $t('reject') }}</button></div></span>
</div> </div>
@ -50,10 +50,13 @@ import { faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faCheck }
import { faClock } from '@fortawesome/free-regular-svg-icons'; import { faClock } from '@fortawesome/free-regular-svg-icons';
import getNoteSummary from '../../misc/get-note-summary'; import getNoteSummary from '../../misc/get-note-summary';
import XReactionIcon from './reaction-icon.vue'; import XReactionIcon from './reaction-icon.vue';
import MkFollowButton from './follow-button.vue';
import i18n from '../i18n';
export default Vue.extend({ export default Vue.extend({
i18n,
components: { components: {
XReactionIcon XReactionIcon, MkFollowButton
}, },
props: { props: {
notification: { notification: {

6
src/client/components/user-list.vue
View file

@ -20,7 +20,7 @@
<span v-else class="empty">{{ $t('noAccountDescription') }}</span> <span v-else class="empty">{{ $t('noAccountDescription') }}</span>
</div> </div>
</div> </div>
<x-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/> <mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
</div> </div>
<button class="more" :class="{ fetching: moreFetching }" v-if="more" @click="fetchMore()" :disabled="moreFetching"> <button class="more" :class="{ fetching: moreFetching }" v-if="more" @click="fetchMore()" :disabled="moreFetching">
<template v-if="moreFetching"><fa icon="spinner" pulse fixed-width/></template>{{ moreFetching ? $t('@.loading') : $t('@.load-more') }} <template v-if="moreFetching"><fa icon="spinner" pulse fixed-width/></template>{{ moreFetching ? $t('@.loading') : $t('@.load-more') }}
@ -34,14 +34,14 @@ import Vue from 'vue';
import i18n from '../i18n'; import i18n from '../i18n';
import paging from '../scripts/paging'; import paging from '../scripts/paging';
import MkContainer from './ui/container.vue'; import MkContainer from './ui/container.vue';
import XFollowButton from './follow-button.vue'; import MkFollowButton from './follow-button.vue';
export default Vue.extend({ export default Vue.extend({
i18n, i18n,
components: { components: {
MkContainer, MkContainer,
XFollowButton, MkFollowButton,
}, },
mixins: [ mixins: [

6
src/client/components/user-preview.vue
View file

@ -21,7 +21,7 @@
<p>{{ $t('followers') }}</p><span>{{ u.followersCount }}</span> <p>{{ $t('followers') }}</p><span>{{ u.followersCount }}</span>
</div> </div>
</div> </div>
<x-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u" mini/> <mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u" mini/>
</div> </div>
</transition> </transition>
</template> </template>
@ -30,13 +30,13 @@
import Vue from 'vue'; import Vue from 'vue';
import i18n from '../i18n'; import i18n from '../i18n';
import parseAcct from '../../misc/acct/parse'; import parseAcct from '../../misc/acct/parse';
import XFollowButton from './follow-button.vue'; import MkFollowButton from './follow-button.vue';
export default Vue.extend({ export default Vue.extend({
i18n, i18n,
components: { components: {
XFollowButton MkFollowButton
}, },
props: { props: {

6
src/client/pages/user/follow-list.vue
View file

@ -10,7 +10,7 @@
<div class="description" v-if="user.description" :title="user.description"> <div class="description" v-if="user.description" :title="user.description">
<mfm :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :plain="true" :nowrap="true"/> <mfm :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :plain="true" :nowrap="true"/>
</div> </div>
<x-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/> <mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
</div> </div>
</div> </div>
</mk-pagination> </mk-pagination>
@ -20,7 +20,7 @@
import Vue from 'vue'; import Vue from 'vue';
import parseAcct from '../../../misc/acct/parse'; import parseAcct from '../../../misc/acct/parse';
import i18n from '../../i18n'; import i18n from '../../i18n';
import XFollowButton from '../../components/follow-button.vue'; import MkFollowButton from '../../components/follow-button.vue';
import MkPagination from '../../components/ui/pagination.vue'; import MkPagination from '../../components/ui/pagination.vue';
export default Vue.extend({ export default Vue.extend({
@ -28,7 +28,7 @@ export default Vue.extend({
components: { components: {
MkPagination, MkPagination,
XFollowButton, MkFollowButton,
}, },
props: { props: {

6
src/client/pages/user/index.vue
View file

@ -22,7 +22,7 @@
<span class="followed" v-if="$store.getters.isSignedIn && $store.state.i.id != user.id && user.isFollowed">{{ $t('followsYou') }}</span> <span class="followed" v-if="$store.getters.isSignedIn && $store.state.i.id != user.id && user.isFollowed">{{ $t('followsYou') }}</span>
<div class="actions" v-if="$store.getters.isSignedIn"> <div class="actions" v-if="$store.getters.isSignedIn">
<button @click="menu" class="menu _button" ref="menu"><fa :icon="faEllipsisH"/></button> <button @click="menu" class="menu _button" ref="menu"><fa :icon="faEllipsisH"/></button>
<x-follow-button v-if="$store.state.i.id != user.id" :user="user" :inline="true" :transparent="false" class="koudoku"/> <mk-follow-button v-if="$store.state.i.id != user.id" :user="user" :inline="true" :transparent="false" class="koudoku"/>
</div> </div>
</div> </div>
<mk-avatar class="avatar" :user="user" :disable-preview="true"/> <mk-avatar class="avatar" :user="user" :disable-preview="true"/>
@ -113,7 +113,7 @@ import * as age from 's-age';
import XUserTimeline from './index.timeline.vue'; import XUserTimeline from './index.timeline.vue';
import XUserMenu from '../../components/user-menu.vue'; import XUserMenu from '../../components/user-menu.vue';
import XNote from '../../components/note.vue'; import XNote from '../../components/note.vue';
import XFollowButton from '../../components/follow-button.vue'; import MkFollowButton from '../../components/follow-button.vue';
import MkContainer from '../../components/ui/container.vue'; import MkContainer from '../../components/ui/container.vue';
import Progress from '../../scripts/loading'; import Progress from '../../scripts/loading';
import parseAcct from '../../../misc/acct/parse'; import parseAcct from '../../../misc/acct/parse';
@ -122,7 +122,7 @@ export default Vue.extend({
components: { components: {
XUserTimeline, XUserTimeline,
XNote, XNote,
XFollowButton, MkFollowButton,
MkContainer, MkContainer,
XPhotos: () => import('./index.photos.vue').then(m => m.default), XPhotos: () => import('./index.photos.vue').then(m => m.default),
XActivity: () => import('./index.activity.vue').then(m => m.default), XActivity: () => import('./index.activity.vue').then(m => m.default),