Filtered
@@ -32,34 +12,25 @@
v-html="
$t('notification.favourite.body', {
username: username(message.account),
- interpolation: { escapeValue: false },
+ interpolation: { escapeValue: false }
})
"
>
-
+
-
+
-
+
{{ parseDatetime(message.status.created_at) }}
@@ -79,14 +50,7 @@
>
{{ $t('cards.toot.show_more') }}
-
+
{{ $t('cards.toot.hide') }}
@@ -99,9 +63,7 @@
-
- GIF
- VIDEO
+
@@ -175,42 +117,42 @@ export default {
name: 'favourite',
components: {
FailoverImg,
- LinkPreview,
+ LinkPreview
},
props: {
message: {
type: Object,
- default: {},
+ default: {}
},
filters: {
type: Array,
- default: [],
+ default: []
},
focused: {
type: Boolean,
- default: false,
+ default: false
},
overlaid: {
type: Boolean,
- default: false,
- },
+ default: false
+ }
},
data() {
return {
showContent: false,
- showAttachments: false,
+ showAttachments: false
}
},
computed: {
...mapState('App', {
- displayNameStyle: (state) => state.displayNameStyle,
- timeFormat: (state) => state.timeFormat,
- language: (state) => state.language,
- hideAllAttachments: (state) => state.hideAllAttachments,
+ displayNameStyle: state => state.displayNameStyle,
+ timeFormat: state => state.timeFormat,
+ language: state => state.language,
+ hideAllAttachments: state => state.hideAllAttachments
}),
shortcutEnabled: function () {
return this.focused && !this.overlaid
- },
+ }
},
mounted() {
if (this.focused) {
@@ -228,7 +170,7 @@ export default {
this.$refs.status.blur()
})
}
- },
+ }
},
methods: {
username(account) {
@@ -256,31 +198,17 @@ export default {
}
const parsedAccount = findAccount(e.target, 'favourite')
if (parsedAccount !== null) {
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
this.$store
- .dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/searchAccount',
- parsedAccount
- )
- .then((account) => {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
+ .dispatch('TimelineSpace/Contents/SideBar/AccountProfile/searchAccount', parsedAccount)
+ .then(account => {
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
})
- .catch((err) => {
+ .catch(err => {
console.error(err)
this.openLink(e)
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- false
- )
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', false)
})
return parsedAccount.acct
}
@@ -293,28 +221,14 @@ export default {
}
},
openUser(account) {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
openDetail(message) {
this.$store.dispatch('TimelineSpace/Contents/SideBar/openTootComponent')
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/TootDetail/changeToot',
- message
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/TootDetail/changeToot', message)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
mediaAttachments(message) {
return message.media_attachments
@@ -329,10 +243,7 @@ export default {
return !this.spoilered(message) || this.showContent
},
sensitive(message) {
- return (
- (this.hideAllAttachments || message.sensitive) &&
- this.mediaAttachments(message).length > 0
- )
+ return (this.hideAllAttachments || message.sensitive) && this.mediaAttachments(message).length > 0
},
isShowAttachments(message) {
return !this.sensitive(message) || this.showAttachments
@@ -364,8 +275,8 @@ export default {
this.openUser(this.message.account)
break
}
- },
- },
+ }
+ }
}
diff --git a/src/renderer/components/organisms/Notification/Follow.vue b/src/renderer/components/organisms/Notification/Follow.vue
index 1efb6513..bb102a71 100644
--- a/src/renderer/components/organisms/Notification/Follow.vue
+++ b/src/renderer/components/organisms/Notification/Follow.vue
@@ -1,18 +1,5 @@
-
+
+ GIF
+ VIDEO
+
@@ -24,7 +11,7 @@
v-html="
$t('notification.follow.body', {
username: username(message.account),
- interpolation: { escapeValue: false },
+ interpolation: { escapeValue: false }
})
"
>
@@ -47,26 +34,26 @@ import emojify from '~/src/renderer/utils/emojify'
export default {
name: 'follow',
components: {
- FailoverImg,
+ FailoverImg
},
props: {
message: {
type: Object,
- default: {},
+ default: {}
},
focused: {
type: Boolean,
- default: false,
+ default: false
},
overlaid: {
type: Boolean,
- default: false,
- },
+ default: false
+ }
},
computed: {
shortcutEnabled: function () {
return this.focused && !this.overlaid
- },
+ }
},
mounted() {
if (this.focused) {
@@ -84,7 +71,7 @@ export default {
this.$refs.status.blur()
})
}
- },
+ }
},
methods: {
username(account) {
@@ -95,17 +82,9 @@ export default {
}
},
openUser(account) {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
handleStatusControl(event) {
switch (event.srcKey) {
@@ -122,8 +101,8 @@ export default {
this.openUser(this.message.account)
break
}
- },
- },
+ }
+ }
}
diff --git a/src/renderer/components/organisms/Notification/FollowRequest.vue b/src/renderer/components/organisms/Notification/FollowRequest.vue
index e76650e9..6824cfd6 100644
--- a/src/renderer/components/organisms/Notification/FollowRequest.vue
+++ b/src/renderer/components/organisms/Notification/FollowRequest.vue
@@ -1,18 +1,5 @@
-
+
@@ -24,7 +11,7 @@
v-html="
$t('notification.follow_request.body', {
username: username(message.account),
- interpolation: { escapeValue: false },
+ interpolation: { escapeValue: false }
})
"
>
@@ -47,26 +34,26 @@ import emojify from '~/src/renderer/utils/emojify'
export default {
name: 'follow-request',
components: {
- FailoverImg,
+ FailoverImg
},
props: {
message: {
type: Object,
- default: {},
+ default: {}
},
focused: {
type: Boolean,
- default: false,
+ default: false
},
overlaid: {
type: Boolean,
- default: false,
- },
+ default: false
+ }
},
computed: {
shortcutEnabled: function () {
return this.focused && !this.overlaid
- },
+ }
},
mounted() {
if (this.focused) {
@@ -84,7 +71,7 @@ export default {
this.$refs.status.blur()
})
}
- },
+ }
},
methods: {
username(account) {
@@ -95,17 +82,9 @@ export default {
}
},
openUser(account) {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
handleStatusControl(event) {
switch (event.srcKey) {
@@ -122,8 +101,8 @@ export default {
this.openUser(this.message.account)
break
}
- },
- },
+ }
+ }
}
diff --git a/src/renderer/components/organisms/Notification/PollExpired.vue b/src/renderer/components/organisms/Notification/PollExpired.vue
index ae402e23..c61e2e72 100644
--- a/src/renderer/components/organisms/Notification/PollExpired.vue
+++ b/src/renderer/components/organisms/Notification/PollExpired.vue
@@ -1,25 +1,5 @@
-
+
-
Filtered
@@ -32,34 +12,25 @@
v-html="
$t('notification.poll_expired.body', {
username: username(message.account),
- interpolation: { escapeValue: false },
+ interpolation: { escapeValue: false }
})
"
>
-
+
-
+
-
+
{{ parseDatetime(message.status.created_at) }}
@@ -79,14 +50,7 @@
>
{{ $t('cards.toot.show_more') }}
-
+
{{ $t('cards.toot.hide') }}
@@ -99,9 +63,7 @@
-
- GIF
- VIDEO
+
@@ -175,42 +117,42 @@ export default {
name: 'poll-expired',
components: {
FailoverImg,
- LinkPreview,
+ LinkPreview
},
props: {
message: {
type: Object,
- default: {},
+ default: {}
},
filters: {
type: Array,
- default: [],
+ default: []
},
focused: {
type: Boolean,
- default: false,
+ default: false
},
overlaid: {
type: Boolean,
- default: false,
- },
+ default: false
+ }
},
data() {
return {
showContent: false,
- showAttachments: false,
+ showAttachments: false
}
},
computed: {
...mapState('App', {
- displayNameStyle: (state) => state.displayNameStyle,
- timeFormat: (state) => state.timeFormat,
- language: (state) => state.language,
- hideAllAttachments: (state) => state.hideAllAttachments,
+ displayNameStyle: state => state.displayNameStyle,
+ timeFormat: state => state.timeFormat,
+ language: state => state.language,
+ hideAllAttachments: state => state.hideAllAttachments
}),
shortcutEnabled: function () {
return this.focused && !this.overlaid
- },
+ }
},
mounted() {
if (this.focused) {
@@ -228,7 +170,7 @@ export default {
this.$refs.status.blur()
})
}
- },
+ }
},
methods: {
username(account) {
@@ -256,31 +198,17 @@ export default {
}
const parsedAccount = findAccount(e.target, 'poll-expired')
if (parsedAccount !== null) {
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
this.$store
- .dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/searchAccount',
- parsedAccount
- )
- .then((account) => {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
+ .dispatch('TimelineSpace/Contents/SideBar/AccountProfile/searchAccount', parsedAccount)
+ .then(account => {
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
})
- .catch((err) => {
+ .catch(err => {
console.error(err)
this.openLink(e)
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- false
- )
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', false)
})
return parsedAccount.acct
}
@@ -293,28 +221,14 @@ export default {
}
},
openUser(account) {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
openDetail(message) {
this.$store.dispatch('TimelineSpace/Contents/SideBar/openTootComponent')
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/TootDetail/changeToot',
- message
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/TootDetail/changeToot', message)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
mediaAttachments(message) {
return message.media_attachments
@@ -329,10 +243,7 @@ export default {
return !this.spoilered(message) || this.showContent
},
sensitive(message) {
- return (
- (this.hideAllAttachments || message.sensitive) &&
- this.mediaAttachments(message).length > 0
- )
+ return (this.hideAllAttachments || message.sensitive) && this.mediaAttachments(message).length > 0
},
isShowAttachments(message) {
return !this.sensitive(message) || this.showAttachments
@@ -364,8 +275,8 @@ export default {
this.openUser(this.message.account)
break
}
- },
- },
+ }
+ }
}
diff --git a/src/renderer/components/organisms/Notification/PollVote.vue b/src/renderer/components/organisms/Notification/PollVote.vue
index 9bba66ec..1b72a607 100644
--- a/src/renderer/components/organisms/Notification/PollVote.vue
+++ b/src/renderer/components/organisms/Notification/PollVote.vue
@@ -1,25 +1,5 @@
-
+
+ GIF
+ VIDEO
+
-
Filtered
@@ -32,34 +12,25 @@
v-html="
$t('notification.poll_vote.body', {
username: username(message.account),
- interpolation: { escapeValue: false },
+ interpolation: { escapeValue: false }
})
"
>
-
+
-
+
-
+
{{ parseDatetime(message.status.created_at) }}
@@ -79,14 +50,7 @@
>
{{ $t('cards.toot.show_more') }}
-
+
{{ $t('cards.toot.hide') }}
@@ -99,9 +63,7 @@
-
- GIF
- VIDEO
+
@@ -175,42 +117,42 @@ export default {
name: 'poll-vote',
components: {
FailoverImg,
- LinkPreview,
+ LinkPreview
},
props: {
message: {
type: Object,
- default: {},
+ default: {}
},
filters: {
type: Array,
- default: [],
+ default: []
},
focused: {
type: Boolean,
- default: false,
+ default: false
},
overlaid: {
type: Boolean,
- default: false,
- },
+ default: false
+ }
},
data() {
return {
showContent: false,
- showAttachments: false,
+ showAttachments: false
}
},
computed: {
...mapState('App', {
- displayNameStyle: (state) => state.displayNameStyle,
- timeFormat: (state) => state.timeFormat,
- language: (state) => state.language,
- hideAllAttachments: (state) => state.hideAllAttachments,
+ displayNameStyle: state => state.displayNameStyle,
+ timeFormat: state => state.timeFormat,
+ language: state => state.language,
+ hideAllAttachments: state => state.hideAllAttachments
}),
shortcutEnabled: function () {
return this.focused && !this.overlaid
- },
+ }
},
mounted() {
if (this.focused) {
@@ -228,7 +170,7 @@ export default {
this.$refs.status.blur()
})
}
- },
+ }
},
methods: {
username(account) {
@@ -256,31 +198,17 @@ export default {
}
const parsedAccount = findAccount(e.target, 'poll-vote')
if (parsedAccount !== null) {
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
this.$store
- .dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/searchAccount',
- parsedAccount
- )
- .then((account) => {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
+ .dispatch('TimelineSpace/Contents/SideBar/AccountProfile/searchAccount', parsedAccount)
+ .then(account => {
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
})
- .catch((err) => {
+ .catch(err => {
console.error(err)
this.openLink(e)
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- false
- )
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', false)
})
return parsedAccount.acct
}
@@ -293,28 +221,14 @@ export default {
}
},
openUser(account) {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
openDetail(message) {
this.$store.dispatch('TimelineSpace/Contents/SideBar/openTootComponent')
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/TootDetail/changeToot',
- message
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/TootDetail/changeToot', message)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
mediaAttachments(message) {
return message.media_attachments
@@ -329,10 +243,7 @@ export default {
return !this.spoilered(message) || this.showContent
},
sensitive(message) {
- return (
- (this.hideAllAttachments || message.sensitive) &&
- this.mediaAttachments(message).length > 0
- )
+ return (this.hideAllAttachments || message.sensitive) && this.mediaAttachments(message).length > 0
},
isShowAttachments(message) {
return !this.sensitive(message) || this.showAttachments
@@ -364,8 +275,8 @@ export default {
this.openUser(this.message.account)
break
}
- },
- },
+ }
+ }
}
diff --git a/src/renderer/components/organisms/Notification/Quote.vue b/src/renderer/components/organisms/Notification/Quote.vue
index 0aad57f8..f881ec47 100644
--- a/src/renderer/components/organisms/Notification/Quote.vue
+++ b/src/renderer/components/organisms/Notification/Quote.vue
@@ -1,25 +1,5 @@
-
+
+ GIF
+ VIDEO
+
Filtered
@@ -32,30 +12,20 @@
v-html="
$t('notification.quote.body', {
username: username(message.account),
- interpolation: { escapeValue: false },
+ interpolation: { escapeValue: false }
})
"
>
-
+
-
-
+
- state.timeFormat,
- language: (state) => state.language,
- hideAllAttachments: (state) => state.hideAllAttachments,
+ timeFormat: state => state.timeFormat,
+ language: state => state.language,
+ hideAllAttachments: state => state.hideAllAttachments
}),
shortcutEnabled: function () {
return this.focused && !this.overlaid
- },
+ }
},
mounted() {
if (this.focused) {
@@ -249,7 +181,7 @@ export default {
this.$refs.status.blur()
})
}
- },
+ }
},
methods: {
username(account) {
@@ -277,30 +209,16 @@ export default {
}
const parsedAccount = findAccount(e.target, 'quoted')
if (parsedAccount !== null) {
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
this.$store
- .dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/searchAccount',
- parsedAccount
- )
- .then((account) => {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
+ .dispatch('TimelineSpace/Contents/SideBar/AccountProfile/searchAccount', parsedAccount)
+ .then(account => {
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
})
.catch(() => {
this.openLink(e)
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- false
- )
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', false)
})
return parsedAccount
}
@@ -313,28 +231,14 @@ export default {
}
},
openUser(account) {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
openDetail(message) {
this.$store.dispatch('TimelineSpace/Contents/SideBar/openTootComponent')
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/TootDetail/changeToot',
- message
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/TootDetail/changeToot', message)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
mediaAttachments(message) {
return message.media_attachments
@@ -349,10 +253,7 @@ export default {
return !this.spoilered(message) || this.showContent
},
sensitive(message) {
- return (
- (this.hideAllAttachments || message.sensitive) &&
- this.mediaAttachments(message).length > 0
- )
+ return (this.hideAllAttachments || message.sensitive) && this.mediaAttachments(message).length > 0
},
isShowAttachments(message) {
return !this.sensitive(message) || this.showAttachments
@@ -381,8 +282,8 @@ export default {
this.openUser(this.message.account)
break
}
- },
- },
+ }
+ }
}
diff --git a/src/renderer/components/organisms/Notification/Reaction.vue b/src/renderer/components/organisms/Notification/Reaction.vue
index ecb707e4..3b4fe7c8 100644
--- a/src/renderer/components/organisms/Notification/Reaction.vue
+++ b/src/renderer/components/organisms/Notification/Reaction.vue
@@ -1,25 +1,5 @@
-
+
@@ -71,11 +41,7 @@
-
+
{{ $t('cards.toot.show_more') }}
-
+
{{ $t('cards.toot.hide') }}
@@ -106,9 +65,7 @@
-
- GIF
- VIDEO
+
@@ -158,12 +95,7 @@
:icon="message.status.reblog.account.avatar"
:username="username(message.status.reblog.account)"
:accountName="''"
- :body="
- emojiText(
- message.status.reblog.content,
- message.status.reblog.emojis
- )
- "
+ :body="emojiText(message.status.reblog.content, message.status.reblog.emojis)"
@select="openDetail(message.status.reblog)"
/>
+
+ GIF
+ VIDEO
+
-
Filtered
@@ -32,34 +12,25 @@
v-html="
$t('notification.reaction.body', {
username: username(message.account),
- interpolation: { escapeValue: false },
+ interpolation: { escapeValue: false }
})
"
>
-
+
-
+
-
+
{{ parseDatetime(message.status.created_at) }}
@@ -79,14 +50,7 @@
>
{{ $t('cards.toot.show_more') }}
-
+
{{ $t('cards.toot.hide') }}
@@ -99,9 +63,7 @@
-
- GIF
- VIDEO
+
@@ -175,42 +117,42 @@ export default {
name: 'reaction',
components: {
FailoverImg,
- LinkPreview,
+ LinkPreview
},
props: {
message: {
type: Object,
- default: {},
+ default: {}
},
filters: {
type: Array,
- default: [],
+ default: []
},
focused: {
type: Boolean,
- default: false,
+ default: false
},
overlaid: {
type: Boolean,
- default: false,
- },
+ default: false
+ }
},
data() {
return {
showContent: false,
- showAttachments: false,
+ showAttachments: false
}
},
computed: {
...mapState('App', {
- displayNameStyle: (state) => state.displayNameStyle,
- timeFormat: (state) => state.timeFormat,
- language: (state) => state.language,
- hideAllAttachments: (state) => state.hideAllAttachments,
+ displayNameStyle: state => state.displayNameStyle,
+ timeFormat: state => state.timeFormat,
+ language: state => state.language,
+ hideAllAttachments: state => state.hideAllAttachments
}),
shortcutEnabled: function () {
return this.focused && !this.overlaid
- },
+ }
},
mounted() {
if (this.focused) {
@@ -228,7 +170,7 @@ export default {
this.$refs.status.blur()
})
}
- },
+ }
},
methods: {
username(account) {
@@ -256,31 +198,17 @@ export default {
}
const parsedAccount = findAccount(e.target, 'favourite')
if (parsedAccount !== null) {
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
this.$store
- .dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/searchAccount',
- parsedAccount
- )
- .then((account) => {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
+ .dispatch('TimelineSpace/Contents/SideBar/AccountProfile/searchAccount', parsedAccount)
+ .then(account => {
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
})
- .catch((err) => {
+ .catch(err => {
console.error(err)
this.openLink(e)
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- false
- )
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', false)
})
return parsedAccount.acct
}
@@ -293,28 +221,14 @@ export default {
}
},
openUser(account) {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
openDetail(message) {
this.$store.dispatch('TimelineSpace/Contents/SideBar/openTootComponent')
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/TootDetail/changeToot',
- message
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/TootDetail/changeToot', message)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
mediaAttachments(message) {
return message.media_attachments
@@ -329,10 +243,7 @@ export default {
return !this.spoilered(message) || this.showContent
},
sensitive(message) {
- return (
- (this.hideAllAttachments || message.sensitive) &&
- this.mediaAttachments(message).length > 0
- )
+ return (this.hideAllAttachments || message.sensitive) && this.mediaAttachments(message).length > 0
},
isShowAttachments(message) {
return !this.sensitive(message) || this.showAttachments
@@ -364,8 +275,8 @@ export default {
this.openUser(this.message.account)
break
}
- },
- },
+ }
+ }
}
diff --git a/src/renderer/components/organisms/Notification/Reblog.vue b/src/renderer/components/organisms/Notification/Reblog.vue
index f7aa9c20..37250eeb 100644
--- a/src/renderer/components/organisms/Notification/Reblog.vue
+++ b/src/renderer/components/organisms/Notification/Reblog.vue
@@ -1,25 +1,5 @@
-
+
+ GIF
+ VIDEO
+
Filtered
@@ -32,30 +12,20 @@
v-html="
$t('notification.reblog.body', {
username: username(message.account),
- interpolation: { escapeValue: false },
+ interpolation: { escapeValue: false }
})
"
>
-
+
-
-
+
-
+
@@ -82,14 +52,7 @@
>
{{ $t('cards.toot.show_more') }}
-
+
{{ $t('cards.toot.hide') }}
@@ -102,9 +65,7 @@
-
- GIF
- VIDEO
+
@@ -178,41 +119,41 @@ export default {
name: 'reblog',
components: {
FailoverImg,
- LinkPreview,
+ LinkPreview
},
props: {
message: {
type: Object,
- default: {},
+ default: {}
},
filters: {
type: Array,
- default: [],
+ default: []
},
focused: {
type: Boolean,
- default: false,
+ default: false
},
overlaid: {
type: Boolean,
- default: false,
- },
+ default: false
+ }
},
data() {
return {
showContent: false,
- showAttachments: false,
+ showAttachments: false
}
},
computed: {
...mapState('App', {
- timeFormat: (state) => state.timeFormat,
- language: (state) => state.language,
- hideAllAttachments: (state) => state.hideAllAttachments,
+ timeFormat: state => state.timeFormat,
+ language: state => state.language,
+ hideAllAttachments: state => state.hideAllAttachments
}),
shortcutEnabled: function () {
return this.focused && !this.overlaid
- },
+ }
},
mounted() {
if (this.focused) {
@@ -230,7 +171,7 @@ export default {
this.$refs.status.blur()
})
}
- },
+ }
},
methods: {
username(account) {
@@ -258,30 +199,16 @@ export default {
}
const parsedAccount = findAccount(e.target, 'reblog')
if (parsedAccount !== null) {
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
this.$store
- .dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/searchAccount',
- parsedAccount
- )
- .then((account) => {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
+ .dispatch('TimelineSpace/Contents/SideBar/AccountProfile/searchAccount', parsedAccount)
+ .then(account => {
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
})
.catch(() => {
this.openLink(e)
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- false
- )
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', false)
})
return parsedAccount
}
@@ -294,28 +221,14 @@ export default {
}
},
openUser(account) {
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/openAccountComponent'
- )
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/AccountProfile/changeAccount',
- account
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
openDetail(message) {
this.$store.dispatch('TimelineSpace/Contents/SideBar/openTootComponent')
- this.$store.dispatch(
- 'TimelineSpace/Contents/SideBar/TootDetail/changeToot',
- message
- )
- this.$store.commit(
- 'TimelineSpace/Contents/SideBar/changeOpenSideBar',
- true
- )
+ this.$store.dispatch('TimelineSpace/Contents/SideBar/TootDetail/changeToot', message)
+ this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
},
mediaAttachments(message) {
return message.media_attachments
@@ -330,10 +243,7 @@ export default {
return !this.spoilered(message) || this.showContent
},
sensitive(message) {
- return (
- (this.hideAllAttachments || message.sensitive) &&
- this.mediaAttachments(message).length > 0
- )
+ return (this.hideAllAttachments || message.sensitive) && this.mediaAttachments(message).length > 0
},
isShowAttachments(message) {
return !this.sensitive(message) || this.showAttachments
@@ -365,8 +275,8 @@ export default {
this.openUser(this.message.account)
break
}
- },
- },
+ }
+ }
}
diff --git a/src/renderer/main.js b/src/renderer/main.js
index 03336584..db1f40e1 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -70,8 +70,8 @@ import { sync } from 'vuex-router-sync'
import { createI18n } from 'vue-i18n'
import 'vue-resize/dist/vue-resize.css'
import VueResize from 'vue-resize'
-import VueVirtualScroller from 'vue-virtual-scroller'
-import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
+import VueVirtualScroller from '@h3poteto/vue-virtual-scroller'
+import '@h3poteto/vue-virtual-scroller/dist/vue-virtual-scroller.css'
import './assets/fonts/fonts.css'
import App from './App.vue'
diff --git a/yarn.lock b/yarn.lock
index 31cbe740..659054b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1143,6 +1143,15 @@
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==
+"@h3poteto/vue-virtual-scroller@2.0.0-alpha.1":
+ version "2.0.0-alpha.1"
+ resolved "https://npm.pkg.github.com/download/@h3poteto/vue-virtual-scroller/2.0.0-alpha.1/202991053ed05fd7f919ac4451e35a6e8a8f2d5297f042c3f2a7c5de34b05288#793c1b17f3515cd29dc267e67d1a61a90aeec9f1"
+ integrity sha512-gfSCGPGAEBuk6znAsFb/0vj6FiCbvEPXhipAojWECyFPtnFF3XH36So37CfHT7i7+96Mq+e1GfV8HfO6SQaaVg==
+ dependencies:
+ mitt "^2.1.0"
+ vue-observe-visibility "^2.0.0-alpha.1"
+ vue-resize "^2.0.0-alpha.1"
+
"@humanwhocodes/config-array@^0.5.0":
version "0.5.0"
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
@@ -4391,11 +4400,6 @@ csstype@^2.6.8:
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.20.tgz#9229c65ea0b260cf4d3d997cb06288e36a8d6dda"
integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==
-custom-event-polyfill@^1.0.7:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/custom-event-polyfill/-/custom-event-polyfill-1.0.7.tgz#9bc993ddda937c1a30ccd335614c6c58c4f87aee"
- integrity sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w==
-
dashdash@^1.12.0:
version "1.14.1"
resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -5073,11 +5077,6 @@ elegant-spinner@^1.0.1:
resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
-element-matches@^0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/element-matches/-/element-matches-0.1.2.tgz#7345cb71e965bd2b12f725e524591c102198361a"
- integrity sha512-yWh1otcs3OKUWDvu/IxyI36ZI3WNaRZlI0uG/DK6fu0pap0VYZ0J5pEGTk1zakme+hT0OKHwhlHc0N5TJhY6yQ==
-
element-plus@^2.1.9:
version "2.1.9"
resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.1.9.tgz#8779b041f32f871eef2f903ee4c0da16dfb13024"
@@ -12420,14 +12419,6 @@ vue-router@^4.0.14:
dependencies:
"@vue/devtools-api" "^6.0.0"
-vue-shortkey@^3.1.7:
- version "3.1.7"
- resolved "https://registry.yarnpkg.com/vue-shortkey/-/vue-shortkey-3.1.7.tgz#31c09a99ed597331a6a49a45eeff894a78a19eef"
- integrity sha512-Wm/vPXXS+4Wl/LoYpD+cZc0J0HIoVlY8Ep0JLIqqswmAya3XUBtsqKbhzEf9sXo+3rZ5p1YsUyZfXas8XD7YjQ==
- dependencies:
- custom-event-polyfill "^1.0.7"
- element-matches "^0.1.2"
-
vue-style-loader@^4.1.3:
version "4.1.3"
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35"
@@ -12445,15 +12436,6 @@ vue-virtual-scroller@^1.0.10:
vue-observe-visibility "^0.4.4"
vue-resize "^0.4.5"
-vue-virtual-scroller@^2.0.0-alpha.1:
- version "2.0.0-alpha.1"
- resolved "https://registry.yarnpkg.com/vue-virtual-scroller/-/vue-virtual-scroller-2.0.0-alpha.1.tgz#5b5410105b8e60ca57bbd5f2faf5ad1d8108d046"
- integrity sha512-Mn5w3Qe06t7c3Imm2RHD43RACab1CCWplpdgzq+/FWJcpQtcGKd5vDep8i+nIwFtzFLsWAqEK0RzM7KrfAcBng==
- dependencies:
- mitt "^2.1.0"
- vue-observe-visibility "^2.0.0-alpha.1"
- vue-resize "^2.0.0-alpha.1"
-
vue@^3.2.31:
version "3.2.33"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.33.tgz#7867eb16a3293a28c4d190a837bc447878bd64c2"
+
+ GIF
+ VIDEO