upd

app.py

@@ -3,11 +3,12 @@ from flask import *
 from flask_limiter import Limiter
 from flask_limiter.util import get_remote_address
 
+from routes.helpers import checkSignature
 from routes import *
 
 app = Flask(__name__)
 app.config['JSON_AS_ASCII'] = False
-limiter = Limiter(app, default_limits=["5/minute"])
+limiter = Limiter(app=app, key_func=get_remote_address, default_limits=["5/minute"], storage_uri="memory://",)
 
 #limiter
 @limiter.request_filter
@@ -15,7 +16,7 @@ def ip_whitelist():
     try:
         if request.method == 'POST': signature = request.form['signature']
         else: signature = request.args['signature']
-        return helpers.checkSignature(signature)
+        return checkSignature(request, signature)
     except: return False
 #error pages
 @app.errorhandler(429)
@@ -29,6 +30,11 @@ def ratelimit_handler(e): return render_template('notfound.html')
 @app.route('/')
 @limiter.exempt
 def index(): return render_template('index.html') 
+# sig gen
+@app.route('/signatures/api/v1/get', methods=['GET', 'POST'])
+@limiter.exempt
+def signatureGen():
+    return siteRoutes.signatureGen(request)
 
 #empty routes
 @app.route('/yt/api/v1', methods=['GET', 'POST'])
@@ -40,7 +46,7 @@ def emptyPath(): return {}
 @app.route('/recognize/api/v1/<path:path>', methods=['GET', 'POST'])
 @app.route('/osu/api/v1/<path:path>', methods=['GET', 'POST'])
 def emptyApiWA(path):  return {"status": "error", "error_code": 100, "error_details": "No method like that found"}
-
+    
 #icon
 @app.route('/favicon.ico')
 @limiter.exempt
@@ -72,5 +78,5 @@ def getBMPreview(): return osuApi.getPreview(request)
 def getBMFull(): return osuApi.getFull(request)
 
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", port=7860, debug=True)
+    app.run(host="0.0.0.0", port=80, debug=True)
 

routes/__init__.py

@@ -1,4 +1,5 @@
+from .ytApi import *
+from .osuApi import *
 from .helpers import *
 from .witaiApi import *
-from .ytApi import *
-from .osuApi import *
+from .siteRoutes import *

routes/config.json

@@ -0,0 +1,8 @@
+{
+	"url": "https://imperialwool-funapi.hf.space",
+	"full-path": "/app/static/full",
+	"temp-path": "/app/static/temp",
+	"static-path": "/app/static",
+	"previews-path": "/app/static/previews",
+	"signatures-db": "C:\\Users\\InspectorJoey\\Desktop\\api\\signatures.db"
+}

routes/helpers.py

@@ -1,19 +1,57 @@
 import os
+import time
+import json
 import random
 import string
+import sqlite3
+import hashlib
 import requests
 
+# SQLite3 class
+class EazySQLite3():
+    def __init__(self, db: str = "sqlite.db"):
+        self.connection = sqlite3.connect(db)
+        #self.cursor = sqlite_connection.cursor()
+    def query(self, query: str = ""):
+        cursor = self.connection.cursor()
+        try:
+            cursor.execute(query)
+            self.connection.commit()
+            try:
+                record = cursor.fetchall()
+                cursor.close()
+                return {"status": True, "details": record} 
+            except:
+                try: cursor.close()
+                except: pass
+                finally: return {"status": True, "details": None} 
+        except Exception as e: return {"status": False, "details": str(e)} 
+    def close(self):
+        self.connection.close()
+
 # Deleting audio
 def deleteAudio(path: str, waitInSeconds: int = 0):
-    os.system("rm /home/ubuntu/api/static/{}".format(path))
+    config = configFile()
+    os.system("rm {}/{}".format(config['static-path'], path))
+
+# Config file reading
+def configFile():
+    with open("C:\\Users\\InspectorJoey\\Desktop\\api\\routes\\config.json", "r") as file:
+        config = json.loads(file.read())
+    return config
 
-# Signatures!!! Wow!!!
-def checkSignature(signature: str):
-    signatureList = [
-        "008610493EAF05823A1C409C551511BA22C9139B97E78C7AC32E36A5992D5FFB2F846B312EE24ED8FA0AEE83700498F341A1AA46E148F05725867D7C51459A1F",
-        "B2A61FBD11D39A611951D803045B7FCE8A76360099127BA9DD1F6B0B691CFF3320D11916AB5297B811149C3BC65D97777D1DE588249863A7C0E877AD13235C99"
-    ]
-    return signature in signatureList
+# Signatures check!!! Wow!!!
+def checkSignature(request, signature: str):
+    config = configFile()
+    db = EazySQLite3(config['signatures-db'])
+    query = db.query(f"SELECT * FROM `table` WHERE `key`=\"{signature}\" AND `endtime`>{time.time()}")
+    if len(query['details']) == 0: return False
+    
+    ip = hashlib.md5(request.remote_addr.encode()).hexdigest()
+    creatorKey = hashlib.md5(f"IP={ip};DATE={time.strftime('%Y-%m-%d')}".encode()).hexdigest()
+    for row in query['details']:
+        if creatorKey == row[2]: return True
+    return False
 
 # Hook for yt-dlp
 def thisIsHook(d):

routes/osuApi/findSong.py

@@ -7,7 +7,7 @@ def findSong(request):
         if request.method == 'POST': signature = request.form['signature']
         else: signature = request.args['signature']
     except: return {"status": "error", "details": { "error_code": 103, "error_details": "No signature" }}
-    if not helpers.checkSignature(signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
+    if not helpers.checkSignature(request, signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
     
     try:
         if request.method == 'POST': query = request.form['query']

routes/osuApi/getFull.py

@@ -9,7 +9,7 @@ def getFull(request):
         if request.method == 'POST': signature = request.form['signature']
         else: signature = request.args['signature']
     except: return {"status": "error", "details": { "error_code": 103, "error_details": "No signature" }}
-    if not helpers.checkSignature(signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
+    if not helpers.checkSignature(request, signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
     
     try:
         if request.method == 'POST': beatmapId = request.form['beatmapId']
@@ -27,33 +27,34 @@ def getFull(request):
         if beatmapId == None: return {"status": "error", "details": { "error_code": 133, "error_details": "No details for finding preview" }}
         else: query = None
     
+    config = helpers.configFile()
     if beatmapId != None:
-        if os.path.exists(f"/home/ubuntu/api/static/full/{beatmapId}.ogg"):
-            return {"status": "pass", "details": {"code": 200, "result": "https://funapi.dnszilla.bar/static/full/{}.ogg".format(beatmapId)}}
-        tryment = get("https://kitsu.moe/api/audio/{}".format(beatmapId), allow_redirects=True)
+        if os.path.exists(f"{config['full-path']}/{beatmapId}.ogg"):
+            return {"status": "pass", "details": {"code": 200, "result": f"{config['url']}/static/full/{beatmapId}.ogg"}}
+        tryment = get(f"https://kitsu.moe/api/audio/{beatmapId}", allow_redirects=True)
         if int(tryment.status_code) not in [404, 403, 429]:
-            open(f"/home/ubuntu/api/static/temp/{beatmapId}.mp3", "wb").write(tryment.content)
-            audio_input = ffmpeg.input(f"/home/ubuntu/api/static/temp/{beatmapId}.mp3")
-            audio_output = ffmpeg.output(audio_input, "/home/ubuntu/api/static/full/{}.ogg".format(beatmapId), audio_bitrate="96K")
+            open(f"{config['temp-path']}/{beatmapId}.mp3", "wb").write(tryment.content)
+            audio_input = ffmpeg.input(f"{config['temp-path']}/{beatmapId}.mp3")
+            audio_output = ffmpeg.output(audio_input, f"{config['full-path']}/{beatmapId}.ogg", audio_bitrate="96K")
             ffmpeg.run(audio_output)
-            helpers.deleteAudio("temp/{}.ogg".format(beatmapId))
-            return {"status": "pass", "details": {"code": int(tryment.status_code), "result": "https://funapi.dnszilla.bar/static/full/{}.ogg".format(beatmapId)}}
+            helpers.deleteAudio(f"temp/{beatmapId}.ogg")
+            return {"status": "pass", "details": {"code": int(tryment.status_code), "result": f"{config['url']}/static/full/{beatmapId}.ogg"}}
         else: 
             return {"status": "error", "details": {"code": int(tryment.status_code), "answer": tryment.text}}
     if query != None:
         fffff = findSong(request)
         if fffff['status'] == "error": return fffff
         beatmapId = fffff['details']['result'][rand(0,len(fffff['details']['result']))]['beatmapId']
-        if os.path.exists(f"/home/ubuntu/api/static/full/{beatmapId}.ogg"):
-            return {"status": "pass", "details": {"code": 200, "result": "https://funapi.dnszilla.bar/static/full/{}.ogg".format(beatmapId)}}
-        tryment = get("https://kitsu.moe/api/audio/{}".format(beatmapId), allow_redirects=True)
+        if os.path.exists(f"{config['full-path']}/{beatmapId}.ogg"):
+            return {"status": "pass", "details": {"code": 200, "result": f"{config['url']}/static/full/{beatmapId}.ogg"}}
+        tryment = get(f"https://kitsu.moe/api/audio/{beatmapId}", allow_redirects=True)
         if int(tryment.status_code) not in [404, 403, 429]:
-            open(f"/home/ubuntu/api/static/temp/{beatmapId}.mp3", "wb").write(tryment.content)
-            audio_input = ffmpeg.input(f"/home/ubuntu/api/static/temp/{beatmapId}.mp3")
-            audio_output = ffmpeg.output(audio_input, "/home/ubuntu/api/static/full/{}.ogg".format(beatmapId), audio_bitrate="96K")
+            open(f"{config['temp-path']}/{beatmapId}.mp3", "wb").write(tryment.content)
+            audio_input = ffmpeg.input(f"{config['temp-path']}/{beatmapId}.mp3")
+            audio_output = ffmpeg.output(audio_input, f"{config['full-path']}/{beatmapId}.ogg", audio_bitrate="96K")
             ffmpeg.run(audio_output)
-            helpers.deleteAudio("temp/{}.ogg".format(beatmapId))
-            return {"status": "pass", "details": {"code": int(tryment.status_code), "result": "https://funapi.dnszilla.bar/static/full/{}.ogg".format(beatmapId)}}
+            helpers.deleteAudio(f"temp/{beatmapId}.ogg")
+            return {"status": "pass", "details": {"code": int(tryment.status_code), "result": f"{config['url']}/static/full/{beatmapId}.ogg"}}
         else: 
             return {"status": "error", "details": {"code": int(tryment.status_code), "answer": tryment.text}}
     return {}

routes/osuApi/getPreview.py

@@ -7,7 +7,7 @@ def getPreview(request):
         if request.method == 'POST': signature = request.form['signature']
         else: signature = request.args['signature']
     except: return {"status": "error", "details": { "error_code": 103, "error_details": "No signature" }}
-    if not helpers.checkSignature(signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
+    if not helpers.checkSignature(request, signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
     
     try:
         if request.method == 'POST': beatmapId = request.form['beatmapId']
@@ -26,9 +26,9 @@ def getPreview(request):
         else: query = None
     
     if beatmapId != None:
-        tryment = get("https://b.ppy.sh/preview/{}.mp3".format(beatmapId))
+        tryment = get(f"https://b.ppy.sh/preview/{beatmapId}.mp3")
         if int(tryment.status_code) not in [404, 403]:
-            return {"status": "pass", "details": {"code": int(tryment.status_code), "result": "https://b.ppy.sh/preview/{}.mp3".format(beatmapId)}}
+            return {"status": "pass", "details": {"code": int(tryment.status_code), "result": f"https://b.ppy.sh/preview/{beatmapId}.mp3"}}
         else: 
             return {"status": "error", "details": {"code": int(tryment.status_code), "answer": tryment.text}}
     if query != None:

routes/siteRoutes/__init__.py

@@ -0,0 +1 @@
+from .sigGen import *

routes/siteRoutes/sigGen.py

@@ -0,0 +1,27 @@
+import time
+import random
+import hashlib
+from .. import helpers
+
+def signatureGen(request):
+    endtime = round(time.time())+604800
+
+    ip = hashlib.md5(request.remote_addr.encode()).hexdigest()
+    text = f"--START SIGNATURE-- {ip}{endtime} --END SIGNATURE--"
+    salt = "f u n a p i - s a l t".split(' ')
+    random.shuffle(salt)
+    salt = ''.join(salt)
+    
+    creatorKey = hashlib.md5(f"IP={ip};DATE={time.strftime('%Y-%m-%d')}".encode()).hexdigest()
+    
+    key = hashlib.blake2b(text.encode(), key=ip.encode(), salt=salt.encode()).hexdigest().upper()
+    
+    db = helpers.EazySQLite3("C:\\Users\\InspectorJoey\\Desktop\\api\\signatures.db")
+    
+    query = db.query(f"INSERT INTO `table` (`key`, `endtime`, `creatorKey`) VALUES (\"{key}\", \"{endtime}\", \"{creatorKey}\")")
+    
+    if query['status']:
+        return {"status": "ok", "result": key, "endtime": endtime}
+    else:
+        return {"status": "error", "details": {"error_code": -1, "error_details": "You already got signature"}}
+    

routes/witaiApi/recognizeVoice.py

@@ -13,6 +13,7 @@ def recognizeVoice(request):
         if request.method == 'POST': signature = request.form['signature']
         else: signature = request.args['signature']
     except: return {"status": "error", "details": { "error_code": 103, "error_details": "No signature" }}
+    if not helpers.checkSignature(request, signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
     try:
         if request.method == 'POST': extendInfo = request.form['extendInfo']
         else: extendInfo = request.args['extendInfo']

routes/ytApi/get.py

@@ -7,7 +7,7 @@ def get(request, check = "huh"):
         if request.method == 'POST': signature = request.form['signature']
         else: signature = request.args['signature']
     except: return {"status": "error", "details": { "error_code": 103, "error_details": "No signature" }}
-    if not helpers.checkSignature(signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
+    if not helpers.checkSignature(request, signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
     
     try:
         if request.method == 'POST': url = request.form['url']
@@ -31,15 +31,17 @@ def get(request, check = "huh"):
     except: urlcode = helpers.randString()
     if urlcode in ['', None]: urlcode = helpers.randString()
     
-    if os.path.exists("/home/ubuntu/api/static/{}/{}.ogg".format(check, urlcode)):
-        return {"status": "pass", 'done-or-not': True, 'ytdlp-code': 0, 'urlcode': urlcode, "path": "/home/ubuntu/api/static/{}/{}.ogg".format(check, urlcode), "quality": quality, "bitrate": bitrate}
+    config = helpers.configFile()
     
-    if os.path.exists("/home/ubuntu/api/static/temp/{}.ogg".format(urlcode)):
-        return {"status": "pass", 'done-or-not': False, 'ytdlp-code': 0, 'urlcode': urlcode, "path": "/home/ubuntu/api/static/temp/{}.ogg".format(urlcode), "quality": quality, "bitrate": bitrate}
+    if os.path.exists(f"{config['static-path']}/{check}/{urlcode}.ogg"):
+        return {"status": "pass", 'done-or-not': True, 'ytdlp-code': 0, 'urlcode': urlcode, "path": f"{config['static-path']}/{check}/{urlcode}.ogg", "quality": quality, "bitrate": bitrate}
+    
+    if os.path.exists(f"{config['temp-path']}/{urlcode}.ogg"):
+        return {"status": "pass", 'done-or-not': False, 'ytdlp-code': 0, 'urlcode': urlcode, "path": f"{config['temp-path']}/{urlcode}.ogg", "quality": quality, "bitrate": bitrate}
       
     ydl_opts = {
         'format': f'ogg/{quality}audio/{quality}',
-        'outtmpl': "/home/ubuntu/api/static/temp/{}.ogg".format(urlcode),
+        'outtmpl': f"{config['temp-path']}/{urlcode}.ogg",
         'progress_hooks': [helpers.thisIsHook],
     }
 
@@ -47,4 +49,4 @@ def get(request, check = "huh"):
         with yt_dlp.YoutubeDL(ydl_opts) as ydl:
             error_code = ydl.download(url)
     except Exception as e: return {"status": "error", "details": {"error_code": 102, "error_details": str(e)}}
-    return {"status": "pass", 'done-or-not': False, 'ytdlp-code': error_code, 'urlcode': urlcode, "path": "/home/ubuntu/api/static/temp/{}.ogg".format(urlcode), "quality": quality, "bitrate": bitrate}
+    return {"status": "pass", 'done-or-not': False, 'ytdlp-code': error_code, 'urlcode': urlcode, "path": f"{config['temp-path']}/{urlcode}.ogg", "quality": quality, "bitrate": bitrate}

routes/ytApi/getFull.py

@@ -13,14 +13,15 @@ def getFull(request):
     quality = answer['quality']
     error_code = answer['ytdlp-code']
     
+    config = helpers.configFile()
     if answer['done-or-not']:
-        return {"status": "pass", "details": {"code": error_code, "name":"{}.ogg".format(urlcode), "result": "http://funapi.dnszilla.bar/static/full/{}.ogg".format(urlcode)}}
+        return {"status": "pass", "details": {"code": error_code, "name":"{}.ogg".format(urlcode), "result": f"{config['url']}/static/full/{urlcode}.ogg"}}
     
     try:
         audio_input = ffmpeg.input(answer['path'])
-        audio_output = ffmpeg.output(audio_input.audio, "/home/ubuntu/api/static/full/{}.ogg".format(urlcode), audio_bitrate=bitrate)
+        audio_output = ffmpeg.output(audio_input.audio, f"{config['full-path']}/{urlcode}.ogg", audio_bitrate=bitrate)
         ffmpeg.run(audio_output)
-        helpers.deleteAudio("temp/{}.ogg".format(urlcode))
-    except Exception as e: return {"status": "error", "details": {"error_code": 102, "error_details": str(e), "result": "http://funapi.dnszilla.bar/static/temp/{}.ogg".format(urlcode)}}
-    return {"status": "pass", "details": {"code": error_code, "name":"{}.ogg".format(urlcode), "result": "http://funapi.dnszilla.bar/static/full/{}.ogg".format(urlcode)}}
+        helpers.deleteAudio(f"temp/{urlcode}.ogg")
+    except Exception as e: return {"status": "error", "details": {"error_code": 102, "error_details": str(e), "result": f"{config['url']}/static/temp/{urlcode}.ogg"}}
+    return {"status": "pass", "details": {"code": error_code, "name":"{}.ogg".format(urlcode), "result": f"{config['url']}/static/full/{urlcode}.ogg"}}
   

routes/ytApi/getPreview.py

@@ -19,15 +19,16 @@ def getPreview(request):
         if duration > 60: duration = 60
     except: duration = 30
     
+    config = helpers.configFile()
     if answer['done-or-not']:
-        return {"status": "pass", "details": {"code": error_code, "name":"{}.ogg".format(urlcode), "result": "http://funapi.dnszilla.bar/static/previews/{}.ogg".format(urlcode)}}
+        return {"status": "pass", "details": {"code": error_code, "name":f"{urlcode}.ogg", "result": f"{config['url']}/static/previews/{urlcode}.ogg"}}
     
     try:
         audio_input = ffmpeg.input(answer['path'])
         audio_cut = audio_input.audio.filter('atrim', duration=duration)
-        audio_output = ffmpeg.output(audio_cut, "/home/ubuntu/api/static/previews/{}.ogg".format(urlcode), audio_bitrate=bitrate)
+        audio_output = ffmpeg.output(audio_cut, f"{config['previews-path']}/{urlcode}.ogg", audio_bitrate=bitrate)
         ffmpeg.run(audio_output)
-        helpers.deleteAudio("temp/{}.ogg".format(urlcode))
-    except Exception as e: return {"status": "error", "details": {"error_code": 102, "error_details": str(e), "result": "http://funapi.dnszilla.bar/static/temp/{}.ogg".format(urlcode)}}
-    return {"status": "pass", "details": {"code": error_code, "name":"{}.ogg".format(urlcode), "result": "http://funapi.dnszilla.bar/static/previews/{}.ogg".format(urlcode)}}
+        helpers.deleteAudio(f"temp/{urlcode}.ogg")
+    except Exception as e: return {"status": "error", "details": {"error_code": 102, "error_details": str(e), "result": f"{config['url']}/static/temp/{urlcode}.ogg"}}
+    return {"status": "pass", "details": {"code": error_code, "name":f"{urlcode}.ogg", "result": f"{config['url']}/static/previews/{urlcode}.ogg"}}
   

routes/ytApi/search.py

@@ -13,7 +13,7 @@ def search(request):
         if request.method == 'POST': signature = request.form['signature']
         else: signature = request.args['signature']
     except: return {"status": "error", "details": { "error_code": 103, "error_details": "No signature" }}
-    if not helpers.checkSignature(signature): return {"status": "error", "details": { "error_code": 105, "error_details": " signature" }}
+    if not helpers.checkSignature(request, signature): return {"status": "error", "details": { "error_code": 105, "error_details": " signature" }}
     html = urllib.request.urlopen("https://www.youtube.com/results?search_query={}".format(urllib.parse.quote_plus(searchQuery)))
     videoList = re.findall(r"watch\?v=(\S{11})", html.read().decode())
     videoIds = dict()

static/api.yaml

@@ -1,11 +1,13 @@
 openapi: 3.0.0
 info:   
-  title: DNSZilla's FunAPI
-  description:  Collection of APIs for bots or just fun by @imperialwool. Thx DNSZilla for host!
+  title: woolbot's FunAPI
+  description:  Collection of APIs for bots or just fun by @podvaljoey.
   version: 0.1.103
 servers:
+  - url: 'https://imperialwool-funapi.hf.space/'
+    description: First path, public.
   - url: 'https://funapi.dnszilla.bar/'
-    description: Main API. 
+    description: Second path, private. 
 paths:
   /recognize/api/v1/voice:
     get:

templates/index.html

@@ -1,7 +1,7 @@
 <!doctype html> <!-- Important: must specify -->
 <html>
 <head>
-	<title>DNSZilla's FunAPI</title>
+	<title>woolbot's FunAPI</title>
 	<style> body {background-color:#14191f;} </style>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">