mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Calculate dates in UTC

Browse source
This commit is contained in:
Daniel Gasienica 2018-04-13 10:53:15 -04:00
parent d7b21ef5dc
commit 3d70e46aea
2 changed files with 10 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ts/components/conversation/media-gallery/groupMessagesByDate.ts
View file

@ -8,12 +8,12 @@ export const groupMessagesByDate = (timestamp: number, messages: Array<Message>)
const referenceDateTime = moment.utc(timestamp);
const today = moment(referenceDateTime).startOf('day');
const yesterday = moment(referenceDateTime).subtract(1, 'day').startOf('day');
const thisWeek = moment(referenceDateTime).startOf('week');
const thisWeek = moment(referenceDateTime).startOf('isoWeek');
const thisMonth = moment(referenceDateTime).startOf('month');
const sorted = sortBy(messages, (message) => -message.received_at);
const annotations = sorted.map((message) => {
const date = moment(message.received_at);
const date = moment.utc(message.received_at);
if (date.isAfter(today)) {
return {

56
ts/test/components/media-gallery/groupMessagesByDate.ts
View file

@ -15,26 +15,22 @@ const toMessage = (date: Date): Message => ({
describe('groupMessagesByDate', () => {
it('should group messages', () => {
const referenceTime = new Date('2018-04-12T18:00Z').getTime();
const referenceTime = new Date('2018-04-12T18:00Z').getTime(); // Thu
const input: Array<Message> = [
// Today
toMessage(new Date('2018-04-12T12:00Z')),
toMessage(new Date('2018-04-12T07:00Z')),
toMessage(new Date('2018-04-12T00:01Z')),
toMessage(new Date('2018-04-12T12:00Z')), // Thu
toMessage(new Date('2018-04-12T00:01Z')), // Thu
// This week
toMessage(new Date('2018-04-11T23:59Z')),
toMessage(new Date('2018-04-09T00:01Z')),
toMessage(new Date('2018-04-11T23:59Z')), // Wed
toMessage(new Date('2018-04-09T00:01Z')), // Mon
// This month
toMessage(new Date('2018-04-08T23:59Z')),
toMessage(new Date('2018-04-05T09:00Z')),
toMessage(new Date('2018-04-08T23:59Z')), // Sun
toMessage(new Date('2018-04-01T00:01Z')),
// March 2018
toMessage(new Date('2018-03-31T23:59Z')),
toMessage(new Date('2018-03-28T14:00Z')),
toMessage(new Date('2018-03-01T14:00Z')),
// February 2011
toMessage(new Date('2011-02-28T23:59Z')),
toMessage(new Date('2011-02-15T10:00Z')),
toMessage(new Date('2011-02-01T10:00Z')),
];
@ -49,15 +45,6 @@ describe('groupMessagesByDate', () => {
attachments: [],
},
},
{
order: 0,
label: 'today',
message: {
id: 'Thu, 12 Apr 2018 07:00:00 GMT',
received_at: 1523516400000,
attachments: [],
},
},
{
order: 0,
label: 'today',
@ -89,23 +76,14 @@ describe('groupMessagesByDate', () => {
attachments: [],
},
},
{
order: 2,
label: 'thisWeek',
message: {
id: 'Sun, 08 Apr 2018 23:59:00 GMT',
received_at: 1523231940000,
attachments: [],
},
},
],
thisMonth: [
{
order: 3,
label: 'thisMonth',
message: {
id: 'Thu, 05 Apr 2018 09:00:00 GMT',
received_at: 1522918800000,
id: 'Sun, 08 Apr 2018 23:59:00 GMT',
received_at: 1523231940000,
attachments: [],
},
},
@ -129,15 +107,6 @@ describe('groupMessagesByDate', () => {
attachments: [],
},
},
{
order: 201802,
label: 'yearMonth',
message: {
id: 'Wed, 28 Mar 2018 14:00:00 GMT',
received_at: 1522245600000,
attachments: [],
},
},
{
order: 201802,
label: 'yearMonth',
@ -156,15 +125,6 @@ describe('groupMessagesByDate', () => {
attachments: [],
},
},
{
order: 201101,
label: 'yearMonth',
message: {
id: 'Tue, 15 Feb 2011 10:00:00 GMT',
received_at: 1297764000000,
attachments: [],
},
},
{
order: 201101,
label: 'yearMonth',