Skip to content
This repository was archived by the owner on May 15, 2025. It is now read-only.

Commit 3b571c2

Browse files
Merge branch 'main' of https://github.com/AstroHWeston/kog-bot-tomfoolery into staging
2 parents 35a0d43 + 7d2aae5 commit 3b571c2

File tree

8 files changed

+884
-6
lines changed

8 files changed

+884
-6
lines changed

.github/workflows/compile.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Compile KOG Bot
2+
3+
on:
4+
push:
5+
branches: [ "main", "staging" ]
6+
pull_request:
7+
branches: [ "main", "staging" ]
8+
9+
jobs:
10+
11+
compile:
12+
runs-on: ubuntu-22.04
13+
steps:
14+
- uses: actions/checkout@v4
15+
- name: Install pnpm
16+
uses: pnpm/action-setup@v4
17+
with:
18+
version: 9
19+
- name: Use Node.js 22
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: 22
23+
cache: 'pnpm'
24+
- name: Install dependencies
25+
run: pnpm install
26+
- name: Build project
27+
run: pnpm run build
28+
29+
testrun:
30+
runs-on: ubuntu-22.04
31+
if: github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.base_ref == 'main')
32+
steps:
33+
- uses: actions/checkout@v4
34+
- name: Install pnpm
35+
uses: pnpm/action-setup@v4
36+
with:
37+
version: 9
38+
- name: Use Node.js 22
39+
uses: actions/setup-node@v4
40+
with:
41+
node-version: 22
42+
cache: 'pnpm'
43+
- name: Install dependencies
44+
run: pnpm install
45+
- name: Simulate environment
46+
run: cp config.example.toml config.toml
47+
- name: Run tests
48+
run: pnpm run start:ci

.github/workflows/node.js.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Node install
2+
on:
3+
push:
4+
5+
jobs:
6+
node:
7+
runs-on: ubuntu-22.04
8+
strategy:
9+
matrix:
10+
node-version: [22]
11+
steps:
12+
- uses: actions/checkout@v4
13+
- name: Install pnpm
14+
uses: pnpm/action-setup@v4
15+
with:
16+
version: 9
17+
- name: Use Node.js ${{ matrix.node-version }}
18+
uses: actions/setup-node@v4
19+
with:
20+
node-version: ${{ matrix.node-version }}
21+
cache: 'pnpm'
22+
- name: Install dependencies
23+
run: pnpm install

SECURITY.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Security Policy
2+
3+
We take security bugs contained within the KOG bot with upmost seriousness. We appreciate your effort to appropriately and responsibly disclose your findings, and we will make sure your efforts to report these vulnerabilities are acknowledged.
4+
5+
If you wish to report a security vulnerability, please utilize GitHub's built in [Security tab](https://github.com/AstroHWeston/kog-bot-tomfoolery/security) and click on the `Report a vulnerability` button in the top right.
6+
After your request is received, the development team will diligently review your request, and start working on a fix on the vulnerability as soon as possible.
7+
8+
Throughout this, the developers will keep you up to date with the progress of a potential fix to your issue, as well as what steps to take to cordon off any possible security intrusions in production.
9+
10+
> [!NOTE]
11+
> If your vulerability report is contained to one specific package, and not our implementation of that package, please report the vulnerability to that package's maintainer. You may view the email address of the package maintainer by running `npm show <package_name>`.

config.example.toml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
11
[discord]
22
client_id = ""
3-
client_token = ""
3+
client_token = ""
4+
5+
[database]
6+
client = "mysql2"
7+
host = ""
8+
port = "3306"
9+
user = ""
10+
password = ""
11+
schema = ""
12+
13+
[sentry]
14+
dsn = ""

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
{
22
"name": "kog-bot-tomfoolery",
3-
"version": "0.0.1",
3+
"version": "0.0.2",
44
"description": "Discord utility for the Kleiner Oil Group.",
55
"main": "build/src/index.js",
66
"type": "module",
77
"scripts": {
88
"build": "tsc",
9-
"start": "node ."
9+
"build:watch": "tsc -w",
10+
"start:prod": "node .",
11+
"start:dev": "node . --debug",
12+
"start:ci": "pnpm run build && echo Successfully built! && node . --ci"
1013
},
1114
"keywords": [],
1215
"author": "Asynchronite & Sheepboi546",
@@ -16,6 +19,8 @@
1619
"knex": "^3.1.0"
1720
},
1821
"devDependencies": {
22+
"@sentry/node": "^9.4.0",
23+
"@sentry/profiling-node": "^9.4.0",
1924
"mysql2": "^3.12.0",
2025
"nodemon": "^3.1.9",
2126
"toml": "^3.0.0"

0 commit comments

Comments
 (0)