Compare commits

..

3 Commits

Author SHA1 Message Date
e71ffd0b14
[Jenkins] Fix webhook
All checks were successful
Gitsokyo/bot-base/pipeline/head This commit looks good
2021-05-13 21:09:52 +02:00
ec512d789b
Update deploy location
# Conflicts:
#	Jenkinsfile
2021-05-13 20:03:17 +02:00
3a455d8cfa
Migrating to Colabois.
All checks were successful
Gitsokyo/bot-base/pipeline/head This commit looks good
2021-05-11 01:25:38 +02:00
2 changed files with 7 additions and 8 deletions

View File

@ -1 +1 @@
from .bot_base import * import bot_base

View File

@ -1,16 +1,20 @@
from __future__ import annotations from __future__ import annotations
import asyncio import importlib
import inspect
import logging import logging
import os import os
import sys
import traceback import traceback
import discord import discord
from aiohttp import web import toml
from packaging.specifiers import SpecifierSet, InvalidSpecifier
from bot_base.modules import ModuleManager from bot_base.modules import ModuleManager
from config import Config, config_types from config import Config, config_types
from config.config_types import factory from config.config_types import factory
import errors
__version__ = "0.2.0" __version__ = "0.2.0"
@ -33,20 +37,15 @@ class BotBase(discord.Client):
self.config = Config(path=os.path.join(data_folder, "config.toml")) self.config = Config(path=os.path.join(data_folder, "config.toml"))
self.config.register("data_folder", factory(config_types.Str)) self.config.register("data_folder", factory(config_types.Str))
self.config.register("port", factory(config_types.Int))
self.config.set({ self.config.set({
"data_folder": data_folder, "data_folder": data_folder,
"port": 8080,
}, no_save=True) }, no_save=True)
self.config.load() self.config.load()
self.modules = ModuleManager(self) self.modules = ModuleManager(self)
self.webserver = web.Application()
self.loop.create_task(web._run_app(self.webserver, port=self.config["port"]), name="webserver")
async def on_ready(self): async def on_ready(self):
self.info("Bot ready.") self.info("Bot ready.")
self.modules.load_modules() self.modules.load_modules()