From 7fc22fcbbc51a4a7e5ae45ff30b95ba27cf67b79 Mon Sep 17 00:00:00 2001
From: omg-xtao <100690902+omg-xtao@users.noreply.github.com>
Date: Sat, 5 Aug 2023 11:20:18 +0800
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Move=20core=20to=20git=20s?=
 =?UTF-8?q?ubmodule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitmodules      |  4 ++++
 Dockerfile       |  2 +-
 gram_core        |  1 +
 poetry.lock      | 17 +----------------
 pyproject.toml   |  1 -
 requirements.txt |  1 -
 6 files changed, 7 insertions(+), 19 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 gram_core

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..b67cba9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "gram_core"]
+	path = gram_core
+	url = https://github.com/PaiGramTeam/GramCore.git
+	branch = v4
diff --git a/Dockerfile b/Dockerfile
index 94a7616..5965f67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN echo "deb http://ftp.us.debian.org/debian buster main non-free" >> /etc/apt/
     && apt update                                  \
     # clone
     && apt install git wget curl ffmpeg -y                \
-    && git clone -b main https://github.com/PaiGramTeam/PaiGram.git /app \
+    && git clone -b main --recursive https://github.com/PaiGramTeam/PamGram.git /app \
     # install dependencies \
     && pip install virtualenv==20.19.0 poetry==1.3.2  \
     && python3 -m virtualenv venv/                 \
diff --git a/gram_core b/gram_core
new file mode 160000
index 0000000..b540527
--- /dev/null
+++ b/gram_core
@@ -0,0 +1 @@
+Subproject commit b540527c68470f93a373c9750b9cd0b49a939e10
diff --git a/poetry.lock b/poetry.lock
index d291f14..af5f9cf 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -606,21 +606,6 @@ files = [
 [package.dependencies]
 gitdb = ">=4.0.1,<5"
 
-[[package]]
-name = "gram-core"
-version = "0.1.0"
-description = "telegram robot base core."
-optional = false
-python-versions = ">=3.8"
-files = []
-develop = false
-
-[package.source]
-type = "git"
-url = "https://github.com/PaiGramTeam/GramCore.git"
-reference = "HEAD"
-resolved_reference = "7fb5d4c0e01731e6901829fe317be19023c2c4c7"
-
 [[package]]
 name = "greenlet"
 version = "1.1.3"
@@ -2331,4 +2316,4 @@ test = ["flaky", "pytest", "pytest-asyncio"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8"
-content-hash = "847b0e55ac501bd6126b5370fc08c018401147d8dd5c68c3216833b64b1213ea"
+content-hash = "8378e2149d042db3c75d422e969b658c255654e517c32bdb60b6dafef01e071e"
diff --git a/pyproject.toml b/pyproject.toml
index c1ecfd3..e8b2e51 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,7 +44,6 @@ pillow = "^10.0.0"
 playwright = "^1.27.1"
 aiosqlite = { extras = ["sqlite"], version = "^0.19.0" }
 simnet = { git = "https://github.com/PaiGramTeam/SIMNet" }
-gram-core = {git = "https://github.com/PaiGramTeam/GramCore.git"}
 
 [tool.poetry.extras]
 pyro = ["Pyrogram", "TgCrypto"]
diff --git a/requirements.txt b/requirements.txt
index c4835be..d7d0d6d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,7 +26,6 @@ fastapi==0.99.1 ; python_version >= "3.8" and python_version < "4.0"
 flaky==3.7.0 ; python_version >= "3.8" and python_version < "4.0"
 gitdb==4.0.10 ; python_version >= "3.8" and python_version < "4.0"
 gitpython==3.1.32 ; python_version >= "3.8" and python_version < "4.0"
-gram-core @ git+https://github.com/PaiGramTeam/GramCore.git@main ; python_version >= "3.8" and python_version < "4.0"
 greenlet==1.1.3 ; python_version >= "3.8" and python_version < "4.0"
 h11==0.14.0 ; python_version >= "3.8" and python_version < "4.0"
 httpcore==0.17.3 ; python_version >= "3.8" and python_version < "4.0"