[pull] contributor-branch/pokurt-pr-1 from master

.circleci/config.yml

@@ -7,4 +7,4 @@ jobs:
      # build the application image
      - run: docker build -t nana/bot:v1.0 .
     #   # run the docker image
-    #  - run: docker run -e ENV=Yes -e TEST_DEVELOP=True -e api_id=$api_id -e api_hash=$api_hash -e DB_URI=$DB_URI -e ASSISTANT_BOT_TOKEN=$ASSISTANT_BOT_TOKEN -e AdminSettings=$AdminSettings -e USERBOT_SESSION=$USERBOT_SESSION -e ASSISTANT_SESSION=$ASSISTANT_SESSION nana/bot:v1.0
+    #  - run: docker run -e ENV=Yes -e TEST_DEVELOP=True -e api_id=$api_id -e api_hash=$api_hash -e DB_URI=$DB_URI -e ASSISTANT_BOT_TOKEN=$ASSISTANT_BOT_TOKEN -e AdminSettings=$AdminSettings -e USERBOT_SESSION=$USERBOT_SESSION -e ASSISTANT_SESSION=$ASSISTANT_SESSION nana/bot:v1.0

.cirrus.yml

@@ -1,22 +1,47 @@
 docker_builder:
   name: Build and push Docker image to Docker Hub
   timeout_in: 95m
+  # If you forked the repo and want to use Cirrus CI to build and push image to Docker Hub,
+  # change "MadeByThePinsHub" below into your personal account username or your GitHub org username.
   only_if: $CIRRUS_BRANCH == "master" && $CIRRUS_REPO_OWNER == "MadeByThePinsHub"
-  skip: "!changesInclude('.cirrus.yml', '**.{py}', 'Dockerfile')"
+  skip: "!changesInclude('.cirrus.yml', '**.{py}', 'Dockerfile', '**/*nana*/**')"
   env:
     # For forks, change this var into your own Docker Hub username, must be an service account.
     DOCKERHUB_USERNAME: thepinsteam
-    # Only repos that are owned by the Pins team can use the access key.
-    # Please generate a new encrypted var on https://cirrus-ci.com/settings/github/your-username-here and
+    # Only repos that are owned by the Pins team can use the Docker Hub access key.
+    # Please generate a new encrypted var on https://cirrus-ci.com/settings/github/your-orgusername-here and
     # replace the value below with yours.
     DOCKERHUB_ACCESS_KEY: ENCRYPTED[!e15bc943a38e23531fd9f7729d3a0f51bf38ea1e15c081b93b5685a6ffe576375154eee1e716c595ac2f076e38c40433!]
-  build_script: docker build --tag thepinsteam/nana-remix .
+    # For forks, change this var below into your desired Docker image name.
+    # If you want to push your image outside Docker Hub, see the docs for your registry.
+    DOCKERHUB_IMAGE_TAG: thepinsteam/nana-remix
+  build_script: docker build --tag $DOCKERHUB_IMAGE_TAG .
   login_script: docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_ACCESS_KEY
-  push_script: docker push thepinsteam/nana-remix
+  push_script: docker push $DOCKERHUB_IMAGE_TAG
 
 docker_builder:
   name: Only build Docker image
   timeout_in: 95m
   only_if: $CIRRUS_BRANCH != "master"
-  skip: "!changesInclude('.cirrus.yml', '**.{py}', 'Dockerfile')"
-  build_script: docker build --tag thepinsteam/nana-remix:TEST-BUILDS .
+  skip: "!changesInclude('.cirrus.yml', '**.{py}', 'Dockerfile', '**/*nana*/**')"
+  build_script: docker build .
+
+# Heroku deployment using the 'git push' way.
+# Comment lines 30-45 if you don't use Heroku.
+publish_task:
+  name: Push latest commits to Heroku.
+  only_if: $BRANCH == 'master'
+  container:
+    image: alpine/git:latest
+  env:
+    # Only people with write access to this repo can decrypt the values of these encrypted values.
+    # Please generate a new encrypted var on your Cirrus CI settings for your repo and
+    # replace the value below with yours.
+    HEROKU_API_KEY: ENCRYPTED[2b680a6cd5ba5be5ec156f0159039d9a58afae2307ed325bab4e8edf13ced624224c505b59d4af1f38ef25b9d229078d]
+    HEROKU_APP_NAME: ENCRYPTED[0914901577755ca103a67e8d615bc0e9707319347f8274f4425751b51452bda90930d33210970359ade8a74cff984cbe]
+  script: |
+    #git remote add heroku https://api:${HEROKU_API_KEY}@git.heroku.com/${HEROKU_APP_NAME}.git && git fetch --all
+    #git branch -u heroku/master && git status
+    #git push
+    echo "Deployment to Heroku is disabled due to P2P bullshit."
+    echo "Use Zeet or whatever."

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

.github/pull.yml

@@ -7,4 +7,13 @@ rules:
       - ThePinsTeam
     reviewers:
       - AndreiJirohHaliliDev2006
+
+  # Config for our PR.
+  - base: contributor-branch/pokurt-pr-1
+    upstream: master
+    mergeMethod: merge
+    assignees:
+      - ThePinsTeam
+    reviewers:
+      - AndreiJirohHaliliDev2006
 label: ":arrow_heading_down: pull"

.github/workflows/codacy-analysis.yml

@@ -0,0 +1,44 @@
+# This workflow checks out code, performs a Codacy security scan
+# and integrates the results with the
+# GitHub Advanced Security code scanning feature.  For more information on
+# the Codacy security scan action usage and parameters, see
+# https://github.com/codacy/codacy-analysis-cli-action.
+# For more information on Codacy Analysis CLI in general, see
+# https://github.com/codacy/codacy-analysis-cli.
+
+name: Codacy Security Scan
+
+on: 
+  push:
+    branches: [ "master", "main" ]
+  pull_request:
+    branches: [ "master", "main" ]
+
+jobs:
+  codacy-security-scan:
+    name: Codacy Security Scan
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the repository to the GitHub Actions runner
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
+      - name: Run Codacy Analysis CLI
+        uses: codacy/[email protected]
+        with:
+          # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
+          # You can also omit the token and run the tools that support default configurations
+          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          verbose: true
+          output: results.sarif
+          format: sarif
+          # Force 0 exit code to allow SARIF file generation
+          # This will handover control about PR rejection to the GitHub side
+          max-allowed-issues: 2147483647
+
+      # Upload the SARIF file generated in the previous step
+      - name: Upload SARIF results file
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: results.sarif

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,48 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master, "contributor-branch/*"]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '0 20 * * *'
+
+jobs:
+  analyse:
+    name: Analyse
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+         languages: python
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.gitignore

@@ -51,7 +51,7 @@ coverage.xml
 *.pot
 
 # Django stuff:
-*.log
+*.txt
 local_settings.py
 db.sqlite3
 
@@ -122,6 +122,12 @@ nana/modules/test_admin.py
 .idea/Nana-Remix.iml
 .idea/dictionaries/Aman.xml
 
+
 # Session files
 nana/session/*.session
-!nana/session/README.md
+!nana/session/README.md
+*.session
+*.session-journal
+config.ini
+*.ttf
+*.jpg

.pre-commit-config.yaml

@@ -0,0 +1,29 @@
+repos:
+    - repo: https://github.com/pre-commit/pre-commit-hooks
+      rev: v3.3.0
+      hooks:
+          - id: trailing-whitespace
+          - id: end-of-file-fixer
+          - id: check-docstring-first
+          - id: debug-statements
+          - id: double-quote-string-fixer
+          - id: requirements-txt-fixer
+    - repo: https://gitlab.com/pycqa/flake8
+      rev: 3.8.4
+      hooks:
+          - id: flake8
+            additional_dependencies: [flake8-typing-imports==1.7.0]
+    - repo: https://github.com/pre-commit/mirrors-autopep8
+      rev: v1.5.4
+      hooks:
+          - id: autopep8
+    - repo: https://github.com/asottile/add-trailing-comma
+      rev: v2.0.1
+      hooks:
+          - id: add-trailing-comma
+            args: [--py36-plus]
+    - repo: https://github.com/asottile/pyupgrade
+      rev: v2.7.4
+      hooks:
+          - id: pyupgrade
+            args: [--py36-plus]

Dockerfile

@@ -1,5 +1,5 @@
 # We're using Debian Slim Buster image
-FROM python:3.8.4-slim-buster
+FROM python:3.9.0-slim-buster
 
 ENV PIP_NO_CACHE_DIR 1
 ENV DEBIAN_FRONTEND noninteractive
@@ -12,9 +12,7 @@ RUN apt update && apt upgrade -y && \
     debian-keyring \
     debian-archive-keyring \
     bash \
-    bzip2 \
     curl \
-    figlet \
     git \
     util-linux \
     libffi-dev \
@@ -25,55 +23,47 @@ RUN apt update && apt upgrade -y && \
     musl-dev \
     musl \
     neofetch \
-    php-pgsql \
     python3-lxml \
     postgresql \
     postgresql-client \
-    python3-psycopg2 \
     libpq-dev \
     libcurl4-openssl-dev \
     libxml2-dev \
     libxslt1-dev \
-    python3-pip \
-    python3-requests \
-    python3-sqlalchemy \
-    python3-tz \
-    python3-aiohttp \
     openssl \
     pv \
     jq \
     wget \
-    python3 \
     python3-dev \
     libreadline-dev \
     libyaml-dev \
-    gcc \
-    sqlite3 \
-    libsqlite3-dev \
-    sudo \
     zlib1g \
     ffmpeg \
     libssl-dev \
     libgconf-2-4 \
     libxi6 \
+    zlib1g-dev \
     xvfb \
     unzip \
+    make \
     libopus0 \
     libopus-dev \
+    gcc \
     && rm -rf /var/lib/apt/lists /var/cache/apt/archives /tmp
 
 # Pypi package Repo upgrade
 RUN pip3 install --upgrade pip setuptools wheel
 
 # Clone the fork to the workspace folder.
-RUN git clone https://github.com/AndreiJirohHaliliDev2006/Nana-Remix /app
+RUN git clone https://github.com/MadeByThePinsHub/Nana-Remix /app
 WORKDIR /app
 
-# Update Path
-ENV PATH="/home/userbot/bin:$PATH"
+# Use env vars by default, because we're using Docker
+# containners after all.
+ENV ENV True
 
-# Install requirements
-RUN pip3 install -U -r requirements.txt
+# Install deps using our Makefile
+RUN make install
 
 # Starting Worker
-CMD ["python3","-m","nana"]
+CMD ["make","run"]

LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 2021 <poki> [email protected]
 
     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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    Nana-Remix  Copyright (C) 2021 <poki> [email protected]
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

Makefile

@@ -0,0 +1,12 @@
+test:
+	@pre-commit run --all-files
+
+install:
+	@pip3 install -r requirements.txt
+
+run:
+	@python3 -m nana
+
+update:
+	@git pull
+	@pip3 install -U -r requirements.txt