8 files changed, 41 insertions, 16 deletions

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..8a229dd
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+.venv/
+*.db
+*.ini
diff --git a/Dockerfile b/Dockerfile
index 2d13273..6e97ed6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1 +1,10 @@
-FROM python:3
+FROM python:3.10
+
+WORKDIR /usr/src/app
+
+COPY requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+CMD [ "python", "./bot.py" ]
diff --git a/bot.py b/bot.py
index 1d59f9e..b44f9df 100644
--- a/bot.py
+++ b/bot.py
@@ -229,7 +229,7 @@ async def main() -> None:
             app=starlette_app,
             port=BOT_PORT,
             use_colors=False,
-            host="100.93.242.2",
+            host="0.0.0.0",
         )
     )
 
diff --git a/config.ini.example b/config.ini.example
index e3a9121..d52a4d1 100644
--- a/config.ini.example
+++ b/config.ini.example
@@ -2,3 +2,10 @@
 BOT_TOKEN =
 FOURSQUARE_API_KEY =
 ENCRYPT_KEY =
+
+[API]
+TELEGRAM_WEBHOOK_URL = "/checkinbot/webhook"
+HEALTHCHECK_URL = "/checkinbot/healthcheck"
+FEDI_LOGIN_CALLBACK_URL = "/checkinbot/fedi_login_callback"
+BOT_DOMAIN = "https://"
+BOT_PORT = 8080
diff --git a/config.py b/config.py
index 0fae9b1..fe69bd9 100644
--- a/config.py
+++ b/config.py
@@ -10,6 +10,12 @@ BOT_TOKEN = config["DEFAULT"]["BOT_TOKEN"]
 FSQ_API_KEY = config["DEFAULT"]["FOURSQUARE_API_KEY"]
 ENCRYPT_KEY = config["DEFAULT"]["ENCRYPT_KEY"]
 
+TELEGRAM_WEBHOOK_URL = config["API"]["TELEGRAM_WEBHOOK_URL"]
+HEALTHCHECK_URL = config["API"]["HEALTHCHECK_URL"]
+FEDI_LOGIN_CALLBACK_URL = config["API"]["FEDI_LOGIN_CALLBACK_URL"]
+BOT_DOMAIN = config["API"]["BOT_DOMAIN"]
+BOT_PORT = int(config["API"]["BOT_PORT"])
+
 MEDIA_GROUP_TIMEOUT = 3
 
 FEDI_LOGIN, WAIT_VISIBILITY, WAIT_LOCATION, LOCATION_SEARCH_KEYWORD, LOCATION_CONFIRMATION, ADD_MEDIA, ADD_COMMENT = range(7)
@@ -41,9 +47,4 @@ class MsgDict(TypedDict):
 KEY_TOOT_STATUS_ID = "toot_status_id"
 KEY_TOOT_STATUS_CONTENT = "toot_status_content"
 
-TELEGRAM_WEBHOOK_URL = "/checkinbot/webhook"
-HEALTHCHECK_URL = "/checkinbot/healthcheck"
-FEDI_LOGIN_CALLBACK_URL = "/checkinbot/fedi_login_callback"
-BOT_DOMAIN = "https://zjw.social"
-BOT_PORT = 30010
 BOT_SCOPE = ['read:accounts', 'write:media', 'write:statuses']
diff --git a/contrib/docker-compose.yaml b/contrib/docker-compose.yaml
new file mode 100644
index 0000000..7ba8c2d
--- /dev/null
+++ b/contrib/docker-compose.yaml
@@ -0,0 +1,13 @@
+version: '3'
+services:
+  checkin.bot:
+    image: "clarkzjw/checkin.bot:latest"
+    restart: always
+    volumes:
+      - "./config.ini:/usr/src/app/config.ini"
+      - sqlite3:/usr/src/app/database/
+    ports:
+      - "8080:8080"
+
+volumes:
+    sqlite3:
diff --git a/dbstore/peewee_store.py b/dbstore/peewee_store.py
index c8d9c22..d05c642 100644
--- a/dbstore/peewee_store.py
+++ b/dbstore/peewee_store.py
@@ -5,7 +5,7 @@ TOOT_VISIBILITY_UNLISTED = "unlisted"
 TOOT_VISIBILITY_PRIVATE = "private"
 
 
-db = SqliteDatabase("checkinbot.db")
+db = SqliteDatabase("database/checkinbot.db")
 db.connect(reuse_if_open=True)
 
 
diff --git a/requirements.txt b/requirements.txt
index d1e0036..39887b9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,10 @@
 anyio==3.6.2
 APScheduler==3.10.0
-asgiref==3.6.0
 blurhash==1.1.4
 certifi==2022.12.7
 cffi==1.15.1
 charset-normalizer==3.0.1
 click==8.1.3
-crypto==1.4.1
 cryptography==39.0.1
 decorator==5.1.1
 greenlet==2.0.2
@@ -18,24 +16,18 @@ httpx==0.23.3
 hyperframe==6.0.1
 idna==3.4
 Mastodon.py @ git+https://cgit.jinwei.me/clarkzjw/mastodon.py@503d58d226c52901532067d3dcb5a7814699f7fb
-Naked==0.1.32
 peewee==3.15.4
-Pillow==9.4.0
 pycparser==2.21
-pycrypto==2.6.1
 python-dateutil==2.8.2
 python-magic==0.4.27
 python-telegram-bot==20.1
 pytz==2022.7.1
 pytz-deprecation-shim==0.1.0.post0
-PyYAML==6.0
 requests==2.28.2
 rfc3986==1.5.0
-shellescape==3.8.1
 six==1.16.0
 sniffio==1.3.0
 SQLAlchemy==2.0.4
-sqlparse==0.4.3
 starlette==0.25.0
 typing_extensions==4.5.0
 tzdata==2022.7