Master

.github/pull.yml

@@ -0,0 +1,12 @@
+version: "1"
+rules:
+  - base: alpha
+    upstream: UsergeTeam:alpha
+    mergeMethod: rebase
+    mergeUnstable: false
+  - base: beta
+    upstream: UsergeTeam:beta
+    mergeMethod: rebase
+  - base: master
+    upstream: UsergeTeam:master
+    mergeMethod: rebase

README.md

@@ -20,7 +20,7 @@
 
 # Userge 🔥
 
-[![Build Status](https://travis-ci.com/UsergeTeam/Userge.svg?branch=dev)](https://travis-ci.com/UsergeTeam/Userge) [![DeepSource](https://static.deepsource.io/deepsource-badge-light-mini.svg)](https://deepsource.io/gh/UsergeTeam/Userge/?ref=repository-badge)
+[![Build Status](https://travis-ci.com/UsergeTeam/Userge.svg?branch=dev)](https://travis-ci.com/UsergeTeam/Userge) ![Python Version](https://img.shields.io/badge/python-3.7/3.8-lightgrey) ![Release](https://img.shields.io/github/v/release/UsergeTeam/Userge) ![Stars](https://img.shields.io/github/stars/UsergeTeam/Userge) ![Forks](https://img.shields.io/github/forks/UsergeTeam/Userge) ![Issues Open](https://img.shields.io/github/issues/UsergeTeam/Userge) ![Issues Closed](https://img.shields.io/github/issues-closed/UsergeTeam/Userge) ![PR Open](https://img.shields.io/github/issues-pr/UsergeTeam/Userge) ![PR Closed](https://img.shields.io/github/issues-pr-closed/UsergeTeam/Userge) ![Contributors](https://img.shields.io/github/contributors/UsergeTeam/Userge) ![Repo Size](https://img.shields.io/github/repo-size/UsergeTeam/Userge) ![License](https://img.shields.io/github/license/UsergeTeam/Userge) ![Commit Activity](https://img.shields.io/github/commit-activity/m/UsergeTeam/Userge) [![Plugins Repo!](https://img.shields.io/badge/Plugins%20Repo-!-orange)](https://github.com/UsergeTeam/Userge-Plugins) [![Join Channel!](https://img.shields.io/badge/Join%20Channel-!-red)](https://t.me/theUserge) [![DeepSource](https://static.deepsource.io/deepsource-badge-light-mini.svg)](https://deepsource.io/gh/UsergeTeam/Userge/?ref=repository-badge)
 
 > **Userge** is a Powerful , _Pluggable_ Telegram UserBot written in _Python_ using [Pyrogram](https://github.com/pyrogram/pyrogram).
 
@@ -125,7 +125,7 @@ async def testing(message: Message):
 
 ### Video Tutorial 🎥
 
-  [![Tutorial](resources/tutorial.jpg)](https://youtu.be/-XJj686zeiY "Tutorial")
+  [![Tutorial](resources/tutorial.jpg)](https://youtu.be/M4T_BJvFqkc "Tutorial")
 
 ### Support & Discussions 👥
 

app.json

@@ -22,6 +22,18 @@
             "description": "Get it by running `bash genStr` command or ignore this",
             "required": false
         },
+        "BOT_TOKEN": {
+            "description": "Get this from https://t.me/botfather if you like to use userge as a bot",
+            "required": false
+        },
+        "OWNER_ID": {
+            "description": "Your user_id if you are gonna use userge as a bot",
+            "required": false
+        },
+        "WORKERS": {
+            "description": "Userbot Workers Count : Default = 4",
+            "required": false
+        },
         "DATABASE_URL": {
             "description": "Mongodb url from https://cloud.mongodb.com/"
         },
@@ -35,6 +47,13 @@
             "description": "Set True if it is TeamDrive",
             "value": "True"
         },
+        "LOG_CHANNEL_ID": {
+            "description": "Telegram Log Channel ID"
+        },
+        "G_DRIVE_INDEX_LINK": {
+            "description": "Index link for gdrive",
+            "required": false
+        },
         "LOAD_UNOFFICIAL_PLUGINS": {
             "description": "Set True if your like to use unofficial plugins",
             "required": false
@@ -79,10 +98,6 @@
             "description": "GDrive Folder ID",
             "required": false
         },
-        "LOG_CHANNEL_ID": {
-            "description": "Telegram Log Channel ID",
-            "required": false
-        },
         "HEROKU_APP_NAME": {
             "description": "given app name to the heroku app",
             "required": false

config.env.sample

@@ -33,13 +33,33 @@ G_DRIVE_CLIENT_SECRET = ""
 G_DRIVE_IS_TD = False
 
 
+# Telegram Log Channel ID
+LOG_CHANNEL_ID = ""
+
+
 # Set True if your like to use unofficial plugins
 LOAD_UNOFFICIAL_PLUGINS = False
 
 
 # ----------- OPTIONAL ----------- #
 
 
+# Get this from https://t.me/botfather if you like to use userge as a bot
+BOT_TOKEN = ""
+
+
+# Your user_id if you are gonna use userge as a bot
+OWNER_ID = ""
+
+
+# Userbot Workers Count : Default = 4
+WORKERS = 4
+
+
+# Index link for gdrive
+G_DRIVE_INDEX_LINK = ""
+
+
 # Set name to your working directory
 DOWN_PATH = "downloads/"
 
@@ -80,10 +100,6 @@ REMOVE_BG_API_KEY = ""
 G_DRIVE_PARENT_ID = ""
 
 
-# Telegram Log Channel ID
-LOG_CHANNEL_ID = ""
-
-
 # set command prefix
 CMD_TRIGGER = "."
 

genStrSession.py

@@ -1,3 +1,5 @@
+# pylint: disable=invalid-name, missing-module-docstring
+#
 # Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
@@ -16,7 +18,7 @@
     load_dotenv("config.env")
 
 
-async def genStrSession() -> None:
+async def genStrSession() -> None:  # pylint: disable=missing-function-docstring
     async with Client(
             "Userge",
             api_id=int(os.environ.get("API_ID") or input("Enter Telegram APP ID: ")),

requirements.txt

@@ -15,7 +15,7 @@ heroku3
 motor
 nest_asyncio
 oauth2client
-Pillow
+Pillow==6.2.2
 psutil
 pybase64
 pySmartDL
@@ -24,11 +24,12 @@ pytz
 rarfile
 removebg
 requests
-search-engine-parser
+search-engine-parser==0.5.4
 selenium==3.141.0
 setuptools>=40.3.0
 spamwatch
 speedtest-cli
+stagger
 telegraph
 tgcrypto
 urbandict==0.5

test.py

@@ -1,3 +1,5 @@
+# pylint: disable=missing-module-docstring
+#
 # Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
@@ -7,36 +9,14 @@
 # All rights reserved.
 
 import os
-import asyncio
+
 from userge import userge
 
 
-async def worker() -> None:
+async def worker() -> None:  # pylint: disable=missing-function-docstring
     chat_id = int(os.environ.get("CHAT_ID") or 0)
     await userge.send_message(chat_id, 'testing_userge')
-    print('sleeping 3 sec...!')
-    await asyncio.sleep(3)
-
-
-async def main() -> None:
-    print('starting client...!')
-    await userge.start()
-    tasks = []
-    print('adding tasks...!')
-    for task in userge._tasks:
-        tasks.append(loop.create_task(task()))
-    print('stating worker...!')
-    await worker()
-    print('closing tasks...!')
-    for task in tasks:
-        task.cancel()
-    print('stopping client...!')
-    await userge.stop()
-
-loop = asyncio.get_event_loop()
-print('creating loop...!')
-loop.run_until_complete(main())
-print('closing loop...!')
-loop.close()
 
-print('userge test has been finished!')
+if __name__ == "__main__":
+    userge.begin(worker())
+    print('userge test has been finished!')

userge/__init__.py

@@ -1,3 +1,5 @@
+# pylint: disable=missing-module-docstring
+#
 # Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
@@ -6,9 +8,9 @@
 #
 # All rights reserved.
 
-from userge.logger import logging
-from userge.config import Config
-from userge.core import (
+from userge.logger import logging  # noqa
+from userge.config import Config, get_version  # noqa
+from userge.core import (  # noqa
     Userge, Filters, Message, get_collection, pool)
 
 userge = Userge()  # userge is the client name

userge/__main__.py

@@ -1,3 +1,5 @@
+# pylint: disable=missing-module-docstring
+#
 # Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,

userge/config.py

@@ -1,3 +1,5 @@
+# pylint: disable=missing-module-docstring
+#
 # Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
@@ -15,16 +17,18 @@
 
 import heroku3
 from git import Repo
+from git.exc import InvalidGitRepositoryError, GitCommandError
 from pySmartDL import SmartDL
 from dotenv import load_dotenv
 from pyrogram import Filters
 
 from userge import logging
+from . import versions
 
 _LOG = logging.getLogger(__name__)
 
 if sys.version_info[0] < 3 or sys.version_info[1] < 7:
-    _LOG.info("You MUST have a python version of at least 3.7 !")
+    _LOG.error("You MUST have a python version of at least 3.7 !")
     sys.exit()
 
 _CONFIG_FILE = "config.env"
@@ -39,12 +43,15 @@
 
 
 class Config:
-    """Configs to setup Userge"""
+    """ Configs to setup Userge """
     API_ID = int(os.environ.get("API_ID", 12345))
     API_HASH = os.environ.get("API_HASH", None)
-    ANTISPAM_SENTRY = bool(os.environ.get("ANTISPAM_SENTRY", False))
+    WORKERS = int(os.environ.get("WORKERS", 4))
+    ANTISPAM_SENTRY = os.environ.get("ANTISPAM_SENTRY", "").lower() == "true"
     HU_STRING_SESSION = os.environ.get("HU_STRING_SESSION", None)
-    DB_URI = os.environ.get("DATABASE_URL", None)
+    BOT_TOKEN = os.environ.get("BOT_TOKEN", None)
+    OWNER_ID = int(os.environ.get("OWNER_ID", 0))
+    DB_URI = os.environ.get("DATABASE_URL", '')
     LANG = os.environ.get("PREFERRED_LANGUAGE", "en")
     DOWN_PATH = os.environ.get("DOWN_PATH", "downloads").rstrip('/') + '/'
     SCREENSHOT_API = os.environ.get("SCREENSHOT_API", None)
@@ -58,14 +65,15 @@ class Config:
     G_DRIVE_CLIENT_ID = os.environ.get("G_DRIVE_CLIENT_ID", None)
     G_DRIVE_CLIENT_SECRET = os.environ.get("G_DRIVE_CLIENT_SECRET", None)
     G_DRIVE_PARENT_ID = os.environ.get("G_DRIVE_PARENT_ID", None)
-    G_DRIVE_IS_TD = bool(os.environ.get("G_DRIVE_IS_TD", False))
+    G_DRIVE_IS_TD = os.environ.get("G_DRIVE_IS_TD", "").lower() == "true"
+    G_DRIVE_INDEX_LINK = os.environ.get("G_DRIVE_INDEX_LINK", None)
     GOOGLE_CHROME_DRIVER = os.environ.get("GOOGLE_CHROME_DRIVER", None)
     GOOGLE_CHROME_BIN = os.environ.get("GOOGLE_CHROME_BIN", None)
     LOG_CHANNEL_ID = int(os.environ.get("LOG_CHANNEL_ID", 0))
     UPSTREAM_REPO = os.environ.get("UPSTREAM_REPO", "https://github.com/UsergeTeam/Userge")
     HEROKU_API_KEY = os.environ.get("HEROKU_API_KEY", None)
     HEROKU_APP_NAME = os.environ.get("HEROKU_APP_NAME", None)
-    LOAD_UNOFFICIAL_PLUGINS = bool(os.environ.get("LOAD_UNOFFICIAL_PLUGINS", False))
+    LOAD_UNOFFICIAL_PLUGINS = os.environ.get("LOAD_UNOFFICIAL_PLUGINS", "").lower() == "true"
     CMD_TRIGGER = os.environ.get("CMD_TRIGGER", '.')
     SUDO_TRIGGER = os.environ.get("SUDO_TRIGGER", '!')
     FINISHED_PROGRESS_STR = os.environ.get("FINISHED_PROGRESS_STR", '█')
@@ -76,12 +84,19 @@ class Config:
     WELCOME_DELETE_TIMEOUT = 120
     AUTOPIC_TIMEOUT = 300
     ALLOWED_CHATS = Filters.chat([])
+    ALLOW_ALL_PMS = True
+    USE_USER_FOR_CLIENT_CHECKS = False
     SUDO_USERS: Set[int] = set()
     ALLOWED_COMMANDS: Set[str] = set()
+    UPSTREAM_REMOTE = 'upstream'
     HEROKU_APP = None
     HEROKU_GIT_URL = None
 
 
+if not Config.LOG_CHANNEL_ID:
+    _LOG.error("Need LOG_CHANNEL_ID !, Exiting ...")
+    sys.exit()
+
 if Config.SUDO_TRIGGER == Config.CMD_TRIGGER:
     _LOG.info("Invalid SUDO_TRIGGER!, You can't use `%s` as SUDO_TRIGGER", Config.CMD_TRIGGER)
     sys.exit()
@@ -107,6 +122,19 @@ class Config:
                 shutil.rmtree(tmp_heroku_git_path)
             break
 
+_LOG.info("Checking REPO...")
+try:
+    _REPO = Repo()
+except InvalidGitRepositoryError:
+    _REPO = Repo.init()
+if Config.UPSTREAM_REMOTE not in _REPO.remotes:
+    _REPO.create_remote(Config.UPSTREAM_REMOTE, Config.UPSTREAM_REPO)
+try:
+    _REPO.remote(Config.UPSTREAM_REMOTE).fetch()
+except GitCommandError as error:
+    _LOG.error(error)
+    sys.exit()
+
 if not os.path.exists('bin'):
     _LOG.info("Creating BIN...")
     os.mkdir('bin')
@@ -126,11 +154,23 @@ class Config:
 
 if Config.LOAD_UNOFFICIAL_PLUGINS:
     _LOG.info("Loading UnOfficial Plugins...")
-    os.system("git clone --depth=1 https://github.com/UsergeTeam/Userge-Plugins.git")
-    os.system("pip3 install -U pip")
-    os.system("pip3 install -r Userge-Plugins/requirements.txt")
-    os.system("rm -rf userge/plugins/unof_plugins/")
-    os.system("mv Userge-Plugins/plugins/ userge/plugins/unof_plugins/")
-    os.system("cp -r Userge-Plugins/resources/* resources/")
-    os.system("rm -rf Userge-Plugins/")
+    _CMDS = ["git clone --depth=1 https://github.com/UsergeTeam/Userge-Plugins.git",
+             "pip3 install -U pip",
+             "pip3 install -r Userge-Plugins/requirements.txt",
+             "rm -rf userge/plugins/unofficial/",
+             "mv Userge-Plugins/plugins/ userge/plugins/unofficial/",
+             "cp -r Userge-Plugins/resources/* resources/",
+             "rm -rf Userge-Plugins/"]
+    os.system(" && ".join(_CMDS))  # nosec
     _LOG.info("UnOfficial Plugins Loaded Successfully!")
+
+
+def get_version() -> str:
+    """ get userge version """
+    ver = f"{versions.__major__}.{versions.__minor__}.{versions.__micro__}"
+    diff = list(_REPO.iter_commits(f'{Config.UPSTREAM_REMOTE}/master..HEAD'))
+    if diff:
+        if "/usergeteam/userge" in Config.UPSTREAM_REPO.lower():
+            return f"{ver}-beta.{len(diff)}"
+        return f"{ver}-custom.{len(diff)}"
+    return ver

userge/core/__init__.py

@@ -1,3 +1,5 @@
+# pylint: disable=missing-module-docstring
+#
 # Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
@@ -6,9 +8,9 @@
 #
 # All rights reserved.
 
-from pyrogram import Filters
+from pyrogram import Filters  # noqa
 
-from .database import get_collection
-from .ext import pool
-from .client import Userge
-from .methods import Message
+from .database import get_collection  # noqa
+from .types.bound import Message  # noqa
+from .ext import pool  # noqa
+from .client import Userge  # noqa