Skip to content

Commit c8f7ff8

Browse files
MaseshiMaseshi
authored
Merge branch 'main' into i10n
2 parents 3b69018 + 07e13f0 commit c8f7ff8

File tree

110 files changed

+4793
-7884
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+4793
-7884
lines changed

‎.dockerignore

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,42 @@
1-
# Temp
2-
.note.txt
1+
# Github
2+
.github/
33

4-
# Back-ends
5-
.firebase
6-
.firebaserc
7-
firebase.json
4+
# VSCode
5+
.vscode/
86

9-
# Rules
10-
database.rules.json
11-
firestore.indexes.json
12-
firestore.rules
13-
storage.rules
7+
# Dependency directories
8+
node_modules/
9+
10+
# Logs
11+
logs/
12+
*.log
13+
14+
# Ignore
15+
.*ignore
16+
17+
# Docker
18+
Dockerfile*
19+
docker-compose*
1420

15-
# Env
21+
# Configs
22+
*.config.*
23+
24+
# Crowdin
25+
crowdin.yml
26+
27+
# Environment
1628
.env
1729
.env.local
1830
.env.development.local
1931
.env.test.local
2032
.env.production.local
2133

22-
# Cache
23-
.cache/
24-
25-
# Logs
26-
logs
27-
*.log
34+
# README
35+
README.md
36+
NOTE.md
2837

29-
# Dependency directories
30-
node_modules/
38+
# Back-ends
39+
.firebase
40+
.firebaserc
41+
firebase.json
42+
database.rules.json

‎.env.example

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,25 @@ APP_ID=
3131
MEASUREMENT_ID=
3232

3333
# Top.gg config
34-
# API key of your bot
35-
TOP_GG_API_KEY=
34+
# API key of bot
35+
TOP_GG_TOKEN=
3636

37-
# Weatherbit config
37+
# Translation Config
38+
# Used to translate languages, if you have
39+
# your own host you can add it.
40+
TRANSLATION_BASE_URL=
41+
42+
# OpenAI Config
43+
# Add the API key, your project ID or
44+
# organization ID, and your address if
45+
# applicable.
46+
# https://platform.openai.com/account/api-keys
47+
OPENAI_API_KEY=
48+
OPENAI_BASE_URL=
49+
OPENAI_ORGANIZATION=
50+
OPENAI_PROJECT=
51+
52+
# Open Weather config
3853
# API key of weather service
39-
# https://www.weatherbit.io
40-
WEATHERBIT_KEY=
54+
# https://home.openweathermap.org/api_keys
55+
OPEN_WEATHER_TOKEN=

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
name: Bug report
33
about: Create a report to help us improve
44
title: ''
5-
labels: [bag]
5+
labels: [bug]
66
assignees: ''
7-
87
---
98

109
**Describe the bug**
@@ -18,15 +17,17 @@ Add any other context or screenshots about the feature request here.
1817

1918
**Detail**
2019
Some of the information can be obtained through reports from bots. (Optional)
21-
- Command: [e.g. help]
22-
- Version: [e.g. 1.0.0]
23-
- Occurrence time: [e.g. Sat Jan 15 2022 12:30:00]
24-
- Server: [e.g. Normal, Abnormal]
25-
- Details Delay: [e.g. 50ms]
26-
- Receive - Send: [e.g. 60ms]
20+
21+
- Command: [e.g. help]
22+
- Version: [e.g. 1.0.0]
23+
- Occurrence time: [e.g. Sat Jan 15 2022 12:30:00]
24+
- Server: [e.g. Normal, Abnormal]
25+
- Details Delay: [e.g. 50ms]
26+
- Receive - Send: [e.g. 60ms]
2727

2828
**Error Code**
2929
If the bot has reported such errors can tell us from this section. (Optional)
30+
3031
```JavaScript
3132
TypeError: Cannot read properties of undefined (reading 'alert')
3233
```

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: Suggest an idea for this project
44
title: ''
55
labels: [feature request]
66
assignees: ''
7-
87
---
98

109
**Is your feature request related to a problem? Please describe.**

‎.github/dependabot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
version: 2
77
updates:
8-
- package-ecosystem: "npm" # See documentation for possible values
9-
directory: "/" # Location of package manifests
8+
- package-ecosystem: 'npm' # See documentation for possible values
9+
directory: '/' # Location of package manifests
1010
schedule:
11-
interval: "weekly"
11+
interval: 'weekly'

‎.github/workflows/docker-image.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Docker Image CI
2+
3+
on:
4+
push:
5+
branches: ['main']
6+
pull_request:
7+
branches: ['main']
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v4
15+
- name: Build the Docker image
16+
run: docker build --file Dockerfile --target start --platform linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x --tag ${{ secrets.DOCKER_USERNAME@L }}/${{ github.event.repository.name@L }}:latest .

‎.gitignore

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,22 @@
1-
# Temp
2-
.note.txt
3-
4-
# Back-ends
5-
.firebase
6-
.firebaserc
7-
firebase.json
1+
# Dependency directories
2+
node_modules/
83

9-
# Rules
10-
database.rules.json
11-
firestore.indexes.json
12-
firestore.rules
13-
storage.rules
4+
# Logs
5+
logs/
6+
*.log
147

15-
# Env
8+
# Environment
169
.env
1710
.env.local
1811
.env.development.local
1912
.env.test.local
2013
.env.production.local
2114

22-
# Cache
23-
.cache/
15+
# README
16+
NOTE.md
2417

25-
# Logs
26-
logs
27-
*.log
28-
29-
# Dependency directories
30-
node_modules/
18+
# Back-ends
19+
.firebase
20+
.firebaserc
21+
firebase.json
22+
database.rules.json

‎.prettierignore

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
1-
# Github
2-
.github/
1+
# Assets
2+
assets/
33

4-
# Temp
5-
.note.txt
6-
7-
# Back-ends
8-
.firebase
9-
.firebaserc
10-
firebase.json
4+
# Dependency directories
5+
node_modules/
116

12-
# Rules
13-
database.rules.json
14-
firestore.indexes.json
15-
firestore.rules
16-
storage.rules
7+
# Logs
8+
logs/
9+
*.log
1710

18-
# Env
11+
# Environment
1912
.env
2013
.env.local
2114
.env.development.local
2215
.env.test.local
2316
.env.production.local
2417

25-
# Cache
26-
.cache/
18+
# Package lock
19+
package-lock.json
2720

28-
# Logs
29-
logs
30-
*.log
21+
# LICENSE
22+
LICENSE
23+
LICENSE_ASSETS
3124

32-
# Dependency directories
33-
node_modules/
25+
# README
26+
NOTE.md
27+
28+
# Back-ends
29+
.firebase
30+
.firebaserc
31+
firebase.json
32+
database.rules.json

‎.vscode/launch.json

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"type": "node-terminal",
9+
"request": "launch",
10+
"command": "npm run dev",
11+
"name": "Launch Development",
12+
"skipFiles": [
13+
"<node_internals>/**",
14+
"**/node_modules/**",
15+
"**/.cache/**",
16+
"logs/**"
17+
],
18+
"timeout": 10000,
19+
"suppressMultipleSessionWarning": true,
20+
"internalConsoleOptions": "openOnFirstSessionStart"
21+
},
22+
{
23+
"type": "node-terminal",
24+
"request": "launch",
25+
"command": "npm run serve",
26+
"name": "Launch Serve",
27+
"skipFiles": [
28+
"<node_internals>/**",
29+
"**/node_modules/**",
30+
"**/.cache/**",
31+
"logs/**"
32+
],
33+
"timeout": 10000,
34+
"suppressMultipleSessionWarning": true,
35+
"internalConsoleOptions": "openOnFirstSessionStart"
36+
},
37+
{
38+
"type": "node-terminal",
39+
"request": "launch",
40+
"command": "npm run docker:run:serve",
41+
"name": "Launch Serve (Docker)",
42+
"skipFiles": [
43+
"<node_internals>/**",
44+
"**/node_modules/**",
45+
"**/.cache/**",
46+
"logs/**"
47+
],
48+
"timeout": 10000,
49+
"suppressMultipleSessionWarning": true,
50+
"internalConsoleOptions": "openOnFirstSessionStart"
51+
},
52+
]
53+
}

‎.vscode/tasks.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"type": "npm",
6+
"script": "format",
7+
"label": "Lint and Format",
8+
"detail": "Format and make sure your code is readable and in a standard format."
9+
},
10+
{
11+
"type": "npm",
12+
"script": "docker:build",
13+
"label": "Docker: Build",
14+
"detail": "Builds Docker images from a Dockerfile.",
15+
"group": "build"
16+
},
17+
{
18+
"type": "npm",
19+
"script": "docker:build:serve",
20+
"label": "Docker: Build (Serve Mode)",
21+
"detail": "Builds Docker images from a Dockerfile with serve mode.",
22+
"group": "build"
23+
},
24+
{
25+
"type": "npm",
26+
"script": "docker:push",
27+
"label": "Docker: Push Image",
28+
"detail": "Share your images to the Docker Hub registry."
29+
}
30+
]
31+
}

0 commit comments

Comments
 (0)