Skip to content

Commit 6f78828

Browse files
committed
(breaking) replace sender_id by senderId
1 parent 522a896 commit 6f78828

File tree

9 files changed

+23
-23
lines changed

9 files changed

+23
-23
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ rooms="[
383383
index: 3,
384384
lastMessage: {
385385
content: 'Last message received',
386-
sender_id: 1234,
386+
senderId: 1234,
387387
username: 'John Doe',
388388
timestamp: '10:20',
389389
saved: true,
@@ -429,7 +429,7 @@ rooms="[
429429
### Messages prop
430430

431431
Message objects are rendered differently depending on their type. Currently, only text, emoji and file types are supported.<br><br>
432-
Each message object has a `sender_id` field which holds the id of the corresponding agent. If `sender_id` matches the `currentUserId` prop, specific UI and actions will be implemented.<br><br>
432+
Each message object has a `senderId` field which holds the id of the corresponding agent. If `senderId` matches the `currentUserId` prop, specific UI and actions will be implemented.<br><br>
433433
Notes:
434434

435435
- `username` will be displayed on each message of corresponding agents if at least 3 users are in the room
@@ -446,7 +446,7 @@ messages="[
446446
{
447447
_id: 7890,
448448
content: 'message 1',
449-
sender_id: 1234,
449+
senderId: 1234,
450450
username: 'John Doe',
451451
date: '13 November',
452452
timestamp: '10:20',
@@ -672,7 +672,7 @@ chatRooms: {
672672
messages: {
673673
MESSAGE_ID_1: {
674674
content: 'My first message to <usertag>John</usertag>',
675-
sender_id: 2,
675+
senderId: 2,
676676
timestamp: 'December 11, 2019 at 4:00:00 PM',
677677
seen: true
678678
}

demo/src/ChatContainer.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ export default {
418418
return {
419419
...message.data(),
420420
...{
421-
sender_id,
421+
senderId: sender_id,
422422
_id: message.id,
423423
seconds: timestamp.seconds,
424424
timestamp: parseTimestamp(timestamp, 'HH:mm'),
@@ -454,7 +454,7 @@ export default {
454454
message.replyMessage = {
455455
_id: replyMessage._id,
456456
content: replyMessage.content,
457-
sender_id: replyMessage.sender_id
457+
sender_id: replyMessage.senderId
458458
}
459459
460460
if (replyMessage.file) {

src/ChatWindow/Message/Message.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
v-else
1717
:id="message._id"
1818
class="vac-message-box"
19-
:class="{ 'vac-offset-current': message.sender_id === currentUserId }"
19+
:class="{ 'vac-offset-current': message.senderId === currentUserId }"
2020
>
2121
<slot name="message" v-bind="{ message }">
2222
<div
@@ -29,14 +29,14 @@
2929
class="vac-message-card"
3030
:class="{
3131
'vac-message-highlight': isMessageHover,
32-
'vac-message-current': message.sender_id === currentUserId,
32+
'vac-message-current': message.senderId === currentUserId,
3333
'vac-message-deleted': message.deleted
3434
}"
3535
@mouseover="onHoverMessage"
3636
@mouseleave="onLeaveMessage"
3737
>
3838
<div
39-
v-if="roomUsers.length > 2 && message.sender_id !== currentUserId"
39+
v-if="roomUsers.length > 2 && message.senderId !== currentUserId"
4040
class="vac-text-username"
4141
:class="{
4242
'vac-username-reply': !message.deleted && message.replyMessage
@@ -228,7 +228,7 @@ export default {
228228
messageOffset() {
229229
return (
230230
this.index > 0 &&
231-
this.message.sender_id !== this.messages[this.index - 1].sender_id
231+
this.message.senderId !== this.messages[this.index - 1].senderId
232232
)
233233
},
234234
isMessageHover() {
@@ -245,7 +245,7 @@ export default {
245245
},
246246
isCheckmarkVisible() {
247247
return (
248-
this.message.sender_id === this.currentUserId &&
248+
this.message.senderId === this.currentUserId &&
249249
!this.message.deleted &&
250250
(this.message.saved || this.message.distributed || this.message.seen)
251251
)
@@ -262,7 +262,7 @@ export default {
262262
},
263263
264264
mounted() {
265-
if (!this.message.seen && this.message.sender_id !== this.currentUserId) {
265+
if (!this.message.seen && this.message.senderId !== this.currentUserId) {
266266
this.$emit('add-new-message', {
267267
_id: this.message._id,
268268
index: this.index

src/ChatWindow/Message/MessageActions.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
key="1"
1515
class="vac-blur-container"
1616
:class="{
17-
'vac-options-me': message.sender_id === currentUserId
17+
'vac-options-me': message.senderId === currentUserId
1818
}"
1919
/>
2020

@@ -39,7 +39,7 @@
3939
:emoji-opened="emojiOpened"
4040
:emoji-reaction="true"
4141
:room-footer-ref="roomFooterRef"
42-
:position-right="message.sender_id === currentUserId"
42+
:position-right="message.senderId === currentUserId"
4343
@add-emoji="sendMessageReaction"
4444
@open-emoji="openEmoji"
4545
>
@@ -53,7 +53,7 @@
5353
<transition
5454
v-if="filteredMessageActions.length"
5555
:name="
56-
message.sender_id === currentUserId
56+
message.senderId === currentUserId
5757
? 'vac-slide-left'
5858
: 'vac-slide-right'
5959
"
@@ -64,7 +64,7 @@
6464
v-click-outside="closeOptions"
6565
class="vac-menu-options"
6666
:class="{
67-
'vac-menu-left': message.sender_id !== currentUserId
67+
'vac-menu-left': message.senderId !== currentUserId
6868
}"
6969
:style="{ top: `${menuOptionsTop}px` }"
7070
>
@@ -137,7 +137,7 @@ export default {
137137
)
138138
},
139139
filteredMessageActions() {
140-
return this.message.sender_id === this.currentUserId
140+
return this.message.senderId === this.currentUserId
141141
? this.messageActions
142142
: this.messageActions.filter(message => !message.onlyMe)
143143
}

src/ChatWindow/Message/MessageImage.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class="vac-message-image"
99
:class="{
1010
'vac-image-loading':
11-
isImageLoading && message.sender_id === currentUserId
11+
isImageLoading && message.senderId === currentUserId
1212
}"
1313
:style="{
1414
'background-image': `url('${message.file.url}')`,

src/ChatWindow/Message/MessageReactions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'vac-reaction-me': reaction.indexOf(currentUserId) !== -1
1010
}"
1111
:style="{
12-
float: message.sender_id === currentUserId ? 'right' : 'left'
12+
float: message.senderId === currentUserId ? 'right' : 'left'
1313
}"
1414
@click="sendMessageReaction({ name: key }, reaction)"
1515
>

src/ChatWindow/Room/Room.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ export default {
418418
newVal.forEach(message => {
419419
if (!messagesValid(message)) {
420420
throw new Error(
421-
'Messages object is not valid! Must contain _id[String, Number], content[String, Number] and sender_id[String, Number]'
421+
'Messages object is not valid! Must contain _id[String, Number], content[String, Number] and senderId[String, Number]'
422422
)
423423
}
424424
})

src/ChatWindow/RoomsList/RoomContent.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export default {
160160
}
161161
162162
const user = this.room.users.find(
163-
user => user._id === this.room.lastMessage.sender_id
163+
user => user._id === this.room.lastMessage.senderId
164164
)
165165
166166
if (this.room.lastMessage.username) {
@@ -187,7 +187,7 @@ export default {
187187
!this.typingUsers &&
188188
this.room.lastMessage &&
189189
!this.room.lastMessage.deleted &&
190-
this.room.lastMessage.sender_id === this.currentUserId &&
190+
this.room.lastMessage.senderId === this.currentUserId &&
191191
(this.room.lastMessage.saved ||
192192
this.room.lastMessage.distributed ||
193193
this.room.lastMessage.seen)

src/utils/roomValidation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export function messagesValid(obj) {
4242
const participantsValidate = [
4343
{ key: '_id', type: ['string', 'number'] },
4444
{ key: 'content', type: ['string', 'number'] },
45-
{ key: 'sender_id', type: ['string', 'number'] }
45+
{ key: 'senderId', type: ['string', 'number'] }
4646
]
4747

4848
const validate = (obj, props) => {

0 commit comments

Comments
 (0)