11 Commits

Author SHA1 Message Date
minori 0b493062e0 deps: update typescript to 5.9.3
Node.js CI / CI (pull_request) Failing after 32s
Security Scan and Upload / Security & DefectDojo Upload (pull_request) Successful in 1m31s
2026-02-04 08:36:01 -08:00
hikari c2aefe87bf docs: update feedback section to use support forum
Node.js CI / CI (push) Failing after 23s
Security Scan and Upload / Security & DefectDojo Upload (push) Successful in 1m34s
2026-01-26 12:37:31 -08:00
naomi e7e4292f43 feat: automated upload of .gitea/workflows/ci.yml
Node.js CI / CI (push) Failing after 21s
Security Scan and Upload / Security & DefectDojo Upload (push) Successful in 59s
2025-12-22 19:43:10 +01:00
naomi 4a90c177b0 feat: automated upload of .gitea/workflows/ci.yml
Node.js CI / CI (push) Has been cancelled
Security Scan and Upload / Security & DefectDojo Upload (push) Has been cancelled
2025-12-22 19:36:38 +01:00
naomi 9748e13128 feat: automated upload of .gitea/workflows/ci.yml
Node.js CI / Lint and Test (push) Has been cancelled
Security Scan and Upload / Security & DefectDojo Upload (push) Has been cancelled
2025-12-22 19:26:22 +01:00
naomi f9201e33a8 feat: automated upload of .npmrc
Node.js CI / Lint and Test (push) Has been cancelled
Security Scan and Upload / Security & DefectDojo Upload (push) Has been cancelled
2025-12-22 19:17:10 +01:00
naomi 142c0a6d99 feat: automated upload of .gitea/workflows/security.yml
Node.js CI / Lint and Test (push) Successful in 28s
Security Scan and Upload / Security & DefectDojo Upload (push) Successful in 1m1s
2025-12-18 03:09:31 +01:00
naomi 1bcba52b2b chore: use full avatar
Node.js CI / Lint and Test (push) Successful in 53s
2025-08-25 17:01:54 -07:00
naomi f5e76a5030 feat: use crypto for better rng
Node.js CI / Lint and Test (push) Successful in 40s
2025-08-15 16:15:35 -07:00
naomi 2544d2d15b feat: add buttons to throw results
Node.js CI / Lint and Test (push) Successful in 42s
2025-08-15 15:00:27 -07:00
naomi 2ad10115b8 feat: bump to 10 hourly throws
Node.js CI / Lint and Test (push) Successful in 41s
2025-08-15 14:29:05 -07:00
19 changed files with 588 additions and 99 deletions
+14 -5
View File
@@ -8,8 +8,9 @@ on:
- main
jobs:
lint:
name: Lint and Test
ci:
name: CI
runs-on: ubuntu-latest
steps:
- name: Checkout Source Files
@@ -25,14 +26,22 @@ jobs:
with:
version: 10
- name: Ensure Dependencies are Pinned
uses: naomi-lgbt/dependency-pin-check@main
with:
language: javascript
dev-dependencies: true
peer-dependencies: true
optional-dependencies: true
- name: Install Dependencies
run: pnpm install
- name: Verify Build
run: pnpm run build
- name: Lint Source Files
run: pnpm run lint
- name: Verify Build
run: pnpm run build
- name: Run Tests
run: pnpm run test
+177
View File
@@ -0,0 +1,177 @@
name: Security Scan and Upload
on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
schedule:
- cron: '0 0 * * 1'
workflow_dispatch:
jobs:
security-audit:
name: Security & DefectDojo Upload
runs-on: ubuntu-latest
continue-on-error: true
steps:
- name: Checkout code
uses: actions/checkout@v4
# --- AUTO-SETUP PROJECT ---
- name: Ensure DefectDojo Product Exists
env:
DD_URL: ${{ secrets.DD_URL }}
DD_TOKEN: ${{ secrets.DD_TOKEN }}
PRODUCT_NAME: ${{ github.repository }}
PRODUCT_TYPE_ID: 1
run: |
sudo apt-get install jq -y > /dev/null
echo "Checking connection to $DD_URL..."
# Check if product exists - capture HTTP code to debug connection issues
RESPONSE=$(curl --write-out "%{http_code}" --silent --output /tmp/response.json \
-H "Authorization: Token $DD_TOKEN" \
"$DD_URL/api/v2/products/?name=$PRODUCT_NAME")
# If response is not 200, print error
if [ "$RESPONSE" != "200" ]; then
echo "::error::Failed to query DefectDojo. HTTP Code: $RESPONSE"
cat /tmp/response.json
exit 1
fi
COUNT=$(cat /tmp/response.json | jq -r '.count')
if [ "$COUNT" = "0" ]; then
echo "Creating product '$PRODUCT_NAME'..."
curl -s -X POST "$DD_URL/api/v2/products/" \
-H "Authorization: Token $DD_TOKEN" \
-H "Content-Type: application/json" \
-d '{ "name": "'"$PRODUCT_NAME"'", "description": "Auto-created by Gitea Actions", "prod_type": '$PRODUCT_TYPE_ID' }'
else
echo "Product '$PRODUCT_NAME' already exists."
fi
# --- 1. TRIVY (Dependencies & Misconfig) ---
- name: Install Trivy
run: |
sudo apt-get install wget apt-transport-https gnupg lsb-release -y
wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | sudo apt-key add -
echo "deb https://aquasecurity.github.io/trivy-repo/deb $(lsb_release -sc) main" | sudo tee -a /etc/apt/sources.list.d/trivy.list
sudo apt-get update && sudo apt-get install trivy -y
- name: Run Trivy (FS Scan)
run: |
trivy fs . --scanners vuln,misconfig --format json --output trivy-results.json --exit-code 0
- name: Upload Trivy to DefectDojo
env:
DD_URL: ${{ secrets.DD_URL }}
DD_TOKEN: ${{ secrets.DD_TOKEN }}
run: |
echo "Uploading Trivy results..."
# Generate today's date in YYYY-MM-DD format
TODAY=$(date +%Y-%m-%d)
HTTP_CODE=$(curl --write-out "%{http_code}" --output response.txt --silent -X POST "$DD_URL/api/v2/import-scan/" \
-H "Authorization: Token $DD_TOKEN" \
-F "active=true" \
-F "verified=true" \
-F "scan_type=Trivy Scan" \
-F "engagement_name=CI/CD Pipeline" \
-F "product_name=${{ github.repository }}" \
-F "scan_date=$TODAY" \
-F "auto_create_context=true" \
-F "file=@trivy-results.json")
if [[ "$HTTP_CODE" != "200" && "$HTTP_CODE" != "201" ]]; then
echo "::error::Upload Failed with HTTP $HTTP_CODE"
echo "--- SERVER RESPONSE ---"
cat response.txt
echo "-----------------------"
exit 1
else
echo "Upload Success!"
fi
# --- 2. GITLEAKS (Secrets) ---
- name: Install Gitleaks
run: |
wget -qO gitleaks.tar.gz https://github.com/gitleaks/gitleaks/releases/download/v8.18.0/gitleaks_8.18.0_linux_x64.tar.gz
tar -xzf gitleaks.tar.gz
sudo mv gitleaks /usr/local/bin/ && chmod +x /usr/local/bin/gitleaks
- name: Run Gitleaks
run: gitleaks detect --source . -v --report-path gitleaks-results.json --report-format json --no-git || true
- name: Upload Gitleaks to DefectDojo
env:
DD_URL: ${{ secrets.DD_URL }}
DD_TOKEN: ${{ secrets.DD_TOKEN }}
run: |
echo "Uploading Gitleaks results..."
TODAY=$(date +%Y-%m-%d)
HTTP_CODE=$(curl --write-out "%{http_code}" --output response.txt --silent -X POST "$DD_URL/api/v2/import-scan/" \
-H "Authorization: Token $DD_TOKEN" \
-F "active=true" \
-F "verified=true" \
-F "scan_type=Gitleaks Scan" \
-F "engagement_name=CI/CD Pipeline" \
-F "product_name=${{ github.repository }}" \
-F "scan_date=$TODAY" \
-F "auto_create_context=true" \
-F "file=@gitleaks-results.json")
if [[ "$HTTP_CODE" != "200" && "$HTTP_CODE" != "201" ]]; then
echo "::error::Upload Failed with HTTP $HTTP_CODE"
echo "--- SERVER RESPONSE ---"
cat response.txt
echo "-----------------------"
exit 1
else
echo "Upload Success!"
fi
# --- 3. SEMGREP (SAST) ---
- name: Install Semgrep (via pipx)
run: |
sudo apt-get install pipx -y
pipx install semgrep
# Add pipx binary path to GITHUB_PATH so next steps can see 'semgrep'
echo "$HOME/.local/bin" >> $GITHUB_PATH
- name: Run Semgrep
run: semgrep scan --config=p/security-audit --config=p/owasp-top-ten --json --output semgrep-results.json . || true
- name: Upload Semgrep to DefectDojo
env:
DD_URL: ${{ secrets.DD_URL }}
DD_TOKEN: ${{ secrets.DD_TOKEN }}
run: |
echo "Uploading Semgrep results..."
TODAY=$(date +%Y-%m-%d)
HTTP_CODE=$(curl --write-out "%{http_code}" --output response.txt --silent -X POST "$DD_URL/api/v2/import-scan/" \
-H "Authorization: Token $DD_TOKEN" \
-F "active=true" \
-F "verified=true" \
-F "scan_type=Semgrep JSON Report" \
-F "engagement_name=CI/CD Pipeline" \
-F "product_name=${{ github.repository }}" \
-F "scan_date=$TODAY" \
-F "auto_create_context=true" \
-F "file=@semgrep-results.json")
if [[ "$HTTP_CODE" != "200" && "$HTTP_CODE" != "201" ]]; then
echo "::error::Upload Failed with HTTP $HTTP_CODE"
echo "--- SERVER RESPONSE ---"
cat response.txt
echo "-----------------------"
exit 1
else
echo "Upload Success!"
fi
+25
View File
@@ -0,0 +1,25 @@
# Package Manager Configuration
# Force pnpm usage - breaks npm/yarn intentionally
node-linker=pnpm
# Security: Disable all lifecycle scripts
ignore-scripts=true
enable-pre-post-scripts=false
# Security: Require packages to be 10+ days old before installation
minimum-release-age=14400
# Security: Verify package integrity hashes
verify-store-integrity=true
# Security: Enforce strict trust policies
trust-policy=strict
# Security: Strict peer dependency resolution
strict-peer-dependencies=true
# Performance: Use symlinks for node_modules
symlink=true
# Lockfile: Ensure lockfile is not modified during install
frozen-lockfile=false
+1 -1
View File
@@ -18,7 +18,7 @@ This page is currently deployed. [View the live website.]
## Feedback and Bugs
If you have feedback or a bug report, please feel free to open a GitHub issue!
If you have feedback or a bug report, please [log a ticket on our forum](https://support.nhcarrigan.com).
## Contributing
+1 -1
View File
@@ -21,7 +21,7 @@
"@types/node-schedule": "2.1.8",
"eslint": "9.33.0",
"prisma": "6.14.0",
"typescript": "5.9.2"
"typescript": "5.9.3"
},
"dependencies": {
"@nhcarrigan/logger": "1.0.0",
+80 -80
View File
@@ -13,7 +13,7 @@ importers:
version: 1.0.0
'@prisma/client':
specifier: 6.14.0
version: 6.14.0(prisma@6.14.0(typescript@5.9.2))(typescript@5.9.2)
version: 6.14.0(prisma@6.14.0(typescript@5.9.3))(typescript@5.9.3)
discord.js:
specifier: 14.21.0
version: 14.21.0
@@ -26,10 +26,10 @@ importers:
devDependencies:
'@nhcarrigan/eslint-config':
specifier: 5.2.0
version: 5.2.0(@typescript-eslint/utils@8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.33.0(jiti@2.5.1))(playwright@1.54.2)(react@19.1.1)(typescript@5.9.2)(vitest@3.2.4(@types/node@24.2.1)(jiti@2.5.1))
version: 5.2.0(@typescript-eslint/utils@8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.33.0(jiti@2.5.1))(playwright@1.54.2)(react@19.1.1)(typescript@5.9.3)(vitest@3.2.4(@types/node@24.2.1)(jiti@2.5.1))
'@nhcarrigan/typescript-config':
specifier: 4.0.0
version: 4.0.0(typescript@5.9.2)
version: 4.0.0(typescript@5.9.3)
'@types/node':
specifier: 24.2.1
version: 24.2.1
@@ -41,10 +41,10 @@ importers:
version: 9.33.0(jiti@2.5.1)
prisma:
specifier: 6.14.0
version: 6.14.0(typescript@5.9.2)
version: 6.14.0(typescript@5.9.3)
typescript:
specifier: 5.9.2
version: 5.9.2
specifier: 5.9.3
version: 5.9.3
packages:
@@ -2212,8 +2212,8 @@ packages:
resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==}
engines: {node: '>= 0.4'}
typescript@5.9.2:
resolution: {integrity: sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==}
typescript@5.9.3:
resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
engines: {node: '>=14.17'}
hasBin: true
@@ -2608,19 +2608,19 @@ snapshots:
'@jridgewell/sourcemap-codec@1.5.5': {}
'@nhcarrigan/eslint-config@5.2.0(@typescript-eslint/utils@8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.33.0(jiti@2.5.1))(playwright@1.54.2)(react@19.1.1)(typescript@5.9.2)(vitest@3.2.4(@types/node@24.2.1)(jiti@2.5.1))':
'@nhcarrigan/eslint-config@5.2.0(@typescript-eslint/utils@8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.33.0(jiti@2.5.1))(playwright@1.54.2)(react@19.1.1)(typescript@5.9.3)(vitest@3.2.4(@types/node@24.2.1)(jiti@2.5.1))':
dependencies:
'@eslint-community/eslint-plugin-eslint-comments': 4.4.1(eslint@9.33.0(jiti@2.5.1))
'@eslint/compat': 1.2.4(eslint@9.33.0(jiti@2.5.1))
'@eslint/eslintrc': 3.2.0
'@eslint/js': 9.17.0
'@stylistic/eslint-plugin': 2.12.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
'@typescript-eslint/eslint-plugin': 8.19.0(@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
'@typescript-eslint/parser': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
'@vitest/eslint-plugin': 1.1.24(@typescript-eslint/utils@8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)(vitest@3.2.4(@types/node@24.2.1)(jiti@2.5.1))
'@stylistic/eslint-plugin': 2.12.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
'@typescript-eslint/eslint-plugin': 8.19.0(@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
'@typescript-eslint/parser': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
'@vitest/eslint-plugin': 1.1.24(@typescript-eslint/utils@8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)(vitest@3.2.4(@types/node@24.2.1)(jiti@2.5.1))
eslint: 9.33.0(jiti@2.5.1)
eslint-plugin-deprecation: 3.0.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.33.0(jiti@2.5.1))
eslint-plugin-deprecation: 3.0.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.33.0(jiti@2.5.1))
eslint-plugin-jsdoc: 50.6.1(eslint@9.33.0(jiti@2.5.1))
eslint-plugin-playwright: 2.1.0(eslint@9.33.0(jiti@2.5.1))
eslint-plugin-react: 7.37.3(eslint@9.33.0(jiti@2.5.1))
@@ -2629,7 +2629,7 @@ snapshots:
globals: 15.14.0
playwright: 1.54.2
react: 19.1.1
typescript: 5.9.2
typescript: 5.9.3
vitest: 3.2.4(@types/node@24.2.1)(jiti@2.5.1)
transitivePeerDependencies:
- '@typescript-eslint/utils'
@@ -2639,9 +2639,9 @@ snapshots:
'@nhcarrigan/logger@1.0.0': {}
'@nhcarrigan/typescript-config@4.0.0(typescript@5.9.2)':
'@nhcarrigan/typescript-config@4.0.0(typescript@5.9.3)':
dependencies:
typescript: 5.9.2
typescript: 5.9.3
'@nodelib/fs.scandir@2.1.5':
dependencies:
@@ -2657,10 +2657,10 @@ snapshots:
'@pkgr/core@0.1.2': {}
'@prisma/client@6.14.0(prisma@6.14.0(typescript@5.9.2))(typescript@5.9.2)':
'@prisma/client@6.14.0(prisma@6.14.0(typescript@5.9.3))(typescript@5.9.3)':
optionalDependencies:
prisma: 6.14.0(typescript@5.9.2)
typescript: 5.9.2
prisma: 6.14.0(typescript@5.9.3)
typescript: 5.9.3
'@prisma/config@6.14.0':
dependencies:
@@ -2765,9 +2765,9 @@ snapshots:
'@standard-schema/spec@1.0.0': {}
'@stylistic/eslint-plugin@2.12.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)':
'@stylistic/eslint-plugin@2.12.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)':
dependencies:
'@typescript-eslint/utils': 8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
'@typescript-eslint/utils': 8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
eslint: 9.33.0(jiti@2.5.1)
eslint-visitor-keys: 4.2.1
espree: 10.4.0
@@ -2803,41 +2803,41 @@ snapshots:
dependencies:
'@types/node': 24.2.1
'@typescript-eslint/eslint-plugin@8.19.0(@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)':
'@typescript-eslint/eslint-plugin@8.19.0(@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)':
dependencies:
'@eslint-community/regexpp': 4.12.1
'@typescript-eslint/parser': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
'@typescript-eslint/parser': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
'@typescript-eslint/scope-manager': 8.19.0
'@typescript-eslint/type-utils': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
'@typescript-eslint/utils': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
'@typescript-eslint/type-utils': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
'@typescript-eslint/utils': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
'@typescript-eslint/visitor-keys': 8.19.0
eslint: 9.33.0(jiti@2.5.1)
graphemer: 1.4.0
ignore: 5.3.2
natural-compare: 1.4.0
ts-api-utils: 1.4.3(typescript@5.9.2)
typescript: 5.9.2
ts-api-utils: 1.4.3(typescript@5.9.3)
typescript: 5.9.3
transitivePeerDependencies:
- supports-color
'@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)':
'@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)':
dependencies:
'@typescript-eslint/scope-manager': 8.19.0
'@typescript-eslint/types': 8.19.0
'@typescript-eslint/typescript-estree': 8.19.0(typescript@5.9.2)
'@typescript-eslint/typescript-estree': 8.19.0(typescript@5.9.3)
'@typescript-eslint/visitor-keys': 8.19.0
debug: 4.4.1
eslint: 9.33.0(jiti@2.5.1)
typescript: 5.9.2
typescript: 5.9.3
transitivePeerDependencies:
- supports-color
'@typescript-eslint/project-service@8.39.1(typescript@5.9.2)':
'@typescript-eslint/project-service@8.39.1(typescript@5.9.3)':
dependencies:
'@typescript-eslint/tsconfig-utils': 8.39.1(typescript@5.9.2)
'@typescript-eslint/tsconfig-utils': 8.39.1(typescript@5.9.3)
'@typescript-eslint/types': 8.39.1
debug: 4.4.1
typescript: 5.9.2
typescript: 5.9.3
transitivePeerDependencies:
- supports-color
@@ -2856,18 +2856,18 @@ snapshots:
'@typescript-eslint/types': 8.39.1
'@typescript-eslint/visitor-keys': 8.39.1
'@typescript-eslint/tsconfig-utils@8.39.1(typescript@5.9.2)':
'@typescript-eslint/tsconfig-utils@8.39.1(typescript@5.9.3)':
dependencies:
typescript: 5.9.2
typescript: 5.9.3
'@typescript-eslint/type-utils@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)':
'@typescript-eslint/type-utils@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)':
dependencies:
'@typescript-eslint/typescript-estree': 8.19.0(typescript@5.9.2)
'@typescript-eslint/utils': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
'@typescript-eslint/typescript-estree': 8.19.0(typescript@5.9.3)
'@typescript-eslint/utils': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
debug: 4.4.1
eslint: 9.33.0(jiti@2.5.1)
ts-api-utils: 1.4.3(typescript@5.9.2)
typescript: 5.9.2
ts-api-utils: 1.4.3(typescript@5.9.3)
typescript: 5.9.3
transitivePeerDependencies:
- supports-color
@@ -2877,7 +2877,7 @@ snapshots:
'@typescript-eslint/types@8.39.1': {}
'@typescript-eslint/typescript-estree@7.18.0(typescript@5.9.2)':
'@typescript-eslint/typescript-estree@7.18.0(typescript@5.9.3)':
dependencies:
'@typescript-eslint/types': 7.18.0
'@typescript-eslint/visitor-keys': 7.18.0
@@ -2886,13 +2886,13 @@ snapshots:
is-glob: 4.0.3
minimatch: 9.0.5
semver: 7.7.2
ts-api-utils: 1.4.3(typescript@5.9.2)
ts-api-utils: 1.4.3(typescript@5.9.3)
optionalDependencies:
typescript: 5.9.2
typescript: 5.9.3
transitivePeerDependencies:
- supports-color
'@typescript-eslint/typescript-estree@8.19.0(typescript@5.9.2)':
'@typescript-eslint/typescript-estree@8.19.0(typescript@5.9.3)':
dependencies:
'@typescript-eslint/types': 8.19.0
'@typescript-eslint/visitor-keys': 8.19.0
@@ -2901,15 +2901,15 @@ snapshots:
is-glob: 4.0.3
minimatch: 9.0.5
semver: 7.7.2
ts-api-utils: 1.4.3(typescript@5.9.2)
typescript: 5.9.2
ts-api-utils: 1.4.3(typescript@5.9.3)
typescript: 5.9.3
transitivePeerDependencies:
- supports-color
'@typescript-eslint/typescript-estree@8.39.1(typescript@5.9.2)':
'@typescript-eslint/typescript-estree@8.39.1(typescript@5.9.3)':
dependencies:
'@typescript-eslint/project-service': 8.39.1(typescript@5.9.2)
'@typescript-eslint/tsconfig-utils': 8.39.1(typescript@5.9.2)
'@typescript-eslint/project-service': 8.39.1(typescript@5.9.3)
'@typescript-eslint/tsconfig-utils': 8.39.1(typescript@5.9.3)
'@typescript-eslint/types': 8.39.1
'@typescript-eslint/visitor-keys': 8.39.1
debug: 4.4.1
@@ -2917,41 +2917,41 @@ snapshots:
is-glob: 4.0.3
minimatch: 9.0.5
semver: 7.7.2
ts-api-utils: 2.1.0(typescript@5.9.2)
typescript: 5.9.2
ts-api-utils: 2.1.0(typescript@5.9.3)
typescript: 5.9.3
transitivePeerDependencies:
- supports-color
'@typescript-eslint/utils@7.18.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)':
'@typescript-eslint/utils@7.18.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)':
dependencies:
'@eslint-community/eslint-utils': 4.7.0(eslint@9.33.0(jiti@2.5.1))
'@typescript-eslint/scope-manager': 7.18.0
'@typescript-eslint/types': 7.18.0
'@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.2)
'@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.3)
eslint: 9.33.0(jiti@2.5.1)
transitivePeerDependencies:
- supports-color
- typescript
'@typescript-eslint/utils@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)':
'@typescript-eslint/utils@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)':
dependencies:
'@eslint-community/eslint-utils': 4.7.0(eslint@9.33.0(jiti@2.5.1))
'@typescript-eslint/scope-manager': 8.19.0
'@typescript-eslint/types': 8.19.0
'@typescript-eslint/typescript-estree': 8.19.0(typescript@5.9.2)
'@typescript-eslint/typescript-estree': 8.19.0(typescript@5.9.3)
eslint: 9.33.0(jiti@2.5.1)
typescript: 5.9.2
typescript: 5.9.3
transitivePeerDependencies:
- supports-color
'@typescript-eslint/utils@8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)':
'@typescript-eslint/utils@8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)':
dependencies:
'@eslint-community/eslint-utils': 4.7.0(eslint@9.33.0(jiti@2.5.1))
'@typescript-eslint/scope-manager': 8.39.1
'@typescript-eslint/types': 8.39.1
'@typescript-eslint/typescript-estree': 8.39.1(typescript@5.9.2)
'@typescript-eslint/typescript-estree': 8.39.1(typescript@5.9.3)
eslint: 9.33.0(jiti@2.5.1)
typescript: 5.9.2
typescript: 5.9.3
transitivePeerDependencies:
- supports-color
@@ -2970,12 +2970,12 @@ snapshots:
'@typescript-eslint/types': 8.39.1
eslint-visitor-keys: 4.2.1
'@vitest/eslint-plugin@1.1.24(@typescript-eslint/utils@8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)(vitest@3.2.4(@types/node@24.2.1)(jiti@2.5.1))':
'@vitest/eslint-plugin@1.1.24(@typescript-eslint/utils@8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)(vitest@3.2.4(@types/node@24.2.1)(jiti@2.5.1))':
dependencies:
'@typescript-eslint/utils': 8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
'@typescript-eslint/utils': 8.39.1(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
eslint: 9.33.0(jiti@2.5.1)
optionalDependencies:
typescript: 5.9.2
typescript: 5.9.3
vitest: 3.2.4(@types/node@24.2.1)(jiti@2.5.1)
'@vitest/expect@3.2.4':
@@ -3513,27 +3513,27 @@ snapshots:
transitivePeerDependencies:
- supports-color
eslint-module-utils@2.12.1(@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2))(eslint-import-resolver-node@0.3.9)(eslint@9.33.0(jiti@2.5.1)):
eslint-module-utils@2.12.1(@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.33.0(jiti@2.5.1)):
dependencies:
debug: 3.2.7
optionalDependencies:
'@typescript-eslint/parser': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
'@typescript-eslint/parser': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
eslint: 9.33.0(jiti@2.5.1)
eslint-import-resolver-node: 0.3.9
transitivePeerDependencies:
- supports-color
eslint-plugin-deprecation@3.0.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2):
eslint-plugin-deprecation@3.0.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3):
dependencies:
'@typescript-eslint/utils': 7.18.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
'@typescript-eslint/utils': 7.18.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
eslint: 9.33.0(jiti@2.5.1)
ts-api-utils: 1.4.3(typescript@5.9.2)
ts-api-utils: 1.4.3(typescript@5.9.3)
tslib: 2.8.1
typescript: 5.9.2
typescript: 5.9.3
transitivePeerDependencies:
- supports-color
eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.33.0(jiti@2.5.1)):
eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.33.0(jiti@2.5.1)):
dependencies:
'@rtsao/scc': 1.1.0
array-includes: 3.1.9
@@ -3544,7 +3544,7 @@ snapshots:
doctrine: 2.1.0
eslint: 9.33.0(jiti@2.5.1)
eslint-import-resolver-node: 0.3.9
eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2))(eslint-import-resolver-node@0.3.9)(eslint@9.33.0(jiti@2.5.1))
eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.33.0(jiti@2.5.1))
hasown: 2.0.2
is-core-module: 2.16.1
is-glob: 4.0.3
@@ -3556,7 +3556,7 @@ snapshots:
string.prototype.trimend: 1.0.9
tsconfig-paths: 3.15.0
optionalDependencies:
'@typescript-eslint/parser': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.2)
'@typescript-eslint/parser': 8.19.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.9.3)
transitivePeerDependencies:
- eslint-import-resolver-typescript
- eslint-import-resolver-webpack
@@ -4372,12 +4372,12 @@ snapshots:
prelude-ls@1.2.1: {}
prisma@6.14.0(typescript@5.9.2):
prisma@6.14.0(typescript@5.9.3):
dependencies:
'@prisma/config': 6.14.0
'@prisma/engines': 6.14.0
optionalDependencies:
typescript: 5.9.2
typescript: 5.9.3
transitivePeerDependencies:
- magicast
@@ -4734,13 +4734,13 @@ snapshots:
toad-cache@3.7.0: {}
ts-api-utils@1.4.3(typescript@5.9.2):
ts-api-utils@1.4.3(typescript@5.9.3):
dependencies:
typescript: 5.9.2
typescript: 5.9.3
ts-api-utils@2.1.0(typescript@5.9.2):
ts-api-utils@2.1.0(typescript@5.9.3):
dependencies:
typescript: 5.9.2
typescript: 5.9.3
ts-mixer@6.0.4: {}
@@ -4796,7 +4796,7 @@ snapshots:
possible-typed-array-names: 1.1.0
reflect.getprototypeof: 1.0.10
typescript@5.9.2: {}
typescript@5.9.3: {}
unbox-primitive@1.1.0:
dependencies:
+91
View File
@@ -0,0 +1,91 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { MessageFlags } from "discord.js";
import { checkGuildEntitlement } from "../modules/checkEntitlement.js";
import { sendUnentitledResponse } from "../modules/sendUnentitledResponse.js";
import { errorHandler } from "../utils/errorHandler.js";
import type { Button } from "../interfaces/button.js";
/**
* Handles the `/leaderboard` button.
* @param pavelle - Pavelle's instance.
* @param interaction - The interaction payload from Discord.
*/
// eslint-disable-next-line max-lines-per-function -- Lazy.
export const leaderboard: Button = async(pavelle, interaction) => {
try {
const isEntitled = await checkGuildEntitlement(pavelle, interaction.guild);
if (!isEntitled) {
await sendUnentitledResponse(interaction);
return;
}
const members = await pavelle.db.users.findMany({
where: {
serverId: interaction.guild.id,
},
});
const sorted = members.sort((a, b) => {
return b.points - a.points;
});
const topTen = sorted.slice(0, 10).map((member, index) => {
return `- **#${(index + 1).toString()}:** <@${member.userId}> - ${member.points.toString()} point(s).`;
}).
join("\n");
const yourScore = sorted.find((member) => {
return member.userId === interaction.member.id;
});
const yourRank = yourScore
? `You are rank #${(sorted.indexOf(yourScore) + 1).toString()} with ${yourScore.points.toString()} points.`
: "You are not ranked. Try throwing some stuff!";
await interaction.editReply({
allowedMentions: {
parse: [],
},
components: [
{
// eslint-disable-next-line @typescript-eslint/naming-convention -- Discord API convention.
accent_color: null,
components: [
{
content: "# Leaderboard",
type: 10,
},
{
divider: true,
spacing: 1,
type: 14,
},
{
content: "## Top 10 Members",
type: 10,
},
{
content: topTen,
type: 10,
},
{
content: `-# ${yourRank}`,
type: 10,
},
],
spoiler: false,
type: 17,
},
],
flags: [ MessageFlags.IsComponentsV2 ],
});
} catch (error) {
const id = await errorHandler(error, "leaderboard command");
await interaction.editReply({
content:
`An error occurred while processing your request. Please try again later, or join our support server and provide this ID: ${id}`,
});
}
};
+105
View File
@@ -0,0 +1,105 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { MessageFlags } from "discord.js";
import { checkGuildEntitlement } from "../modules/checkEntitlement.js";
import { generateScore } from "../modules/generateScore.js";
import { getCachedCount } from "../modules/getCachedCount.js";
import { getConfig } from "../modules/getConfig.js";
import { getThrowComponents } from "../modules/getThrowComponents.js";
import { sendUnentitledResponse } from "../modules/sendUnentitledResponse.js";
import { errorHandler } from "../utils/errorHandler.js";
import { getRandomValue } from "../utils/getRandomValue.js";
import type { Button } from "../interfaces/button.js";
/**
* Handles the `/throw` button interaction.
* @param pavelle - Pavelle's Discord instance.
* @param interaction - The command interaction payload from Discord.
*/
// eslint-disable-next-line max-lines-per-function -- Big logic, but lotsa components
export const throwButton: Button = async(pavelle, interaction) => {
try {
const { member, guild } = interaction;
const count = getCachedCount(pavelle, `${guild.id}-${member.id}`);
if (count <= 0) {
await interaction.editReply({
components: [
{
// eslint-disable-next-line @typescript-eslint/naming-convention -- Discord API convention.
accent_color: null,
components: [
{
content:
// eslint-disable-next-line stylistic/max-len -- long string.
"Oopsie! You are out of throws! Your count resets at the top of every hour.",
type: 10,
},
],
spoiler: false,
type: 17,
},
],
flags: [ MessageFlags.IsComponentsV2 ],
});
return;
}
const isEntitled = await checkGuildEntitlement(pavelle, guild);
if (!isEntitled) {
await sendUnentitledResponse(interaction);
return;
}
pavelle.throwCache.set(`${guild.id}-${member.id}`, count - 1);
await guild.members.fetch().catch(() => {
return null;
});
const target = getRandomValue([ ...guild.members.cache.values() ]);
const score = generateScore();
const { theme, spoiler } = await getConfig(pavelle, guild.id);
const updated = await pavelle.db.users.upsert({
create: {
points: score,
serverId: guild.id,
userId: member.id,
},
update: {
points: {
increment: score,
},
},
where: {
// eslint-disable-next-line @typescript-eslint/naming-convention -- Prisma index convention.
serverId_userId: {
serverId: guild.id,
userId: member.id,
},
},
});
const components = getThrowComponents(
pavelle,
member.id,
target.id,
guild.id,
theme,
score,
spoiler,
updated.points,
);
await interaction.editReply({
allowedMentions: {
parse: [ ],
},
components: components,
flags: [ MessageFlags.IsComponentsV2 ],
});
} catch (error) {
const id = await errorHandler(error, "throw command");
await interaction.editReply({
content:
`An error occurred while processing your request. Please try again later, or join our support server and provide this ID: ${id}`,
});
}
};
+7
View File
@@ -5,6 +5,8 @@
*/
import { MessageFlags } from "discord.js";
import { checkGuildEntitlement } from "../modules/checkEntitlement.js";
import { sendUnentitledResponse } from "../modules/sendUnentitledResponse.js";
import { errorHandler } from "../utils/errorHandler.js";
import type { Command } from "../interfaces/command.js";
@@ -16,6 +18,11 @@ import type { Command } from "../interfaces/command.js";
// eslint-disable-next-line max-lines-per-function -- Lazy.
export const leaderboard: Command = async(pavelle, interaction) => {
try {
const isEntitled = await checkGuildEntitlement(pavelle, interaction.guild);
if (!isEntitled) {
await sendUnentitledResponse(interaction);
return;
}
const members = await pavelle.db.users.findMany({
where: {
serverId: interaction.guild.id,
+20 -3
View File
@@ -4,22 +4,39 @@
* @author Naomi Carrigan
*/
import { leaderboard as leaderboardButton } from "../buttons/leaderboard.js";
import { throwButton } from "../buttons/throwButton.js";
import { about } from "../commands/about.js";
import { config } from "../commands/config.js";
import { leaderboard } from "../commands/leaderboard.js";
import { throwCmd } from "../commands/throwCmd.js";
import type { Button } from "../interfaces/button.js";
import type { Command } from "../interfaces/command.js";
const defaultHandler: Command = async(_lynira, interaction) => {
const defaultCommandHandler: Command = async(_lynira, interaction) => {
await interaction.editReply({
content: "This command is not implemented yet.",
});
};
export const handlers: { _default: Command } & Record<string, Command> = {
_default: defaultHandler,
const defaultButtonHandler: Button = async(_pavelle, interaction) => {
await interaction.editReply({
content: "This button is not implemented yet.",
});
};
const commandHandlers: { _default: Command } & Record<string, Command> = {
_default: defaultCommandHandler,
about: about,
config: config,
leaderboard: leaderboard,
throw: throwCmd,
};
const buttonHandlers: { _default: Button } & Record<string, Button> = {
_default: defaultButtonHandler,
leaderboard: leaderboardButton,
throw: throwButton,
};
export { commandHandlers, buttonHandlers };
+7 -4
View File
@@ -11,6 +11,7 @@ import {
Events,
} from "discord.js";
import { scheduleJob } from "node-schedule";
import { processButton } from "./modules/processButton.js";
import { processCommand } from "./modules/processCommand.js";
import { instantiateServer } from "./server/serve.js";
import { logger } from "./utils/logger.js";
@@ -32,13 +33,15 @@ pavelle.discord.once(Events.ClientReady, () => {
});
pavelle.discord.on(Events.InteractionCreate, (interaction) => {
if (!interaction.isChatInputCommand()) {
return;
}
if (!interaction.inCachedGuild()) {
return;
}
void processCommand(pavelle, interaction);
if (interaction.isChatInputCommand()) {
void processCommand(pavelle, interaction);
}
if (interaction.isButton()) {
void processButton(pavelle, interaction);
}
});
pavelle.discord.on(Events.Error, (error) => {
+12
View File
@@ -0,0 +1,12 @@
/**
* @copyright nhcarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import type { Pavelle } from "./pavelle.js";
import type { ButtonInteraction } from "discord.js";
export type Button = (
pavelle: Pavelle,
interaction: ButtonInteraction<"cached">
)=> Promise<void>;
+2 -1
View File
@@ -4,6 +4,7 @@
* @author Naomi Carrigan
*/
import { randomInt } from "node:crypto";
import { Score } from "../interfaces/score.js";
/**
@@ -13,7 +14,7 @@ import { Score } from "../interfaces/score.js";
* @returns The number of points the user earned.
*/
export const generateScore = (): number => {
const random = Math.floor(Math.random() * 100);
const random = randomInt(1, 101);
if (random < 10) {
return Score.COUNTER;
}
+1 -1
View File
@@ -13,5 +13,5 @@ import type { Pavelle } from "../interfaces/pavelle.js";
* @returns The number of throws remaining.
*/
export const getCachedCount = (pavelle: Pavelle, id: string): number => {
return pavelle.throwCache.get(id) ?? 3;
return pavelle.throwCache.get(id) ?? 10;
};
+21
View File
@@ -144,6 +144,27 @@ export const getThrowComponents = (
content: `-# You now have ${total.toString()} point(s).\n-# You have ${count.toString()} remaining throws for the hour.`,
type: 10,
},
{
components: [
{
// eslint-disable-next-line @typescript-eslint/naming-convention -- Discord API convention.
custom_id: "throw",
disabled: false,
label: "Throw another!",
style: 3,
type: 2,
},
{
// eslint-disable-next-line @typescript-eslint/naming-convention -- Discord API convention.
custom_id: "leaderboard",
disabled: false,
label: "Check leaderboard",
style: 1,
type: 2,
},
],
type: 1,
},
],
spoiler: false,
type: 17,
+20
View File
@@ -0,0 +1,20 @@
/**
* @copyright nhcarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { buttonHandlers as handlers } from "../config/handlers.js";
import type { Button } from "../interfaces/button.js";
/**
* Process a button interaction.
* @param pavelle - The Pavelle instance.
* @param interaction - The interaction to process.
*/
export const processButton: Button = async(pavelle, interaction) => {
await interaction.deferReply();
const commandName = interaction.customId;
// eslint-disable-next-line no-underscore-dangle -- Accessing private property for command handler.
await (handlers[commandName] ?? handlers._default)(pavelle, interaction);
};
+1 -1
View File
@@ -4,7 +4,7 @@
* @author Naomi Carrigan
*/
import { handlers } from "../config/handlers.js";
import { commandHandlers as handlers } from "../config/handlers.js";
import type { Command } from "../interfaces/command.js";
/**
+2 -1
View File
@@ -11,6 +11,7 @@ import {
MessageFlags,
TextDisplayBuilder,
type ChatInputCommandInteraction,
type ButtonInteraction,
} from "discord.js";
/**
@@ -18,7 +19,7 @@ import {
* @param interaction - The interaction object from Discord.
*/
export const sendUnentitledResponse = async(
interaction: ChatInputCommandInteraction,
interaction: ChatInputCommandInteraction | ButtonInteraction,
): Promise<void> => {
const components = [
new TextDisplayBuilder().setContent(
+1 -1
View File
@@ -19,7 +19,7 @@ const html = `<!DOCTYPE html>
<body>
<main>
<h1>Pavelle</h1>
<img src="https://cdn.nhcarrigan.com/new-avatars/pavelle.png" width="250" alt="Pavelle" />
<img src="https://cdn.nhcarrigan.com/new-avatars/pavelle-full.png" width="250" alt="Pavelle" />
<section>
<p>Discord bot that allows you to throw things (like cake) at your fellow server members. </p>
<a href="https://discord.com/oauth2/authorize?client_id=1405735335949766716" class="social-button discord-button" style="display: inline-block; background-color: #5865F2; color: white; padding: 10px 20px; text-decoration: none; border-radius: 4px; margin: 5px;">