Skip to content

Commit 4f8ae25

Browse files
committed
Don't ping on sock-team
1 parent df179e2 commit 4f8ae25

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/bot.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ app.command("/sock-team", async ({ ack, body, client, logger }) => {
561561
await ack();
562562

563563
const teamMembers =
564-
await sql`select u2.slack_id, u2.tz_offset from users u1 join users u2 on u1.clan_id = u2.clan_id where u1.slack_id = ${body.user_id};`;
564+
await sql`select u2.slack_id, u2.real_name, u2.tz_offset from users u1 join users u2 on u1.clan_id = u2.clan_id where u1.slack_id = ${body.user_id};`;
565565

566566
const [clan] =
567567
await sql`select c.name from users u join clans c on u.clan_id = c.id where u.slack_id = ${body.user_id};`;
@@ -579,24 +579,27 @@ app.command("/sock-team", async ({ ack, body, client, logger }) => {
579579
teamMembers.map(
580580
async ({
581581
slack_id,
582+
real_name,
582583
tz_offset,
583584
}: {
584585
slack_id: string;
586+
real_name: string;
585587
tz_offset: number;
586588
}) => {
587589
return [
588590
slack_id,
591+
real_name,
589592
(await getSecondsCoded(slack_id, new Date())) ?? 0,
590593
(await getSecondsCodedTotal(slack_id)) ?? 0,
591594
];
592595
},
593596
),
594597
);
595598

596-
stats.sort((a, b) => b[2] - a[2]);
599+
stats.sort((a, b) => b[3] - a[3]);
597600

598601
const board = stats
599-
.map(([slackId, coded, totalCoded], idx) => {
602+
.map(([slackId, real_name, coded, totalCoded], idx) => {
600603
let medal =
601604
idx === 0
602605
? ":first_place_medal: "
@@ -606,7 +609,7 @@ app.command("/sock-team", async ({ ack, body, client, logger }) => {
606609
? ":third_place_medal: "
607610
: "";
608611

609-
return `${medal}<@${slackId}> coded ${(totalCoded / 3600).toFixed(1)} hours total (${(coded / 60).toFixed(1)} mins today)`;
612+
return `${medal} ${real_name} coded ${(totalCoded / 3600).toFixed(1)} hours total (${(coded / 60).toFixed(1)} mins today)`;
610613
})
611614
.join("\n");
612615

0 commit comments

Comments
 (0)