Add timestamp() function to dto.Event.

timestamp() function is used to retrieve the UNIX timestamp of a given event.

Author: Nufflee

ts/CancelledEvent.ts

@@ -7,14 +7,13 @@ import UiComponent from './UiComponent';
 import Timestamp from './Timestamp';
 
 export default class CancelledEvent implements UiComponent {
-    constructor(private _event: dto.Event, 
-                private _timestamp: string) {
+    constructor(private _event: dto.Event) {
     }
 
     appendTo(entry: HTMLElement | null): void {
         new html.Div(
             new ComponentsArray([
-                new Timestamp(this._timestamp),
+                new Timestamp(this._event.timestamp()),
                 new html.H1(
                     new html.Href(
                         `${this._event.url}`,

ts/CurrentEvent.ts

@@ -8,14 +8,13 @@ import TwitchPlayer from './TwitchPlayer';
 import Timestamp from './Timestamp'
 
 export default class CurrentEvent implements UiComponent {
-    constructor(private _event: dto.Event,
-                private _timestamp: string) {
+    constructor(private _event: dto.Event) {
     }
 
     appendTo(entry: HTMLElement | null): void {
         new html.Div(
             new ComponentsArray([
-                new Timestamp(this._timestamp),
+                new Timestamp(this._event.timestamp()),
                 new html.Div(
                     new html.Href(
                         this._event.channel ? this._event.channel : "https://twitch.tv/tsoding",

ts/Event.ts

@@ -14,19 +14,18 @@ export default class Event implements UiComponent {
 
     appendTo(entry: HTMLElement | null): void {
         const secondsDiff = moment().diff(this._event.datetime, 'seconds');
-        const timestamp = this._event.datetime.utc().unix().toString();
 
         if (this.isCancelled()) {
-            new CancelledEvent(this._event, timestamp).appendTo(entry);
+            new CancelledEvent(this._event).appendTo(entry);
         } else if (0 <= secondsDiff && secondsDiff < 4 * 60 * 60) {
-            new CurrentEvent(this._event, timestamp).appendTo(entry);
+            new CurrentEvent(this._event).appendTo(entry);
         } else if (secondsDiff >= 4 * 60 * 60) {
-            new PastEvent(this._event, timestamp).appendTo(entry);
+            new PastEvent(this._event).appendTo(entry);
         } else {
-            new FutureEvent(this._event, timestamp).appendTo(entry);
+            new FutureEvent(this._event).appendTo(entry);
         }
 
-        const hashId = "#_" + timestamp;
+        const hashId = "#_" + this._event.timestamp();
 
         if (window.location.hash == hashId) {
             window.location.hash = "";

ts/EventsForDay.ts

@@ -67,8 +67,8 @@ export default class EventsForDay implements UiComponent {
             .map(
                 (e) => new Event(
                     this._state.eventPatches
-                        ? new dto.PatchedEvent(e, this._state.eventPatches[e.datetime.utc().unix()])
-                        : e,
+                        ? new dto.PatchedEvent(e as dto.Event, this._state.eventPatches[e.datetime.utc().unix()])
+                        : e as dto.Event,
                     this._state.cancelledEvents
                 )
             )

ts/FutureEvent.ts

@@ -7,14 +7,13 @@ import UiComponent from './UiComponent';
 import Timestamp from './Timestamp';
 
 export default class FutureEvent implements UiComponent {
-    constructor(private _event: dto.Event,
-                private _timestamp: string) {
+    constructor(private _event: dto.Event) {
     }
 
     appendTo(entry: HTMLElement | null): void {
         new html.Div(
             new ComponentsArray([
-                new Timestamp(this._timestamp),
+                new Timestamp(this._event.timestamp()),
                 new html.H1(
                     new html.Href(
                         `${this._event.url}`,

ts/PastEvent.ts

@@ -7,14 +7,13 @@ import UiComponent from './UiComponent';
 import Timestamp from './Timestamp';
 
 export default class PastEvent implements UiComponent {
-    constructor(private _event: dto.Event,
-                private _timestamp: string) {
+    constructor(private _event: dto.Event) {
     }
 
     appendTo(entry: HTMLElement | null): void {
         new html.Div(
             new ComponentsArray([
-                new Timestamp(this._timestamp),
+                new Timestamp(this._event.timestamp()),
                 new html.H1(
                     new html.Href(
                         `${this._event.url}`,

ts/Timestamp.ts

@@ -7,7 +7,7 @@ import UiComponent from './UiComponent';
 import TwitchPlayer from './TwitchPlayer';
 import copyToClipboard from './util/copyToClipboard';
 
-export default class CurrentEvent implements UiComponent {
+export default class Timestamp implements UiComponent {
     constructor(private _timestamp: string) {
     }
 

ts/dto/Event.ts

@@ -1,9 +1,14 @@
 import * as moment from 'moment';
 
-export default interface Event {
-    datetime: moment.Moment,
-    title: string,
-    description: string,
-    url: string,
-    channel: string,
+export default class Event {
+    constructor(public datetime: moment.Moment,
+                public title: string,
+                public description: string,
+                public url: string,
+                public channel: string) {
+    }
+
+    timestamp() {
+        return this.datetime.utc().unix().toString();
+    }
 }

ts/dto/PatchedEvent.ts

@@ -2,19 +2,9 @@ import * as moment from 'moment';
 import Event from './Event';
 import EventPatch from './EventPatch';
 
-export default class PatchedEvent implements Event {
-    datetime: moment.Moment;
-    title: string;
-    description: string;
-    url: string;
-    channel: string;
-
+export default class PatchedEvent extends Event {
     constructor(event: Event, eventPatch: EventPatch | undefined) {
-        this.datetime = event.datetime;
-        this.title = event.title;
-        this.description = event.description;
-        this.url = event.url;
-        this.channel = event.channel;
+        super(event.datetime, event.title, event.description, event.url, event.channel);
 
         if (eventPatch) {
             if (eventPatch.title) {

ts/util/copyToClipboard.ts

@@ -1,3 +1,5 @@
+// Adapted from https://github.com/feross/clipboard-copy
+
 export default function copyToClipboard(text: string) {
   // Use the Async Clipboard API when available. Requires a secure browing context (i.e. HTTPS)
   if ((navigator as any).clipboard) {
@@ -19,7 +21,7 @@ export default function copyToClipboard(text: string) {
   // Make a selection object representing the range of text selected by the user
   const selection = window.getSelection()
   const range = window.document.createRange()
-  
+
   if (!selection) {
     return Promise.reject()
   }
@@ -40,8 +42,7 @@ export default function copyToClipboard(text: string) {
   selection.removeAllRanges()
   window.document.body.removeChild(span)
 
-  // The Async Clipboard API returns a promise that may reject with `undefined`
-  // so we match that here for consistency.
+  // The Async Clipboard API returns a promise that may reject with `undefined` so we match that here for consistency.
   return success
     ? Promise.resolve()
     : Promise.reject()