Don't hit slack on minutejob

Author: malted

src/bot.ts

@@ -34,7 +34,9 @@ app.action("action-waka-setup-unix", async ({ ack, body, client, logger }) => {
   track("action-waka-setup-unix", body.user.id);
 
   const userInfo = await app.client.users.info({ user: body.user.id });
-  const apiKeyResponse = await createWakaUser(userInfo).then((d) => d.json());
+  const apiKeyResponse = await createWakaUser({ slackId: body.user.id }).then(
+    (d) => d.json(),
+  );
 
   await ack();
 
@@ -137,7 +139,9 @@ app.action(
     track("action-waka-setup-windows", body.user.id);
 
     const userInfo = await app.client.users.info({ user: body.user.id });
-    const apiKeyResponse = await createWakaUser(userInfo).then((d) => d.json());
+    const apiKeyResponse = await createWakaUser({ slackId: body.user.id }).then(
+      (d) => d.json(),
+    );
 
     await ack();
 

src/jobs.ts

@@ -51,9 +51,9 @@ export function registerJobs() {
     ] of lastTrackedHbIds.entries()) {
       try {
         // The wakatime `time`s are in UTC. Convert them to the user's static time zone, then decide the day.
-        const userInfo = await app.client.users.info({ user: slackId });
-        if (!userInfo.user?.id)
-          throw new Error(`No user found from provided Slack ID ${slackId}`);
+        // const userInfo = await app.client.users.info({ user: slackId });
+        // if (!userInfo.user?.id)
+        //   throw new Error(`No user found from provided Slack ID ${slackId}`);
 
         const [user] =
           await sql`select * from users where slack_id = ${slackId}`;
@@ -87,7 +87,7 @@ export function registerJobs() {
         );
         const endOfDayUtc = new Date(endOfDayLocal.getTime() - userTzOffsetMs);
 
-        const { api_key } = await createWakaUser(userInfo).then((res) =>
+        const { api_key } = await createWakaUser({ slackId }).then((res) =>
           res.json(),
         );
 
@@ -103,18 +103,15 @@ export function registerJobs() {
         const summaryResJson = await summaryRes.json();
 
         const secondsBefore =
-          (await getSecondsCoded(userInfo.user.id, startOfDayUtc)) ?? 0;
+          (await getSecondsCoded(slackId, startOfDayUtc)) ?? 0;
 
         const date = startOfDayUtc.toISOString().split("T")[0];
-        await sql`insert into user_hakatime_daily_summary (user_id, date, summary) values (${userInfo.user.id}, ${date}, ${summaryResJson}) on conflict (user_id, date) do update set summary = excluded.summary;`;
+        await sql`insert into user_hakatime_daily_summary (user_id, date, summary) values (${slackId}, ${date}, ${summaryResJson}) on conflict (user_id, date) do update set summary = excluded.summary;`;
 
-        const secondsAfter = await getSecondsCoded(
-          userInfo.user.id,
-          startOfDayUtc,
-        );
+        const secondsAfter = await getSecondsCoded(slackId, startOfDayUtc);
 
         app.logger.info(
-          `Syncing ${userInfo.user.name} (${userInfo.user.id}) for ${date} before: ${secondsBefore / 60} mins, after: ${secondsAfter / 60} mins`,
+          `Syncing(${slackId}) for ${date} before: ${secondsBefore / 60} mins, after: ${secondsAfter / 60} mins`,
         );
 
         if (
@@ -125,7 +122,7 @@ export function registerJobs() {
         ) {
           await app.client.chat.postMessage({
             channel: process.env.EVENT_CHANNEL!,
-            text: `_Relieved sock noises_\n*Translation:* No lint on these toes - <@${userInfo.user.id}> just hit the 15 min mark for today!`,
+            text: `_Relieved sock noises_\n*Translation:* No lint on these toes - <@${slackId}> just hit the 15 min mark for today!`,
           });
         }
       } catch (e) {

src/ui.ts

@@ -76,7 +76,7 @@ export async function buildSockView(
   const [extendedUserRow] =
     await sql`select users.*, clans.name as clan_name, clans.join_code from users left join clans on users.clan_id = clans.id where users.slack_id = ${slackId}`;
 
-  const wakaResponse = await createWakaUser(userInfo)
+  const wakaResponse = await createWakaUser({ slackId })
     .then((d) => d.json())
     .catch((err) => app.logger.error(err));
 

src/waka.ts

@@ -1,32 +1,21 @@
-import type { UsersInfoResponse } from "@slack/web-api";
 import { sql } from "bun";
 import { hackSql } from "./db";
 
-export async function createWakaUser(userInfo: UsersInfoResponse) {
+export async function createWakaUser({ slackId }: { slackId: string }) {
   if (!process.env.WAKA_API_KEY) {
     console.error("Env var WAKA_API_KEY not set. Exiting.");
     process.exit();
   }
 
-  if (
-    !userInfo.ok ||
-    !userInfo.user ||
-    !userInfo.user.id ||
-    !userInfo.user.name
-  ) {
-    throw new Error("Invalid user info");
-  }
-
-  const [userRow] =
-    await sql`select hakatime_password from users where slack_id = ${userInfo.user.id};`;
+  const [userRow] = await sql`select * from users where slack_id = ${slackId};`;
 
   const payload = {
-    location: userInfo.user.tz ?? "Factory",
-    email: "[email protected]", //userInfo.user.profile?.email ?? "",
+    location: userRow.tz ?? "Factory",
+    email: userRow.email ?? "",
     password: userRow.hakatime_password,
     password_repeat: userRow.hakatime_password,
-    name: userInfo.user.name,
-    username: userInfo.user.id,
+    name: userRow.real_name,
+    username: userRow.slack_id,
   };
 
   return await fetch("https://waka.hackclub.com/signup", {