Merge branch 'main' into mgwalker/inclusion-bot

18F · Nov 22, 2024 · a861517 · a861517
2 parents 58f0106 + 2704194
commit a861517
Show file tree

Hide file tree

Showing 50 changed files with 2,309 additions and 2,433 deletions.
diff --git a/.github/workflows/on_pull_request_inclusion_bot_sync.yml b/.github/workflows/on_pull_request_inclusion_bot_sync.yml
@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
       - run: npm ci
 
       - run: npx -y prettier -w InclusionBot.md

diff --git a/.github/workflows/on_push_main.yml b/.github/workflows/on_push_main.yml
@@ -24,7 +24,7 @@ jobs:
     name: publish release
     needs: [deploy]
     runs-on: ubuntu-latest
-    container: node:20
+    container: node:22
     permissions:
       contents: write
     steps:

diff --git a/.github/workflows/on_schedule_monthly.yml b/.github/workflows/on_schedule_monthly.yml
@@ -15,6 +15,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
 
       - run: node lts.js
diff --git a/.github/workflows/reusable_build.yml b/.github/workflows/reusable_build.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     name: build
     runs-on: ubuntu-latest
-    container: node:20
+    container: node:22
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v3

diff --git a/.github/workflows/reusable_test.yml b/.github/workflows/reusable_test.yml
@@ -7,7 +7,7 @@ jobs:
   lint:
     name: lint
     runs-on: ubuntu-latest
-    container: node:20
+    container: node:22
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v3
@@ -20,7 +20,7 @@ jobs:
   format:
     name: verify formatting
     runs-on: ubuntu-latest
-    container: node:20
+    container: node:22
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v3
@@ -33,7 +33,7 @@ jobs:
   test:
     name: unit tests
     runs-on: ubuntu-latest
-    container: node:20
+    container: node:22
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v3

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:22
 
 RUN mkdir /app
 WORKDIR /app

diff --git a/InclusionBot.md b/InclusionBot.md
@@ -73,9 +73,10 @@ approves your changes, they will be merged and become active in the bot.
 | master/slave, master / slave                     | primary/secondary<br>primary/replica<br>leader/worker<br>main/replica                         | This term is rooted in the enslavement of human beings. We want to avoid slavery references.<br><br>See [GitHub to replace "master" with alternative term to avoid slavery references](https://www.zdnet.com/article/github-to-replace-master-with-alternative-term-to-avoid-slavery-references/) for more.                                                                                                            |
 | open the kimono, open kimono                     | share information                                                                             | This term arises from the sexualization of Asian women. We want to avoid sexist, racist, and sexual references.<br><br>See [The Problematic Origins of Common Business Jargon](https://www.fastcompany.com/90239290/six-business-phrases-that-have-racist-origins) for more.                                                                                                                                           |
 | grandfathered                                    | legacy<br>included retroactively                                                              | This term arose from voter restrictions that prevented Black people from voting. We want to avoid slavery and racist oppression references.<br><br>See [The Problematic Origins of Common Business Jargon](https://www.fastcompany.com/90239290/six-business-phrases-that-have-racist-origins) for more.                                                                                                               |
-| Goddamn, goddam, goddamnit, goddammit            | awful, terrible, wretched                                                                     | This term can be offensive or triggering to some religious traditions because it implies a deity cursing or reproaching people. We want to show respect towards all religious traditions.                                                                                                                                                                                                                              |
-| jesus fucking, fucking christ                    | Wow, oh no, oh my                                                                             | We want to show respect towards all religious traditions.                                                                                                                                                                                                                                                                                                                                                              |
-| mumbo jumbo                                      | jargon, confusing language                                                                    | The term "mumbo jumbo" was used to stereotype African languages and cultures that didn't make sense to European colonizers. <br><br> See [Here are some commonly used terms that actually have racist origins](https://abcnews.go.com/Politics/commonly-terms-racist-origins/story?id=71840410) for more.                                                                                                                                                                                                                                                                                                                                                            |
+| Goddamn, goddam, goddamnit, goddammit            | awful<br>terrible<br>wretched                                                                 | This term can be offensive or triggering to some religious traditions because it implies a deity cursing or reproaching people. We want to show respect towards all religious traditions.                                                                                                                                                                                                                              |
+| jesus fucking, fucking christ                    | Wow<br>oh no<br>oh my                                                                         | We want to show respect towards all religious traditions.                                                                                                                                                                                                                                                                                                                                                              |
+| mumbo jumbo                                      | jargon<br>confusing language                                                                  | The term ":TERM:" was used to stereotype African languages and cultures that didn't make sense to European colonizers.<br><br>See [some other commonly used terms that have racist origins](https://abcnews.go.com/Politics/commonly-terms-racist-origins/story?id=71840410).                                                                                                                                          |
+| kowtow, kotow, kow tow, kow-tow, cowtow, cow tow, cow-tow | submit<br>grovel | The modern usage of this word refers to groveling or submission, which is a disconnect from its real meaning as an act of deep respect. Modern usage of this term misses cultural nuance and perpetuates cultural misunderstanding.<br><br>See [the Slack thread](https://gsa-tts.slack.com/archives/C10EGE62W/p1727210606818389) where teammates discuss the term for more information.|
 
 # Sexist
 
@@ -90,6 +91,7 @@ approves your changes, they will be merged and become active in the bot.
 | Instead of                           | Consider                                                                   | Why                                                                                                                         |
 | ------------------------------------ | -------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
 | postmortem, post mortem, post-mortem | project reflection<br>project or incident review<br>retrospective<br>retro | This term can trigger emotions related to death that employees may not want to process at work.                             |
-| drop-dead date                       | last possible date                                                         | This term can trigger emotions related to death that employees may not want to process at work                              |
+| drop-dead date                       | last possible date                                                         | This term can trigger emotions related to death that employees may not want to process at work.                             |
+| suicide, suicidal, kill yourself     |                                                                            | This term can trigger emotions related to death that employees may not want to process at work.                             |
 | fuck                                 |                                                                            | This term can trigger emotions related to abuse, trauma, and sexual assault that employees may not want to process at work. |
 | shit                                 |                                                                            | This term can trigger emotions related to vulgarity that employees may not want to process at work.                         |
diff --git a/README.md b/README.md
@@ -37,6 +37,11 @@ invitation request. To see the complete list of ERGs and contact information,
 you can send yourself a direct message that just says `ergs` and Slackbot will
 respond with that information!
 
+##### Evermarch
+
+Ever wondered what day of March 2020, we're currently on? Charlie can tell you.
+Just say `evermarch` in any channel where Charlie is, and it'll let you know.
+
 ##### Facts
 
 Charlie knows **_so many_** facts. Dog facts, cat facts, giraffe facts, dolphin
@@ -48,12 +53,15 @@ facts. There are just so many facts. You can just say `dog fact` (or
 | `alan fact`       | Shares a fact about people named Alan             |
 | `alumni dog fact` | Shares a fact about a dog belonging to a TTS alum |
 | `ask ally fact`   | Shares a fact about accessible web development    |
+| `bird fact`       | Shares a fact about a TTS person's bird           |
 | `cat fact`        | Shares a fact about a TTS person's cat            |
+| `dino fact`       | Shares a fact about dinosaurs                     |
 | `dog fact`        | Shares a fact about a TTS person's dog            |
 | `dolphin fact`    | Shares a fact about dolphins                      |
 | `ed simulator`    | Shares a quote from 18F alumni Ed Mullen          |
 | `giraffe fact`    | Shares a fact of dubious truth about giraffes     |
 | `minnesota facts` | Shares a fact about the state of Minnesota        |
+| `park fact`       | Shares a fact about the US National Parks         |
 | `randy fact`      | Shares a fact about 18F staff member Randy        |
 | `screambot`       | Joyfully screams along with you                   |
 | `wisconsin facts` | Shares a fact about the state of Wisconsin        |
@@ -85,13 +93,6 @@ can help! Just say `@handbook terms` and Charlie will search the Handbook for
 `terms` for you (replace `terms` with whatever you want). If it finds anything,
 it'll post links in a threaded response to your request.
 
-##### HugMe
-
-Need to see a little hug in your life? Friends from TTS past have left us a gift
-and Charlie will deliver it whenever you need. Just say `@charlie hug me` or
-`@charlie hug bomb <number>` to get a little happiness dropped right on your
-screen.
-
 ##### OPM's DC offices status
 
 Working in DC and want to know if the office is closed due to snow or, perhaps,

diff --git a/config/q-expand.csv b/config/q-expand.csv
@@ -1154,6 +1154,7 @@ Q2AABD,"Product Branch"
 Q2AABE,"Platform Branch"
 Q2AABF,"Security Branch"
 Q2AABG,"Partnerships and Growth Branch"
+Q2AABH,"Engineering Partnerships Branch"
 Q2AAC,"Platforms and Services Divisio"
 Q2AACA,"Communities and Collaboration"
 Q2AACB,"Web Tools Branch"

diff --git a/config/slack-random-response.json b/config/slack-random-response.json
@@ -20,9 +20,15 @@
   {
     "botName": "Dag Intro",
     "defaultEmoji": ":dog:",
-    "trigger": "d(o|a)g intros?",
+    "trigger": "(?<!alumni )d(o|a)g intros?",
     "responseUrl": "https://raw.githubusercontent.com/18F/charlie-slack-bot-facts/main/dag-intros.json"
   },
+  {
+    "botName": "Alumni Dag Intro",
+    "defaultEmoji": ":dog:",
+    "trigger": "d(o|a)g intros?",
+    "responseUrl": "https://raw.githubusercontent.com/18F/charlie-slack-bot-facts/main/dag-intros-alumni.json"
+  },
   {
     "botName": "Cat Bot",
     "defaultEmoji": ":smile_cat:",
@@ -32,9 +38,15 @@
   {
     "botName": "Cat Intro",
     "defaultEmoji": ":smile_cat:",
-    "trigger": "cat intros?",
+    "trigger": "(?<!alumni )cat intros?",
     "responseUrl": "https://raw.githubusercontent.com/18F/charlie-slack-bot-facts/main/cat-intros.json"
   },
+  {
+    "botName": "Alumni Cat Intro",
+    "defaultEmoji": ":smile_cat:",
+    "trigger": "alumni cat intros?",
+    "responseUrl": "https://raw.githubusercontent.com/18F/charlie-slack-bot-facts/main/cat-intros-alumni.json"
+  },
   {
     "botName": "Pet Bot",
     "trigger": "pet facts?",
@@ -90,7 +102,14 @@
   },
   {
     "botName": "screambot",
-    "defaultEmoji": ":kevin-home-alone-scream:",
+    "defaultEmoji": [
+      ":kevin-home-alone-scream:",
+      ":khan:",
+      ":scream-into-the-void:",
+      ":screaming-cowboy:",
+      ":gull-scream:",
+      ":the-scream:"
+    ],
     "trigger": "screambot",
     "responseUrl": "https://raw.githubusercontent.com/18F/charlie-slack-bot-facts/main/scream.json"
   },
@@ -123,5 +142,17 @@
     "defaultEmoji": ":capybara:",
     "trigger": "capybara facts?",
     "responseUrl": "https://raw.githubusercontent.com/18F/charlie-slack-bot-facts/main/capybaras.json"
+  },
+  {
+    "botName": "National Parks Facts",
+    "defaultEmoji": ":nps:",
+    "trigger": "(national )?parks? facts?",
+    "responseUrl": "https://raw.githubusercontent.com/18F/charlie-slack-bot-facts/main/nps.json"
+  },
+  {
+    "botName": "Dinosaur Facts",
+    "defaultEmoji": ":dino:",
+    "trigger": "dino(saur)? facts?",
+    "responseUrl": "https://raw.githubusercontent.com/18F/charlie-slack-bot-facts/main/dinosaurs.json"
   }
 ]