commit: 3ffb17c0aed31bbba69b65c5cabf7e31e10167ff
parent: 9557ec59a86570ff0cde941923ae5415aa6ba39a
Author: Roger Braun <roger@rogerbraun.net>
Date: Fri, 27 Apr 2018 09:59:31 +0200
Merge branch 'develop' into csaurus/pleroma-fe-fix-chrome-auto-loading
Diffstat:
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/chat_panel/chat_panel.js b/src/components/chat_panel/chat_panel.js
@@ -3,7 +3,7 @@ const chatPanel = {
return {
currentMessage: '',
channel: null,
- collapsed: false
+ collapsed: true
}
},
computed: {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
@@ -45,7 +45,7 @@ export const prepareStatus = (status) => {
if (status.nsfw === undefined) {
status.nsfw = isNsfw(status)
if (status.retweeted_status) {
- status.retweeted_status.nsfw = status.nsfw
+ status.nsfw = status.retweeted_status.nsfw
}
}
@@ -136,7 +136,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
if (result.new) {
if (statusType(status) === 'retweet' && status.retweeted_status.user.id === user.id) {
- addNotification({ type: 'repeat', status: status.retweeted_status, action: status })
+ addNotification({ type: 'repeat', status: status, action: status })
}
// We are mentioned in a post
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
@@ -297,7 +297,7 @@ describe('The Statuses module', () => {
mutations.addNewStatuses(state, { statuses: [retweet], user })
expect(state.notifications.length).to.eql(1)
- expect(state.notifications[0].status).to.eql(status)
+ expect(state.notifications[0].status).to.eql(retweet)
expect(state.notifications[0].action).to.eql(retweet)
expect(state.notifications[0].type).to.eql('repeat')
})