9 Commits

Author SHA1 Message Date
89ee16d1b5 Merge pull request '0.3' (#146) from 0.3 into master
Reviewed-on: sh-edraft.de/kd_discord_bot#146
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
2023-01-12 07:04:39 +01:00
4c577f6a7b Set config 2023-01-10 20:05:17 +01:00
f50a763539 Set docker 2023-01-10 20:05:03 +01:00
9ff9cc672e Improved docker stuff 2023-01-09 10:23:06 +01:00
9d4cf5a769 Set version for frontend 2023-01-09 08:31:31 +01:00
df1d62f569 Build version 0.3.0 2023-01-09 08:06:28 +01:00
4201510e9f Set version 0.3.0 2023-01-09 08:05:50 +01:00
394428a81a Updated config for build 2023-01-09 08:04:57 +01:00
4733f84ec6 Updated config for build 2023-01-09 08:04:45 +01:00
95 changed files with 167 additions and 347 deletions

View File

@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM python:3.10.4-alpine
FROM python:3.10.6-alpine
WORKDIR /app
COPY ./dist/bot/build/kdb-bot/ .

View File

@@ -15,7 +15,7 @@ __title__ = 'bot'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -28,9 +28,7 @@
"Flask-SocketIO==5.3.2",
"eventlet==0.33.2",
"requests-oauthlib==1.3.1",
"icmplib==3.0.3",
"graphene==3.2.1",
"graphql-server==3.0.0b5"
"icmplib==3.0.3"
],
"DevDependencies": [
"cpl-cli==2022.12.0"

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.abc'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -12,7 +12,6 @@ from eventlet import wsgi
from flask import Flask, request, jsonify, Response
from flask_cors import CORS
from flask_socketio import SocketIO
from graphql_server.flask import GraphQLView
from werkzeug.exceptions import NotFound
from bot_api.configuration.api_settings import ApiSettings
@@ -23,7 +22,6 @@ from bot_api.exception.service_exception import ServiceException
from bot_api.logging.api_logger import ApiLogger
from bot_api.model.error_dto import ErrorDTO
from bot_api.route.route import Route
from bot_data.graphql.graphql import GraphQL
class Api(Flask):
@@ -64,16 +62,6 @@ class Api(Flask):
self._requests = {}
gql = GraphQL()
self.add_url_rule(
'/api/graphql',
view_func=GraphQLView.as_view(
'graphql',
schema=gql.schema,
graphiql=True # for having the GraphiQL interface
)
)
@staticmethod
def _get_methods_from_registered_route() -> Union[list[str], str]:
methods = ['Unknown']

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "",
"AuthorEmail": "",

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.configuration'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.controller'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.controller.discord'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.event'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.exception'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.filter'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.filter.discord'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.logging'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.model'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.model.discord'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.route'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.service'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_api.transformer'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_core'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_core.abc'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_core.configuration'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_core.core_extension'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_core.events'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_core.exception'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_core.helper'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_core.logging'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_core.pipes'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_core.service'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_data'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_data.abc'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -1,53 +0,0 @@
from cpl_core.dependency_injection import ServiceProviderABC
from cpl_query.extension import List
from graphene import ObjectType
from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
from bot_data.abc.client_repository_abc import ClientRepositoryABC
from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
from bot_data.abc.level_repository_abc import LevelRepositoryABC
from bot_data.abc.server_repository_abc import ServerRepositoryABC
from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
from bot_data.abc.user_repository_abc import UserRepositoryABC
from bot_data.model.auto_role import AutoRole
from bot_data.model.client import Client
from bot_data.model.known_user import KnownUser
from bot_data.model.level import Level
from bot_data.model.server import Server
from bot_data.model.user import User
from bot_data.model.user_joined_server import UserJoinedServer
from bot_data.model.user_joined_voice_channel import UserJoinedVoiceChannel
class QueryABC(ObjectType):
_auto_roles: List[AutoRole]
_clients: List[Client]
_known_users: List[KnownUser]
_levels: List[Level]
_servers: List[Server]
_user_joined_servers: List[UserJoinedServer]
_user_joined_voice_channel: List[UserJoinedVoiceChannel]
_users: List[User]
@classmethod
@ServiceProviderABC.inject
def init(
cls,
auto_roles: AutoRoleRepositoryABC,
clients: ClientRepositoryABC,
known_users: KnownUserRepositoryABC,
levels: LevelRepositoryABC,
servers: ServerRepositoryABC,
user_joined_servers: UserJoinedServerRepositoryABC,
user_joined_voice_channel: UserJoinedVoiceChannelRepositoryABC,
users: UserRepositoryABC,
):
cls._auto_roles = auto_roles.get_auto_roles()
cls._clients = clients.get_clients()
cls._known_users = known_users.get_users()
cls._levels = levels.get_levels()
cls._servers = servers.get_servers()
cls._user_joined_servers = user_joined_servers.get_user_joined_servers()
cls._user_joined_voice_channel = user_joined_voice_channel.get_user_joined_voice_channels()
cls._users = users.get_users()

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

View File

@@ -1,16 +0,0 @@
import graphene
from graphene import Schema
from bot_data.abc.queryABC import QueryABC
from bot_data.graphql.root_query import RootQuery
class GraphQL:
def __init__(self):
QueryABC.init()
self._schema = graphene.Schema(query=RootQuery)
@property
def schema(self) -> Schema:
return self._schema

View File

@@ -1,12 +0,0 @@
import graphene
from bot_data.abc.queryABC import QueryABC
from bot_data.graphql.types.client_query_type import ClientQueryType
class ClientQuery(QueryABC):
clients = graphene.List(ClientQueryType)
@classmethod
def resolve_clients(cls, root, info):
return cls._clients

View File

@@ -1,19 +0,0 @@
import graphene
from cpl_core.dependency_injection import ServiceProviderABC
from bot_data.abc.queryABC import QueryABC
from bot_data.graphql.types.server_query_type import ServerQueryType
from bot_data.service.server_repository_service import ServerRepositoryService
class ServerQuery(QueryABC):
servers = graphene.List(ServerQueryType)
@staticmethod
@ServiceProviderABC.inject
def _get_servers(servers: ServerRepositoryService):
return servers.get_servers()
@classmethod
def resolve_servers(cls, root, info):
return cls._servers

View File

@@ -1,10 +0,0 @@
from graphene import ObjectType, relay
from bot_data.graphql.queries.server_query import ServerQuery
class RootQuery(
ServerQuery,
ObjectType
):
node = relay.Node.Field()

View File

@@ -1,18 +0,0 @@
from graphene import Int, String
from bot_data.abc.queryABC import QueryABC
from bot_data.model.client import Client
class ClientQueryType(QueryABC):
id = Int()
discord_id = String()
sent_message_count = Int()
received_message_count = Int()
deleted_message_count = Int()
received_command_count = Int()
moved_users_count = Int()
@staticmethod
def resolve_id(client: Client, info):
return client.client_id

View File

@@ -1,23 +0,0 @@
from graphene import Int, DateTime, String, List
from bot_data.abc.queryABC import QueryABC
from bot_data.graphql.types.client_query_type import ClientQueryType
from bot_data.model.server import Server
class ServerQueryType(QueryABC):
id = Int()
discord_server_id = String()
created_at = DateTime()
modified_at = DateTime()
clients = List(ClientQueryType)
@staticmethod
def resolve_id(server: Server, info):
return server.server_id
@classmethod
def resolve_clients(cls, server: Server, info):
return cls._clients.where(lambda c: c.server.server_id == server.server_id)

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_data.migration'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_data.model'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'bot_data.service'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -33,8 +33,6 @@ class ClientRepositoryService(ClientRepositoryABC):
result[5],
result[6],
self._servers.get_server_by_id(result[7]),
result[8],
result[9],
id=result[0]
))
@@ -51,8 +49,6 @@ class ClientRepositoryService(ClientRepositoryABC):
result[5],
result[6],
self._servers.get_server_by_id(result[7]),
result[8],
result[9],
id=result[0]
)
@@ -67,8 +63,6 @@ class ClientRepositoryService(ClientRepositoryABC):
result[5],
result[6],
self._servers.get_server_by_id(result[7]),
result[8],
result[9],
id=result[0]
)
@@ -88,8 +82,6 @@ class ClientRepositoryService(ClientRepositoryABC):
result[5],
result[6],
self._servers.get_server_by_id(result[7]),
result[8],
result[9],
id=result[0]
)
@@ -109,8 +101,6 @@ class ClientRepositoryService(ClientRepositoryABC):
result[5],
result[6],
self._servers.get_server_by_id(result[7]),
result[8],
result[9],
id=result[0]
)
@@ -130,8 +120,6 @@ class ClientRepositoryService(ClientRepositoryABC):
result[5],
result[6],
self._servers.get_server_by_id(result[7]),
result[8],
result[9],
id=result[0]
)

View File

@@ -25,8 +25,6 @@ class ServerRepositoryService(ServerRepositoryABC):
for result in results:
servers.append(Server(
result[1],
result[2],
result[3],
id=result[0]
))
@@ -57,8 +55,6 @@ class ServerRepositoryService(ServerRepositoryABC):
result = self._context.select(Server.get_select_by_id_string(server_id))[0]
return Server(
result[1],
result[2],
result[3],
id=result[0]
)
@@ -67,8 +63,6 @@ class ServerRepositoryService(ServerRepositoryABC):
result = self._context.select(Server.get_select_by_discord_id_string(discord_id))[0]
return Server(
result[1],
result[2],
result[3],
id=result[0]
)

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.auto_role'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "",
"AuthorEmail": "",

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.auto_role.command'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.auto_role.events'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.auto_role.helper'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.base'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.base.abc'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "",
"AuthorEmail": "",

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.base.command'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.base.configuration'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.base.events'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.base.helper'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.base.service'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.base.thread'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.boot_log'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "",
"AuthorEmail": "",

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.boot_log.configuration'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.database'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.level'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.level.command'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.level.configuration'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.level.events'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "",
"AuthorEmail": "",

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.level.service'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.permission'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.permission.abc'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.permission.configuration'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.permission.events'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "",
"AuthorEmail": "",

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.permission.service'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.stats'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.stats.command'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.stats.model'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.stats.service'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "",
"AuthorEmail": "",

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.stats.ui'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.technician'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -15,7 +15,7 @@ __title__ = 'modules.technician.command'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
__version__ = '0.3.0rc5'
__version__ = '0.3.0'
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='0', minor='3', micro='0.rc5')
version_info = VersionInfo(major='0', minor='3', micro='0')

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "",
"AuthorEmail": "",

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc5"
"Micro": "0"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

View File

@@ -1,4 +1,7 @@
FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf
COPY nginx.conf.template /etc/nginx/conf.d/nginx.conf.template
RUN rm -rf /usr/share/nginx/html/*
COPY ./dist/kdb-web/ /usr/share/nginx/html
RUN apk update
RUN apk add bash
CMD /bin/bash -c "envsubst '\$BOT_CONTAINER_NAME' < /etc/nginx/conf.d/nginx.conf.template > /etc/nginx/nginx.conf; nginx -g 'daemon off;'"

View File

@@ -24,7 +24,7 @@ http {
}
location /api {
proxy_pass http://kdb_bot_staging_1;
proxy_pass http://${BOT_CONTAINER_NAME};
}
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "kdb-web",
"version": "0.3.0.rc3",
"version": "0.3.0",
"scripts": {
"ng": "ng",
"update-version": "ts-node-esm update-version.ts",

View File

@@ -3,7 +3,7 @@
"WebVersion": {
"Major": "0",
"Minor": "3",
"Micro": "dev128"
"Micro": "0"
},
"Themes": [
{