Skip to content

Commit 24bffaa

Browse files
committed
rename Message keys
1 parent cabe6cd commit 24bffaa

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

frontend/src/components/app/matches/Chat.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ export default {
6363
determineFirstMessagesOfTimespans(messages) {
6464
const len = messages.length;
6565
for (let i = 0; i < len; i += 1) {
66-
if (this.displayDate(messages[i].timestamp)) {
66+
if (this.displayDate(messages[i].dt_sent)) {
6767
messages[i].first_in_timespan = true;
68-
messages[i].timestamp_first = this.getDayMonthday(messages[i].timestamp);
68+
messages[i].timestamp_first = this.getDayMonthday(messages[i].dt_sent);
6969
} else {
7070
messages[i].first_in_timespan = false;
7171
}
@@ -112,8 +112,9 @@ export default {
112112
const messagesRequest = await this.$http.get(`/conversations/${this.chatWithUserId}`);
113113
const newMessages = messagesRequest.data.messages;
114114
const oldMessageCount = this.messages.length;
115-
this.determineFirstMessagesOfTimespans(newMessages);
116115
this.messages = newMessages;
116+
this.latestMessagesDate = null;
117+
this.determineFirstMessagesOfTimespans(this.messages);
117118
if (newMessages.length > oldMessageCount) {
118119
this.$emit('new-message');
119120
this.scrollChatToBottom();

frontend/src/components/app/matches/Message.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<div class="ml-4 w-full">
2222
<div class="flex justify-between">
2323
<h1 class="font-bold">{{this.match.first_name}}</h1>
24-
<h1 class="text-sm opacity-50">{{this.message.last_message_timestamp_ago}}</h1>
24+
<h1 class="text-sm opacity-50">{{this.message.last_message_dt_sent_ago}}</h1>
2525
</div>
2626
<h1 v-bind:class="{'opacity-50': this.message.is_unseen}">{{getMessage}}</h1>
2727
</div>

frontend/src/components/app/matches/MessageBubble.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
'bg-purple-matcha': message.to_id === loggedInUserId,
1919
'bg-green-500': message.to_id !== loggedInUserId,
2020
'text-white-matcha': true}"
21-
>{{message.content}}<span class="block text-sm font-light">{{getDateHoursMinutes(message.timestamp)}}</span></h1>
21+
>{{message.content}}<span class="block text-sm font-light">{{getDateHoursMinutes(message.dt_sent)}}</span></h1>
2222
<img v-if="message.to_id === loggedInUserId && message.is_liked"
2323
src="../../../assets/heartGreen.png" class="w-6 ml-2 inline-block absolute heart"
2424
v-on:dblclick="likeMessage(message.id, message.is_liked)">
25-
<h1 v-if="last" class="text-gray-600">{{getSeenMessage(message.is_seen, message.timestamp_ago)}}</h1>
25+
<h1 v-if="last" class="text-gray-600">{{getSeenMessage(message.is_seen, message.dt_seen_ago)}}</h1>
2626
</div>
2727
</template>
2828

0 commit comments

Comments
 (0)