From 038465582ebfe4c67597427d2396dab7486e4afb Mon Sep 17 00:00:00 2001
From: saber-nyan <saber-nyan@ya.ru>
Date: Mon, 25 Nov 2019 20:14:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BC=D0=BD=D1=8B=D0=B9=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B4=20=D0=B4=D0=B0=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SidebarStream.vue | 38 +++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/components/SidebarStream.vue b/src/components/SidebarStream.vue
index ba619a0..cc9a16d 100644
--- a/src/components/SidebarStream.vue
+++ b/src/components/SidebarStream.vue
@@ -8,9 +8,12 @@
 			{{ stream.id }} {{ stream.protocol }}
 			<template v-if="stream.ttl">TTL {{ stream.ttl }}</template>
 			<br/>
-			{{ dateToText(stream.startTimestamp) }} - {{ dateToText(stream.endTimestamp) }}
+			{{ dateToText(stream.startTimestamp) }}
+			<template v-if="!dateMatches(stream.startTimestamp, stream.endTimestamp)">
+				- {{ dateToText(stream.endTimestamp) }}
+			</template>
 			<template v-if="stream.userAgentHash"><br/>UA: {{ stream.userAgentHash }}</template>
-
+			<br/>
 			<span v-for="pattern in stream.foundPatterns"
 				  :key="pattern.id"
 				  :style="`color: ${pattern.color};`">
@@ -43,13 +46,36 @@
 		},
 		methods: {
 			dateToText(unixTimestamp) {
-				return new Date(unixTimestamp).toLocaleDateString('ru-RU', {
-					month: '2-digit',
-					day: '2-digit',
+				const date = new Date(unixTimestamp);
+				const options = {
 					hour: '2-digit',
 					minute: '2-digit',
 					second: '2-digit',
-				});
+				};
+				if (!this.isToday(date)) {
+					options.month = '2-digit';
+					options.day = '2-digit';
+					return date.toLocaleDateString('ru-RU', options);
+				}
+				return date.toLocaleTimeString('ru-RU', options);
+			},
+
+			isToday(someDate) {
+				const today = new Date();
+				return someDate.getDate() === today.getDate() &&
+					someDate.getMonth() === today.getMonth() &&
+					someDate.getFullYear() === today.getFullYear();
+			},
+
+			dateMatches(rFirst, rSecond) {
+				const first = new Date(rFirst);
+				const second = new Date(rSecond);
+				return first.getDate() === second.getDate() &&
+					first.getMonth() === second.getMonth() &&
+					first.getFullYear() === second.getFullYear() &&
+					first.getHours() === second.getHours() &&
+					first.getMinutes() === second.getMinutes() &&
+					first.getSeconds() === second.getSeconds();
 			},
 
 			toggleFavorite() {