Make compatible with torrent py api

Author: hemantapkh

app.json

@@ -1,6 +1,6 @@
 {
-    "name": "Torrenthunt",
-    "description": "Torrenthunt",
+    "name": "Torrenthunt Clone",
+    "description": "Torrenthunt clone: https://github.com/hemantapkh/TorrentHunt",
     "stack": "container",
     "keywords": [
       "auto-filter",
@@ -42,14 +42,14 @@
             "required": true
         },
         "TORRENTHUNT_API_URL": {
-            "description": "URL of Torrent Hunt API",
-            "value": "https://torrenthunt.p.rapidapi.com",
+            "description": "URL of Torrents API, Deploy from https://github.com/Ryuk-me/Torrent-Api-py",
+            "value": "https://torrent-api-py-nx0x.onrender.com",
             "required": true
         },
         "TORRENTHUNT_API_KEY": {
-            "description": "Get your key from https://rapidapi.com/hemantapkh/api/torrenthunt",
+            "description": "API key for Torrents api",
             "value": "",
-            "required": true
+            "required": false
         },
         "SENTRY_DSN": {
             "description": "Sentry.io token for error tracking",

app/apis/torrenthunt.py

@@ -9,16 +9,13 @@ class TorrentHunt:
     def __init__(self, api_key):
         url = (
             environ.get(
-                "TORRENTHUNT_API_URL",
+                "TORRENTHUNT_API_URL"
             )
-            or "https://torrenthunt.p.rapidapi.com"
         )
         self.requests = Requests()
         self.url = url.strip("/")
         self.headers = {
-            "X-RapidAPI-Key": api_key,
-            "X-RapidAPI-Proxy-Secret": api_key,
-            "X-RapidAPI-Host": "torrenthunt.p.rapidapi.com",
+            "X-API-Key": environ.get("TORRENTHUNT_API_KEY"),
         }
 
     async def request(self, route, method="GET", params=None, data=None):
@@ -27,5 +24,5 @@ async def request(self, route, method="GET", params=None, data=None):
             self.url + route,
             params=params,
             data=data,
-            headers=self.headers,
+            headers=self.headers
         )

app/database/__init__.py

@@ -2,7 +2,6 @@
 
 import datetime
 
-import sqlalchemy
 from database.models import Session, Setting, User
 
 

app/database/models.py

@@ -2,7 +2,6 @@
 from uuid import uuid4
 
 from asyncpg import Connection as asyncpg_connection
-from dotenv import load_dotenv
 from loguru import logger
 from sqlalchemy import (
     TIMESTAMP,
@@ -17,8 +16,6 @@
 from sqlalchemy.orm import declarative_base, relationship, sessionmaker
 from sqlalchemy.sql import func
 
-logger.info("Loading variables from .env file")
-load_dotenv()
 
 connection_string = (
     environ.get("DATABASE_URL", "")

app/plugins/functions/keyboards.py

@@ -27,11 +27,10 @@ def main(self, lang, message=None):
     def sites(self, keyword):
         results = [
             types.InlineKeyboardButton(
-                text=self.client.sites[key]["title"],
-                switch_inline_query_current_chat=f"{self.client.sites[key]['code']} {keyword}",
+                text=self.client.sites[key]["website"],
+                switch_inline_query_current_chat=f"!{key} {keyword}",
             )
             for key in self.client.sites
-            if not self.client.sites[key].get("deactivated")
         ]
 
         return (

app/plugins/functions/misc.py

@@ -14,7 +14,7 @@ def __init__(self, Client):
     async def fetch_config(self):
         # Get available sites
         config = await self.Client.torrent_hunt_api.request(
-            "/api/config",
+            "/api/v1/sites/config",
         )
 
         if "error" in config:
@@ -74,7 +74,3 @@ async def user_lang(self, message):
     def split_list(self, lst, size):
         return [lst[i : i + size] for i in range(0, len(lst), size)]
 
-    # Get the site by it's code
-    def code_to_site(self, code):
-        data = self.Client.sites
-        return next((key for key, value in data.items() if value["code"] == code), None)

app/plugins/search/inline.py

@@ -1,40 +1,44 @@
-from os import environ
-
 from loguru import logger
 from plugins.functions.database import get_restricted_mode
-from pyrogram import Client, filters, types
+from pyrogram import Client, types
 
 
-@Client.on_inline_query(filters.regex("!"))
+@Client.on_inline_query()
 async def query_search(Client, inline_query):
     user_lang = await Client.misc.user_lang(inline_query)
     restricted_mode = await get_restricted_mode(inline_query.from_user.id)
     query_list = inline_query.query.split()
     results = []
 
     # If keyword is not empty
-    if len(query_list) > 1:
+    if len(query_list) >= 1:
         keyword = " ".join(query_list[1:])
-        site = Client.misc.code_to_site(query_list[0])
+        site = query_list[0]
+        
+        if site.startswith("!"):
+            site = site[1:]
+            
+        else:
+            site = "piratebay"
 
         page = int(inline_query.offset) if inline_query.offset else 1
         logger.info(f"Inline searching {keyword} on {site} on page {page}")
 
         response = await Client.torrent_hunt_api.request(
-            route="/api/search",
+            route="/api/v1/search",
             params={
                 "query": keyword,
                 "site": site,
                 "page": str(page),
             },
         )
 
-        if response.get("items"):
+        if response.get("data"):
             pm_text = Client.language.STR("resultsFor", user_lang).format(
                 keyword,
             )
 
-            for res in response.get("items"):
+            for res in response.get("data"):
                 text, markup = Client.struct.content_message(
                     res,
                     language=user_lang,
@@ -43,13 +47,13 @@ async def query_search(Client, inline_query):
                 results.append(
                     types.InlineQueryResultArticle(
                         title=res.get("name"),
-                        thumb_url=res.get("thumbnail")
+                        thumb_url=res.get("thumbnail") or res.get("poster")
                         or f"https://raw.githubusercontent.com/hemantapkh/torrenthunt/main/images/{site}.jpg",
                         description="💾 {}, 🟢 {}, 🔴 {}, 📅 {}".format(
                             res.get("size"),
                             res.get("seeders"),
                             res.get("leechers"),
-                            res.get("uploadDate"),
+                            res.get("date"),
                         ),
                         input_message_content=types.InputTextMessageContent(
                             message_text=text,

app/torrenthunt.py

@@ -6,13 +6,15 @@
 
 import uvloop
 import sentry_sdk
+from loguru import logger
+from pyrogram import Client, filters
+
 from apis.requests import Requests
 from apis.torrenthunt import TorrentHunt
 from database import DataBase
 from database.models import init_models
 from init import exec_dir
 from langs.lang import Lang
-from loguru import logger
 from models.explicit_detector.explicit_detector import ExplicitDetector
 from plugins.blueprint.schema import Schema
 from plugins.functions.filters import Filter
@@ -32,15 +34,6 @@
 logger.info("Installing uvloop")
 uvloop.install()
 
-# Configure logger to write logs to file and console
-log_file = environ.get("LOGFILE")
-if log_file:
-    logger.add(
-        log_file,
-        backtrace=True,
-        rotation="10 MB",
-    )
-
 logger.info("Creating database instance")
 Client.DB = DataBase()
 

sample.env

@@ -1,5 +1,5 @@
 # Telegram configs
-BOT_NAME=Torrent Hunt
+BOT_NAME=Torrent Hunt Clone
 BOT_TOKEN=
 API_ID=
 API_HASH=
@@ -8,7 +8,8 @@ BOT_ADMINS=
 # Database connection string
 DATABASE_URL=sqlite:///torrenthunt.db
 
-# Torrent Hunt API
+# Torrent API (https://github.com/Ryuk-me/Torrent-Api-py)
+TORRENTHUNT_API_URL=https://torrent-api-py-nx0x.onrender.com
 TORRENTHUNT_API_KEY=
 
 # Message to forward on start
@@ -19,7 +20,4 @@ START_ADS_MESSAGE=
 # Sentry.io for error tracing
 SENTRY_DSN=
 
-# MISC
-WORKDIR=
-LOGFILE=
 ENVIRONMENT=local