Skip to content

Commit 6fef65c

Browse files
committed
Hotfix for v1.1.1
1 parent ff74154 commit 6fef65c

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

.env_template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ TOKEN=
22
APPLICATIONID=
33
FORTNITEAPI=
44
XBOXAPI=
5+
FIREBASEURL=
56
DEBUGMODE=OFF

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# R4Bot ![Version](https://img.shields.io/badge/Latest-1.1.1/master-blue.svg)
1+
# R4Bot ![Version](https://img.shields.io/badge/Latest-1.1.2/master-blue.svg)
22
Discord-бот, созданный для облегчения модерации серверов, и не только. Используются слэш-команды.
33

44
## 🛠️ Установка
@@ -60,5 +60,6 @@ TOKEN= // Токен бота Discord
6060
APPLICATIONID= // Application ID приложения бота с Discord Developer Portal
6161
FORTNITEAPI= // Ключ API для получения данных с https://fortnite-api.com/
6262
XBOXAPI= // Ключ API для получения данных с https://xbl.io/
63+
FIREBASEURL= // Адрес для подключения к БД Firebase Realtime
6364
DEBUGMODE=OFF // Значение DEBUG-режима
6465
```

main.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import discord
22

33
from modules.firebase import create_firebase_app
4-
from options import token, debugmode, version, gearsList
4+
from options import token, debugmode, version, gearsList, firebaseURL
55

6-
create_firebase_app()
6+
create_firebase_app(firebaseURL)
77

88
# Define intents for the bot to receive all available events
99
intents = discord.Intents.all()
@@ -14,6 +14,7 @@
1414
# Create the Discord bot instance with specified intents
1515
bot = discord.Bot(case_insensitive=True, intents=intents)
1616

17+
1718
# Gears are always cool
1819

1920
# Event that runs when the bot is ready and connected to Discord
@@ -27,7 +28,7 @@ async def on_ready():
2728
for guild in bot.guilds:
2829
print(f"Подключились к серверу: {guild}")
2930
print("------")
30-
31+
3132
# Set bot status and activity based on debug mode
3233
if debugmode == "ON":
3334
status = discord.Status.dnd
@@ -37,6 +38,7 @@ async def on_ready():
3738
activity = discord.Activity(type=discord.ActivityType.listening, name=f"обиды участников (v{version})")
3839
await bot.change_presence(status=status, activity=activity)
3940

41+
4042
for module_name in gearsList:
4143
try:
4244
bot.load_extension(f'gears.{module_name}')

modules/firebase.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
from firebase_admin import credentials, initialize_app, db
44

55

6-
def create_firebase_app():
7-
cred_obj = credentials.Certificate("firebaseConfig.json", )
6+
def create_firebase_app(databaseURL: str):
7+
cred_obj = credentials.Certificate("firebaseConfig.json")
88
firebase = initialize_app(cred_obj,
9-
{"databaseURL": "https://r4bot-50baf-default-rtdb.firebaseio.com/"})
9+
{"databaseURL": databaseURL})
1010
return firebase
1111

1212

options.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
# Load environment variables from .env file
88
load_dotenv()
99

10-
version = "1.1.1"
10+
version = "1.1.2"
1111

1212
# Get environment variables
1313
token = environ.get('TOKEN')
1414
applicationID = environ.get('APPLICATIONID')
1515
fortniteapi = environ.get('FORTNITEAPI')
1616
xboxapi = environ.get('XBOXAPI')
17+
firebaseURL = environ.get('FIREBASEURL')
1718
debugmode = environ.get('DEBUGMODE')
1819

1920
try:

0 commit comments

Comments
 (0)