v2 (#138)

* core changes * fixed upload bugs * fixed #17 * added new api-less google image search (.gimg)
code-rgb · Feb 14, 2021 · cbda56f · cbda56f
1 parent 47dcde6
commit cbda56f
Show file tree

Hide file tree

Showing 62 changed files with 479 additions and 214 deletions.
diff --git a/config.env.sample b/config.env.sample
@@ -1,32 +1,36 @@
-
-
 # Remove this line first before doing anything else
+
 _____REMOVE_____THIS_____LINE_____=true
 
 
-# >----------- REQUIRED ----------< #
+
+# ---------------「 REQUIRED 」--------------- #
 
 
 # Get them from https://my.telegram.org/
 API_ID=""
 API_HASH=""
 
 
-# Mongodb url from https://cloud.mongodb.com/, guide: https://del.dog/mongodb_guide
+# Mongodb url from https://cloud.mongodb.com/
+# guide: https://del.dog/mongodb_guide
 DATABASE_URL=""
 
 
-# [ Private Telegram Log Channel ID ], Note: Also add your Bot to LOG CHANNEL (for BOT or DUAL)
+# [ Private Telegram Log Channel ID ]
+# Note: Also add your Bot to LOG CHANNEL (for BOT or DUAL)
 LOG_CHANNEL_ID=""
 
 
-# [------- USERGE-X MODES -------] #
+# ════════════「 USERGE-X MODES 」════════════ #
+
 # Fill Vars for the mode you want [ USER ], [ BOT ] 
 # or [ DUAL MODE ] (Both)
 
 
 # 1. USER MODE
-# get this using [ https://repl.it/@Leorio/stringsessiongen or bash genStr ]
+# get this using 
+# [ https://repl.it/@Leorio/stringsessiongen or bash genStr ]
 HU_STRING_SESSION=""
 
 
@@ -38,13 +42,11 @@ OWNER_ID=""  # your user_id(s)
 
 # 3. DUAL MODE
 # Both BOT and USER Sessions are Required for DUAL MODE
-# [------------------------------] #
 
 
-# >------------------------------< #
 
 
-# ----------- OPTIONAL ----------- #
+# -----------「 OPTIONAL 」----------- #
 
 
 # Set false if your don't like to use extra plugins
@@ -175,6 +177,4 @@ HEROKU_API_KEY=""
 
 
 # given app name to the heroku app
-HEROKU_APP_NAME=""
-
-
+HEROKU_APP_NAME=""
diff --git a/init/checks.sh b/init/checks.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 
@@ -70,8 +70,9 @@ _checkDefaultVars() {
         WORKERS=32
     fi
     export MOTOR_MAX_WORKERS=$WORKERS
+    export HEROKU_ENV=$(test $DYNO && echo 1 || echo 0)
     DOWN_PATH=${DOWN_PATH%/}/
-    if [[ -n $HEROKU_API_KEY && -n $HEROKU_APP_NAME ]]; then
+    if [[ $HEROKU_ENV == 1 && -n $HEROKU_API_KEY && -n $HEROKU_APP_NAME ]]; then
         local herokuErr=$(runPythonCode '
 import heroku3
 try:

diff --git a/init/init.sh b/init/init.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 
@@ -14,6 +14,7 @@
 
 trap handleSigTerm TERM
 trap handleSigInt INT
+trap 'echo hi' USR1
 
 initUserge() {
     printLogo
@@ -32,7 +33,6 @@ startUserge() {
 stopUserge() {
     sendMessage "Exiting USERGE-X ..."
     endLogBotPolling
-    exit 0
 }
 
 handleSigTerm() {
@@ -50,5 +50,7 @@ handleSigInt() {
 runUserge() {
     initUserge
     startUserge "$@"
+    local code=$?
     stopUserge
+    return $code
 }
diff --git a/init/logbot/core/api.sh b/init/logbot/core/api.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 

diff --git a/init/logbot/core/core.sh b/init/logbot/core/core.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 

diff --git a/init/logbot/core/methods/apiMethods.sh b/init/logbot/core/methods/apiMethods.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 

diff --git a/init/logbot/core/methods/methods.sh b/init/logbot/core/methods/methods.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 

diff --git a/init/logbot/core/methods/rawMethods.sh b/init/logbot/core/methods/rawMethods.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 

diff --git a/init/logbot/core/types/message.sh b/init/logbot/core/types/message.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 

diff --git a/init/logbot/core/types/messageClass.sh b/init/logbot/core/types/messageClass.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 

diff --git a/init/logbot/core/types/types.sh b/init/logbot/core/types/types.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 

diff --git a/init/logbot/core/utils.sh b/init/logbot/core/utils.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 

diff --git a/init/logbot/logbot.sh b/init/logbot/logbot.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 

diff --git a/init/logbot/methods/basic.sh b/init/logbot/methods/basic.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 

diff --git a/init/logbot/methods/methods.sh b/init/logbot/methods/methods.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 

diff --git a/init/logbot/methods/polling.sh b/init/logbot/methods/polling.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 
@@ -17,6 +17,7 @@ startLogBotPolling() {
 
 endLogBotPolling() {
     test -z $BOT_TOKEN || echo quit >> $_input
+    wait
 }
 
 _polling() {

diff --git a/init/utils.sh b/init/utils.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 
@@ -20,8 +20,8 @@ getPythonVersion() {
         count+=1
         [[ $count -gt $maxPVer ]] && break
     done
-    declare -gr pVer=$(sed -E 's/Python (3\.[0-9]{1,2}\.[0-9]{1,2}).*/\1/g' <<< \
-        "$(python3.$count -V 2> /dev/null)")
+    local ptn='s/Python (3\.[0-9]{1,2}\.[0-9]{1,2}).*/\1/g'
+    declare -gr pVer=$(sed -E "$ptn" <<< "$(python3.$count -V 2> /dev/null)")
 }
 
 log() {

diff --git a/requirements.txt b/requirements.txt
@@ -43,3 +43,4 @@ ruamel.yaml==0.16.12
 pymediainfo>=5.0.3
 ujson>=4.0.1
 youtube-search-python==1.4.0
+git+https://github.com/code-rgb/google-images-download.git
diff --git a/run b/run
@@ -1,13 +1,44 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
+# Copyright (C) 2020-2021 by UsergeTeam@Github, < https://github.com/UsergeTeam >.
 #
 # This file is part of < https://github.com/UsergeTeam/Userge > project,
 # and is released under the "GNU v3.0 License Agreement".
-# Please see < https://github.com/uaudith/Userge/blob/master/LICENSE >
+# Please see < https://github.com/UsergeTeam/Userge/blob/master/LICENSE >
 #
 # All rights reserved.
 
-. init/init.sh
+trap joinProc INT TERM
 
-runUserge "$@"
+declare -i bgProc
+declare -ir usr1=138
+declare -r cmd='. init/init.sh; runUserge "$@"'
+
+setProc() {
+    bgProc=$1
+}
+
+waitProc() {
+    wait $bgProc
+}
+
+killProc() {
+    kill $bgProc &> /dev/null
+}
+
+joinProc() {
+    if test $bgProc; then
+        killProc
+        waitProc
+    fi
+}
+
+run() {
+    joinProc
+    bash -c "$cmd" $0 "$@" &
+    setProc $!
+    waitProc
+    test $? -eq $usr1 && run "$@"
+}
+
+run "$@"
diff --git a/runtime.txt b/runtime.txt
@@ -1 +1 @@
-python-3.8.7
+python-3.9.1