refs #186 Change username style according to setting

This commit is contained in:
AkiraFukushima 2018-04-18 23:37:00 +09:00
parent 61a1a4b2dd
commit 3e75e18ffd
3 changed files with 43 additions and 7 deletions

View File

@ -7,7 +7,8 @@ const Base = {
fav_rb: true,
toot: true
},
theme: 'white'
theme: 'white',
displayName: 0
}
}

View File

@ -7,7 +7,7 @@
<div class="toot-header">
<div class="user" @click="openUser(originalMessage(message).account)">
<span class="display-name">{{ username(originalMessage(message).account) }}</span>
<span class="acct">@{{ originalMessage(message).account.username }}</span>
<span class="acct">{{ accountName(originalMessage(message).account) }}</span>
</div>
<div class="timestamp">
{{ parseDatetime(message.created_at) }}
@ -65,10 +65,16 @@
<script>
import moment from 'moment'
import { shell } from 'electron'
import { mapState } from 'vuex'
export default {
name: 'toot',
props: ['message'],
computed: {
...mapState({
displayNameStyle: state => state.App.displayNameStyle
})
},
methods: {
originalMessage (message) {
if (message.reblog !== null) {
@ -78,10 +84,31 @@ export default {
}
},
username (account) {
if (account.display_name !== '') {
return account.display_name
} else {
return account.username
switch (this.displayNameStyle) {
case 0:
if (account.display_name !== '') {
return account.display_name
} else {
return account.username
}
case 1:
if (account.display_name !== '') {
return account.display_name
} else {
return account.username
}
case 2:
return `@${account.username}`
}
},
accountName (account) {
switch (this.displayNameStyle) {
case 0:
return `@${account.username}`
case 1:
return ''
case 2:
return ''
}
},
parseDatetime (datetime) {

View File

@ -5,7 +5,11 @@ import { LightTheme, DarkTheme } from '../utils/theme'
const App = {
namespaced: true,
state: {
theme: LightTheme
theme: LightTheme,
// 0: display name and username
// 1: display name
// 2: username
displayNameStyle: 0
},
mutations: {
updateTheme (state, themeName) {
@ -20,6 +24,9 @@ const App = {
state.theme = LightTheme
break
}
},
updateDisplayNameStyle (state, value) {
state.displayNameStyle = value
}
},
actions: {
@ -39,6 +46,7 @@ const App = {
ipcRenderer.once('response-get-preferences', (event, conf) => {
ipcRenderer.removeAllListeners('error-get-preferences')
commit('updateTheme', conf.general.theme)
commit('updateDisplayNameStyle', conf.general.displayName || 0)
})
}
}