diff --git a/modules/support.py b/modules/support.py index 3fd4257..9c5c5d6 100644 --- a/modules/support.py +++ b/modules/support.py @@ -59,26 +59,26 @@ async def version(client: Client, message: Message): await message.delete() - remote_url = list(gitrepo.remote().urls)[0] - commit_time = ( - datetime.datetime.fromtimestamp(gitrepo.head.commit.committed_date) - .astimezone(datetime.timezone.utc) - .strftime("%Y-%m-%d %H:%M:%S %Z") - ) + if gitrepo is not None: + remote_url = list(gitrepo.remote().urls)[0] + commit_time = ( + datetime.datetime.fromtimestamp(gitrepo.head.commit.committed_date) + .astimezone(datetime.timezone.utc) + .strftime("%Y-%m-%d %H:%M:%S %Z") + ) + git_info = ( + f"\nBranch: {gitrepo.active_branch}\n" + if gitrepo.active_branch != "master" else "\n" + ) + f"Commit: " f"{gitrepo.head.commit.hexsha[:7]} by {gitrepo.head.commit.author.name}\n" f"Commit time: {commit_time}" + else: + git_info = "" await message.reply( f"Moon Userbot version: {userbot_version}\n" f"Changelog in channel.\n" f"Changelog written by " f"Abhi\n\n" - + ( - f"Branch: {gitrepo.active_branch}\n" - if gitrepo.active_branch != "master" - else "" - ) - + f"Commit: " - f"{gitrepo.head.commit.hexsha[:7]} by {gitrepo.head.commit.author.name}\n" - f"Commit time: {commit_time}", + f"{git_info}", ) diff --git a/utils/misc.py b/utils/misc.py index 2800ccf..4b86d03 100644 --- a/utils/misc.py +++ b/utils/misc.py @@ -1,19 +1,3 @@ -# Moon-Userbot - telegram userbot -# Copyright (C) 2020-present Moon Userbot Organization -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - from sys import version_info from .db import db import git @@ -37,19 +21,11 @@ prefix = db.get("core.main", "prefix", ".") try: gitrepo = git.Repo(".") -except git.exc.InvalidGitRepositoryError: - repo = git.Repo.init() - origin = repo.create_remote( - "origin", "https://github.com/The-MoonTg-project/Moon-Userbot" - ) - origin.fetch() - repo.create_head("main", origin.refs.main) - repo.heads.main.set_tracking_branch(origin.refs.main) - repo.heads.main.checkout(True) - gitrepo = git.Repo(".") +except (git.exc.InvalidGitRepositoryError, git.exc.NoSuchPathError): + gitrepo = None -if len(gitrepo.tags) > 0: +if gitrepo is not None and len(gitrepo.tags) > 0: commits_since_tag = list(gitrepo.iter_commits(f"{gitrepo.tags[-1].name}..HEAD")) + userbot_version = f"2.5.{len(commits_since_tag)}" else: - commits_since_tag = [] -userbot_version = f"2.5.{len(commits_since_tag)}" + userbot_version = "2.5.0"