Skip to content

Commit

Permalink
Merge pull request #241 from saiteja-madha/v5.1.0
Browse files Browse the repository at this point in the history
5.1.0 Release
  • Loading branch information
Sai Teja Madha authored Nov 14, 2022
2 parents f047de2 + f0e0656 commit 0588eea
Show file tree
Hide file tree
Showing 59 changed files with 5,109 additions and 3,559 deletions.
5 changes: 4 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ JOIN_LEAVE_LOGS=
BOT_SECRET=
SESSION_PASSWORD=

# API Keys [Required for Weather Command]
# Required for Weather Command (https://weatherstack.com)
WEATHERSTACK_KEY=

# Required for image commands (https://strangeapi.fun/docs)
STRANGE_API_KEY=

# SPOTFIY [Required for Spotify Support]
SPOTIFY_CLIENT_ID=
SPOTIFY_CLIENT_SECRET=
2 changes: 1 addition & 1 deletion .replit
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
language = "nodejs"
run = "node_modules/.bin/node bot.js"
run = "npm i --save-dev [email protected] && npm config set prefix=$(pwd)/node_modules/node && export PATH=$(pwd)/node_modules/node/bin:$PATH && node ."
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: npm start
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

## 📦 Prerequisites

- [Node.js](https://nodejs.org/en/) v16.9.0 or higher
- [Node.js](https://nodejs.org/en/) v16.11.0 or higher
- [Git](https://git-scm.com/downloads)
- [MongoDB](https://www.mongodb.com)

Expand Down
16 changes: 10 additions & 6 deletions config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
module.exports = {
OWNER_IDS: [], // Bot owner ID's
PREFIX: "!", // Default prefix for the bot
SUPPORT_SERVER: "", // Your bot support server
PREFIX_COMMANDS: {
ENABLED: true, // Enable/Disable prefix commands
DEFAULT_PREFIX: "!", // Default prefix for the bot
},
INTERACTIONS: {
SLASH: false, // Should the interactions be enabled
CONTEXT: false, // Should contexts be enabled
Expand Down Expand Up @@ -47,18 +50,19 @@ module.exports = {
MAX_BEG_AMOUNT: 2500, // maximum coins to be received when beg command is used
},

ERELA_JS: {
MUSIC: {
ENABLED: false,
IDLE_TIME: 60, // Time in seconds before the bot disconnects from the voice channel
IDLE_TIME: 60, // Time in seconds before the bot disconnects from an idle voice channel
MAX_SEARCH_RESULTS: 5,
DEFAULT_SOURCE: "SC", // YT or YTM or SC
// Add any number of lavalink nodes here
// Refer to https://github.com/freyacodes/Lavalink to host your own lavalink server
NODES: [
LAVALINK_NODES: [
{
host: "localhost",
port: 2333,
password: "youshallnotpass",
identifier: "Local Node",
id: "Local Node",
secure: false,
},
],
Expand All @@ -73,7 +77,7 @@ module.exports = {

IMAGE: {
ENABLED: false,
BASE_API: "https://image-api.strangebot.xyz",
BASE_API: "https://strangeapi.fun/api",
},

INVITE: {
Expand Down
2 changes: 1 addition & 1 deletion dashboard/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports.launch = async (client) => {
session({
secret: process.env.SESSION_PASSWORD,
cookie: { maxAge: new Date(Date.now() + 12096e5) },
name: "Connection",
name: "djs_connection_cookie",
resave: true,
saveUninitialized: false,
store: MongoStore.create({
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "4"

services:
discord-js-bot:
image: saitejamadha/discord-js-bot:5.0.0
image: saitejamadha/discord-js-bot:5.1.0
container_name: discord-js-bot
restart: unless-stopped
networks:
Expand Down
5 changes: 2 additions & 3 deletions dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ WORKDIR /usr/src/app

COPY package*.json ./

RUN npm ci --production
RUN npm ci --omit=dev

COPY . .

EXPOSE 8080 / 8089
EXPOSED 449
EXPOSE 8080-8089 449

CMD [ "node", "bot.js" ]
5 changes: 5 additions & 0 deletions docs/commands/admin.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ These commands can only be used by members who have **MANAGE_SERVER** permission
- **Description**: Set bot prefix
- **Usage**: `!setprefix <newPrefix>`

### Embed

- **Description**: Send an embed message
- **Usage**: `!embed <#channel>`

### Automoderation

{% hint style="info" %}
Expand Down
24 changes: 20 additions & 4 deletions docs/commands/image.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,24 @@ description: 32 commands
- **Cooldown**: 5 seconds
- **Available Filters**:

| blur | burn | gay | greyscale |
| ------ | -------- | ----- | --------- |
| invert | pixelate | sepia | sharpen |
| | | | |
| ------- | --------- | --------- | -------- |
| blur | brighten | burn | darken |
| distort | greyscale | invert | pixelate |
| sepia | sharpen | threshold | |

### Overlays

- **Description**: add overlay over the provided image
- **Command Usage**: `!{available overlays}`
- **Slash Usage**: `/overlay <name>`;
- **Cooldown**: 5 seconds
- **Available Filters**:

| | | | |
| -------- | -------- | --------------- | --------- |
| approved | brazzers | gay | halloween |
| rejected | thuglife | to-be-continued | wasted |

### Generators

Expand All @@ -24,8 +39,9 @@ description: 32 commands
- **Cooldown**: 5 seconds
- **Available Generators**:

| ad | affect | beautiful | bobross |
| | | | |
| ------ | ------------- | ------------ | -------- |
| ad | affect | beautiful | bobross |
| color | confusedstonk | delete | facepalm |
| hitler | jail | jokeoverhead | karaba |
| mms | notstonk | poutine | rainbow |
Expand Down
26 changes: 13 additions & 13 deletions docs/commands/information.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ description: 11 commands

# 🪧 Information

| Command | Slash | Description |
| ----------------------- | ----------------- | ---------------------------------------------------------- |
| **!botinvite** | **/bot invite** | get bot's invite |
| **!botstats** | **/bot stats** | get bot's statistics |
| **!uptime** | **/bot uptime** | get bot's uptime |
| **!userinfo \[member]** | **/info user** | get user information |
| **!chinfo \[channel]** | **/info channel** | get channel information |
| **!guildinfo** | **/info guild** | get guild information |
| **!botinfo** | **/info bot** | get bot information |
| **!avatar \[member]** | **/info avatar** | displays avatar information |
| **!emojinfo \[emoji]** | **/info emoji** | displays emoji information |
| **!lb \<xp\|invite>** | **/lb** | display the XP leaderboard |
| **!ping** | **/ping** | shows the current ping from the bot to the discord servers |
| Command | Slash | Description |
| -------------------------- | ----------------- | ---------------------------------------------------------- |
| **!botinvite** | **/bot invite** | get bot's invite |
| **!botstats** | **/bot stats** | get bot's statistics |
| **!uptime** | **/bot uptime** | get bot's uptime |
| **!userinfo \[member]** | **/info user** | get user information |
| **!chinfo \[channel]** | **/info channel** | get channel information |
| **!guildinfo** | **/info guild** | get guild information |
| **!botinfo** | **/info bot** | get bot information |
| **!avatar \[member]** | **/info avatar** | displays avatar information |
| **!emojinfo \[emoji]** | **/info emoji** | displays emoji information |
| **!lb \<xp\|invite\|rep>** | **/lb** | display the XP leaderboard |
| **!ping** | **/ping** | shows the current ping from the bot to the discord servers |
Loading

0 comments on commit 0588eea

Please sign in to comment.