File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -274,7 +274,6 @@ export default {
274
274
275
275
let content = message .content
276
276
if (message .file ) content = ` ${ message .file .name } .${ message .file .type } `
277
- if (message .deleted ) content = ' This message was deleted'
278
277
279
278
return {
280
279
... message,
Original file line number Diff line number Diff line change @@ -138,19 +138,23 @@ export default {
138
138
if (user .status ) return user .status .state
139
139
},
140
140
getLastMessage (room ) {
141
+ const content = room .lastMessage .deleted
142
+ ? this .textMessages .MESSAGE_DELETED
143
+ : room .lastMessage .content
144
+
141
145
if (room .users .length <= 2 ) {
142
- return room . lastMessage . content
146
+ return content
143
147
}
144
148
145
149
const user = room .users .find (
146
150
user => user ._id === room .lastMessage .sender_id
147
151
)
148
152
149
153
if (user ._id === this .currentUserId ) {
150
- return room . lastMessage . content
154
+ return content
151
155
}
152
156
153
- return ` ${ user .username } - ${ room . lastMessage . content } `
157
+ return ` ${ user .username } - ${ content} `
154
158
}
155
159
}
156
160
}
You can’t perform that action at this time.
0 commit comments