aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/components/chat_panel/chat_panel.js2
-rw-r--r--src/modules/statuses.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/components/chat_panel/chat_panel.js b/src/components/chat_panel/chat_panel.js
index d528d0a1..d8736d17 100644
--- 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
index bd52f161..b493c212 100644
--- 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