moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into csaurus/pleroma-fe-fix-chrome-auto-loading

This commit is contained in:
Roger Braun 2018-04-27 09:59:31 +02:00
parent 9557ec59a8 38653e1ea0
commit 3ffb17c0ae
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/chat_panel/chat_panel.js
View File

@ -3,7 +3,7 @@ const chatPanel = {
return { return {
currentMessage: '', currentMessage: '',
channel: null, channel: null,
collapsed: false collapsed: true
} }
}, },
computed: { computed: {

4
src/modules/statuses.js
View File

@ -45,7 +45,7 @@ export const prepareStatus = (status) => {
if (status.nsfw === undefined) { if (status.nsfw === undefined) {
status.nsfw = isNsfw(status) status.nsfw = isNsfw(status)
if (status.retweeted_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 (result.new) {
if (statusType(status) === 'retweet' && status.retweeted_status.user.id === user.id) { 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 // We are mentioned in a post

2
test/unit/specs/modules/statuses.spec.js
View File

@ -297,7 +297,7 @@ describe('The Statuses module', () => {
mutations.addNewStatuses(state, { statuses: [retweet], user }) mutations.addNewStatuses(state, { statuses: [retweet], user })
expect(state.notifications.length).to.eql(1) 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].action).to.eql(retweet)
expect(state.notifications[0].type).to.eql('repeat') expect(state.notifications[0].type).to.eql('repeat')
}) })