Added a send_at option to render-newsletter config

Author: bdougsand

.github/actions/render-newsletter/action.yml

@@ -11,6 +11,9 @@ inputs:
   after_date:
     description: 'Only render posts that have a send date >= this ISO 8601-formatted date'
     required: false
+  send_at:
+    description: 'Time of day to send the newsletter, formatted as HH:MM+ZZZZ'
+    required: false
 
   out_path:
     description: 'Path where the output should be written'

.github/actions/render-newsletter/dist/index.js

@@ -10,6 +10,8 @@ import fetch from 'node-fetch';
 
 import * as SG from './sendgrid';
 
+import { setTime, parseTimeSpec, TimeSpec } from './util';
+
 const readFile = promisify(fs.readFile);
 const writeFile = promisify(fs.writeFile);
 const readdir = promisify(fs.readdir);
@@ -60,6 +62,7 @@ type Options = {
   subject?: string,
   slackUrl?: string,
   index?: SG.SingleSendIndex,
+  sendAt?: TimeSpec,
 };
 
 async function loadTemplate(path?: string, options?: CompileOptions) {
@@ -160,7 +163,7 @@ async function render(opts: Options) {
 const dateStr =
   (d: Date | string) => ((typeof d === 'string' ? d : d.toISOString()).split('T', 1)[0]);
 
-function getSendDate(c: TemplateContext) {
+function getSendDate(c: TemplateContext, timeSpec?: TimeSpec) {
   let date = c.post.date;
   if (date.getTime() <= Date.now()) {
     const today = new Date();
@@ -169,8 +172,7 @@ function getSendDate(c: TemplateContext) {
                     today.getDate()+1);
   }
 
-  date.setHours(15);
-  return date;
+  return setTime(date, timeSpec)
 }
 
 function singleSendId(context: TemplateContext, index?: SG.SingleSendIndex) {
@@ -194,7 +196,7 @@ async function run(options: Options) {
   if (options.output) {
     await writeFile(options.output, text);
   } else if (options.apiKey) {
-    const sendAt = getSendDate(context);
+    const sendAt = getSendDate(context, options.sendAt);
     const id = singleSendId(context, options.index);
 
     if (id)
@@ -242,10 +244,14 @@ type RunOptions = Omit<Options, 'filePath'> & {
   filter?: PathFilter,
 };
 
-function dateFilter(after: number) {
+
+/**
+ * @param timeSpec Set the time on the date parsed from the file name
+ */
+function dateFilter(after: number, timeSpec?: TimeSpec) {
   return (path: string) => {
     const ctx = contextFromPath(path);
-    return ctx.date.getTime() >= after;
+    return setTime(ctx.date, timeSpec).getTime() >= after;
   };
 }
 
@@ -304,6 +310,7 @@ async function runAction() {
     INPUT_POSTS_DIR: postsDir,
     INPUT_SLACK_URL: slackUrl,
     INPUT_AFTER_DATE: today,
+    INPUT_SEND_AT: sendAtRaw,
   } = process.env;
 
   if (!(path || postsDir)) {
@@ -313,6 +320,8 @@ async function runAction() {
     process.exit(1);
   }
 
+  const timeSpec = parseTimeSpec(sendAtRaw);
+
   await runAll({
     apiKey,
     source: path ? { file: path } : { dir: postsDir },
@@ -325,7 +334,9 @@ async function runAction() {
     siteYaml,
     subject,
     slackUrl,
-    filter: dateFilter(today ? new Date(today).getTime() : Date.now()),
+    // Filter out posts from before this date.
+    filter: dateFilter(today ? new Date(today).getTime() : Date.now(), timeSpec),
+    sendAt: timeSpec,
   });
 }
 
@@ -338,6 +349,7 @@ async function testRun() {
   process.env['INPUT_CONTEXT'] = `{}`;
   process.env['INPUT_SUPPRESSION_GROUP_ID'] = '17889';
   process.env['INPUT_SITE_YAML'] = __dirname + '/../../../../_config.yml';
+  process.env['INPUT_SEND_AT'] = '10:00-0500';
 
 
   await runAction();

.github/actions/render-newsletter/src/index.ts

@@ -0,0 +1,56 @@
+export type TimeSpecTuple = [number, number, number];
+export type TimeSpec = string | TimeSpecTuple;
+
+export function tzOffset(offset: string) {
+  const n = offset.slice(1, 5);
+  const [h, m] =
+    n.length >= 3 ? [n.slice(0, -2), n.slice(-2)] : [n, '0'];
+
+  const vala = parseInt(h, 10);
+  const valb = parseInt(m, 10);
+  const minutes = vala*60 + valb;
+
+  return offset[0] === '+' ? minutes : -minutes;
+}
+
+export function parseTimeSpec(timeSpec?: TimeSpec): TimeSpecTuple {
+  if (!timeSpec)
+    return [10, 0, -300];
+
+  if (Array.isArray(timeSpec))
+    return timeSpec;
+
+  const m = timeSpec.match(/^(\d{1,2})(:(\d\d))?([+-]\d{4})?$/);
+
+  if (!m) {
+    throw new Error(`Couldn't parse timeSpec option: ${timeSpec}`);
+  }
+
+  return [parseInt(m[1]), m[3] ? parseInt(m[3]) : 0, m[4] ? tzOffset(m[4]) : -300];
+}
+
+export function setTime(date: string | number | Date, time?: TimeSpec) {
+  if (!time)
+    return new Date(date);
+
+  let [h, m, tz] = parseTimeSpec(time);
+  const d = new Date(date);
+  tz += d.getTimezoneOffset();
+
+  return new Date((d.setHours(h, m, 0, 0)) - (tz*60000));
+}
+
+
+function test() {
+  const specs = [undefined, '12:00', '9:00-0600'];
+  for (const specString of specs) {
+    const spec = parseTimeSpec(specString);
+    console.log(spec);
+
+    const sendAt = setTime(new Date(), spec);
+    console.log(sendAt);
+  }
+}
+
+if (require.main === module)
+  test();

.github/actions/render-newsletter/src/util.ts

@@ -28,6 +28,7 @@ jobs:
           subject_format: "[Code for Boston] %s"
           slack_url: ${{ secrets.SLACK_URL }}
           after_date: ${{ steps.commit-date.outputs.commit-date }}
+          send_at: "10:00-0500"
           context: >-
             {
             "domain": "${{ steps.site-domain.outputs.domain }}"