Add clan and login to web, modify a lot about database

deploy/docker-compose.yml

@@ -14,7 +14,7 @@ services:
   web:
     image: zzbslayer/kokkoro_bot:latest
     ports:
-      - "5100:5001"
+      - "5560:5001"
     volumes:
       - ~/.kokkoro:/root/.kokkoro
     command: python3.8 -u /bot/run_web.py

docker-compose.yml

@@ -15,7 +15,7 @@ services:
   web:
     image: zzbslayer/kokkoro_bot:latest
     ports:
-      - "5100:5001"
+      - "5560:5001"
     volumes:
       - ./:/bot/
       - ~/.kokkoro:/root/.kokkoro

kokkoro/bot/discord/bot.py

@@ -55,7 +55,10 @@ async def kkr_send(self, ev: DiscordEvent, msg: SupportedMessageType, at_sender=
 
         channel = ev.get_channel()
         await self._send_by_channel(channel, msg, filename)
-
+
+    @overrides(KokkoroBot)
+    async def kkr_send_dm(self, ev: DiscordEvent, msg: SupportedMessageType)
+        await ev.get_author().get_raw_user().send(msg)
 
     @overrides(KokkoroBot)
     async def kkr_send_by_group(self, gid, msg: SupportedMessageType, tag=BroadcastTag.default, filename="image.png"):

kokkoro/bot/discord/discord_util.py

@@ -16,12 +16,12 @@ def remove_mention_me(raw_message) -> (str, bool):
 Pattern in official document is <@![a-z0-9A-Z]+>
 e.g. <@!12345>
 
-But the `at` sent by ios discord is <@[a-z0-9A-Z]>
+But the `at` sent by iOS discord is <@[a-z0-9A-Z]>
 e.g. <@12345>
 
 So temp solution is <@!?[a-z0-9A-Z]+>
 '''
-dc_at_pattern = r'<@!?[a-z0-9A-Z]+>' 
+dc_at_pattern = r'<@!?[a-z0-9A-Z]+>'
 def normalize_message(raw_message: str) -> str:
     """
     规范化 at 信息，"<@!123> waht<@!312>a12" => "@123 waht @312 a12"
@@ -33,7 +33,7 @@ def normalize_message(raw_message: str) -> str:
 
 def normalize_at(raw_at):
     """
-    规范化 at 信息，"<@!123>" => " @123 " 
+    规范化 at 信息，"<@!123>" => " @123 "
     ios: "<@123>" => " @123 "
     """
-    return f' @{raw_at[3:-1]} ' if '!' in raw_at else f' @{raw_at[2:-1]} '
+    return f' @{raw_at[3:-1]} ' if '!' in raw_at else f' @{raw_at[2:-1]} '

kokkoro/common_interface.py

@@ -98,6 +98,9 @@ def kkr_event_adaptor(self, raw_event) -> EventInterface:
     async def kkr_send(self, ev: EventInterface, msg: SupportedMessageType, at_sender=False, filename="image.png"):
         raise NotImplementedError
 
+    async def kkr_send_dm(self, ev: EventInterface, msg: SupportedMessageType):
+        raise NotImplementedError
+
     async def kkr_send_by_group(self, gid, msg: SupportedMessageType, tag):
         raise NotImplementedError
 
@@ -121,4 +124,4 @@ def get_groups(self) -> List[GroupInterface]:
         raise NotImplementedError
 
     def get_members_in_group(self, gid) -> List[UserInterface]:
-        raise NotImplementedError
+        raise NotImplementedError

kokkoro/config_example/__init__.py

@@ -4,6 +4,7 @@
 import matplotlib.font_manager as font_manager
 
 from .__bot__ import *
+from .__web__ import *
 
 for module in MODULES_ON:
     try:

kokkoro/config_example/__web__.py

@@ -0,0 +1,2 @@
+PUBLIC_ADDRESS="http://DOMAIN_OR_IP_ADDRESS:5560"
+PUBLIC_BASEPATH="/"

kokkoro/modules/pcrclanbattle/clanbattle/__init__.py

@@ -5,6 +5,7 @@
 from .argparse import ArgParser
 from .exception import *
 
+from kokkoro import config
 from kokkoro.typing import *
 from kokkoro.common_interface import KokkoroBot, EventInterface
 from kokkoro.service import Service
@@ -22,7 +23,7 @@ def cb_cmd(prefixes, parser:ArgParser) -> Callable:
     prefixes = cb_prefix(prefixes)
     if not isinstance(prefixes, Iterable):
         raise ValueError('`name` of cb_cmd must be `str` or `Iterable[str]`')
-    
+
     def deco(func):
         @wraps(func)
         async def wrapper(bot: KokkoroBot, ev: EventInterface):
@@ -43,7 +44,9 @@ async def wrapper(bot: KokkoroBot, ev: EventInterface):
     return deco
 
 
-from .cmdv2 import *
+from .cmd_battle import *
+if config.ENABLE_WEB:
+    from .cmd_web import *
 
 
 QUICK_START = f'''
@@ -105,4 +108,4 @@ async def cb_help(bot: KokkoroBot, ev:EventInterface):
     #                            content='命令一览表')
     # await session.send(msg)
 
-from . import report
+from . import report