From b4a0736f7bde2113c1acc6c0793a3d1672f73b98 Mon Sep 17 00:00:00 2001 From: Rylie Date: Sun, 5 Nov 2023 11:09:52 +0700 Subject: [PATCH 1/5] fix(docker): add pkg-config for docker build process --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 507f01f..3e1d02c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.9.15-slim-bullseye -RUN apt update && apt install default-libmysqlclient-dev build-essential libtk nodejs npm -y +RUN apt update && apt install default-libmysqlclient-dev build-essential libtk nodejs npm pkg-config -y WORKDIR /app COPY requirements.txt requirements.txt From 040742a9a4e00efa162f55450a370a79ece91d53 Mon Sep 17 00:00:00 2001 From: Rylie Date: Sun, 5 Nov 2023 11:10:01 +0700 Subject: [PATCH 2/5] fix(docker): rename `log` to `logs` for consistency --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3e1d02c..81252b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ COPY dbutils.py dbutils.py COPY read.py read.py ADD core core ADD titles titles -ADD log log +ADD logs logs ADD cert cert ENTRYPOINT [ "/app/entrypoint.sh" ] From 40e6c018e9d9d0971071d91199001b8943981666 Mon Sep 17 00:00:00 2001 From: Midorica Date: Mon, 6 Nov 2023 21:04:13 -0500 Subject: [PATCH 3/5] fixing again the render_POST for CXB --- titles/cxb/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/titles/cxb/index.py b/titles/cxb/index.py index 25a843e..1597335 100644 --- a/titles/cxb/index.py +++ b/titles/cxb/index.py @@ -103,7 +103,7 @@ class CxbServlet(resource.Resource): else: self.logger.info(f"Ready on port {self.game_cfg.server.port}") - def render_POST(self, request: Request, version: int, endpoint: str): + def render_POST(self, request: Request): version = 0 internal_ver = 0 func_to_find = "" From fbd12fd6e2e24f680d53d13691a0dcfa2e7dcc39 Mon Sep 17 00:00:00 2001 From: Midorica Date: Mon, 6 Nov 2023 21:54:06 -0500 Subject: [PATCH 4/5] fixing get_energy for CXB --- titles/cxb/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/titles/cxb/base.py b/titles/cxb/base.py index 3de83c7..9f74f5f 100644 --- a/titles/cxb/base.py +++ b/titles/cxb/base.py @@ -530,7 +530,6 @@ class CxbBase: profile = self.data.profile.get_profile_index(0, uid, self.version) data1 = profile["data"] p = self.data.item.get_energy(uid) - energy = p["energy"] if not p: self.data.item.put_energy(uid, 5) @@ -543,6 +542,7 @@ class CxbBase: } array = [] + energy = p["energy"] newenergy = int(energy) + 5 self.data.item.put_energy(uid, newenergy) From fbd1d7cb1ce4bddb0b13af47cae067b3b5a4d3c9 Mon Sep 17 00:00:00 2001 From: Midorica Date: Mon, 6 Nov 2023 23:35:02 -0500 Subject: [PATCH 5/5] fixing CXB render_POST --- titles/cxb/index.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/titles/cxb/index.py b/titles/cxb/index.py index 1597335..8a57f03 100644 --- a/titles/cxb/index.py +++ b/titles/cxb/index.py @@ -111,7 +111,10 @@ class CxbServlet(resource.Resource): subcmd = "" req_url = request.uri.decode() url_split = req_url.split("/") - req_bytes = request.content.getvalue() + try: + req_bytes = request.content.getvalue() + except: + req_bytes = request.content.read().decode("utf-8") try: req_json: Dict = json.loads(req_bytes)