diff --git a/scrapers/Fansly/FanslyAPI.yml b/scrapers/Fansly/FanslyAPI.yml
deleted file mode 100644
index 4252013..0000000
--- a/scrapers/Fansly/FanslyAPI.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-name: Fansly (API)
-sceneByURL:
-  - action: scrapeJson
-    url:
-      - fansly.com/post/
-    queryURL: https://apiv3.fansly.com/api/v1/post?ids={url}&ngsw-bypass=true
-    queryURLReplace:
-      url:
-        - regex: '.+\/post\/(\d+)'
-          with: "$1"
-    scraper: apiScraper
-performerByName:
-  action: scrapeJson
-  queryURL: https://apiv3.fansly.com/api/v1/account?usernames={}&ngsw-bypass=true
-  scraper: performerSearch
-performerByURL:
-  - action: scrapeJson
-    url:
-      - https://fansly.com
-    scraper: performerScraper
-    queryURL: "{url}"
-    queryURLReplace:
-      url:
-        - regex: ^https:\/\/fansly\.com\/([^\/?#]+)(?:\/posts)?\/?$
-          with: https://apiv3.fansly.com/api/v1/account?usernames=$1&ngsw-bypass=true
-jsonScrapers:
-  apiScraper:
-    scene:
-      Title:
-       selector: response.posts.0.content
-       postProcess:
-         - replace:
-           - regex: "\\n+.+"
-             with: ""
-      Code: response.posts.0.id
-      Details: response.posts.0.content
-      Image: response.accountMedia.0.media.variants.0.locations.0.location
-      Date:
-        selector: response.posts.0.createdAt
-        postProcess:
-          - parseDate: unix
-      Studio:
-        Name: 
-          selector: response.accounts.0.username
-          postProcess:
-            - replace:
-              - regex: "$"
-                with: " (Fansly)"
-      Performers:
-        Name: response.accounts.0.username
-
-  performerSearch:
-    performer:
-      Name: response.0.username
-      Aliases: response.0.displayName
-      Gender:
-        fixed: female
-      URLs:
-        selector: response.0.username
-        postProcess:
-          - replace:
-              - regex: (.*)$
-                with: https://fansly.com/$1/posts
-      Country: response.0.location
-      Image: 
-        selector: response.0.avatar.locations.0.location
-      Details: 
-        selector: response.0.about
-  performerScraper:
-    performer:
-      Name: response.0.username
-      Aliases: response.0.displayName
-      Gender:
-        fixed: female
-      URLs:
-        selector: response.0.username
-        postProcess:
-          - replace:
-              - regex: (.*)$
-                with: https://fansly.com/$1/posts
-      Country: response.0.location
-      Image: 
-        selector: response.0.avatar.locations.0.location
-      Details: 
-        selector: response.0.about
-
-# I have no clue what actual login credentials are
-# driver:
-#   cookies:
-#     - CookieURL: https://fansly.com
-#       Cookies:
-#         - Name: nats
-#           Domain: fansly.com
-#           ValueRandom: 36
-#           Path: /
-# Last Updated April 14, 2026
\ No newline at end of file
diff --git a/scrapers/Fansly/FanslyAPI/FanslyAPI.py b/scrapers/Fansly/FanslyAPI/FanslyAPI.py
new file mode 100644
index 0000000..77c9901
--- /dev/null
+++ b/scrapers/Fansly/FanslyAPI/FanslyAPI.py
@@ -0,0 +1,305 @@
+import configparser
+import json
+import os
+import re
+import sys
+from datetime import datetime, timezone
+
+# Add possible py_common locations
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+for _path in [
+    SCRIPT_DIR,
+    os.path.join(SCRIPT_DIR, ".."),
+    os.path.join(SCRIPT_DIR, "..", ".."),
+    os.path.join(SCRIPT_DIR, "..", "..", ".."),
+]:
+    sys.path.insert(0, _path)
+from py_common import log
+import requests
+
+FANSLY_API  = "https://apiv3.fansly.com/api/v1"
+CONFIG_FILE = os.path.join(SCRIPT_DIR, "config.ini")
+
+DEFAULT_CONFIG = """[FanslyAPI]
+# Session token for Fansly API.
+# Get it from: F12 -> Network -> any apiv3.fansly.com request -> look for sessionToken query param
+# Paste just the token value (without "sessionToken=")
+session_token =
+"""
+
+
+def get_token():
+    if not os.path.exists(CONFIG_FILE):
+        with open(CONFIG_FILE, "w") as f:
+            f.write(DEFAULT_CONFIG)
+        log.info(f"Created config.ini at {CONFIG_FILE} - add your Fansly session_token")
+        return None
+
+    config = configparser.RawConfigParser()
+    config.read(CONFIG_FILE)
+    token = config.get("FanslyAPI", "session_token", fallback="").strip()
+    if not token:
+        log.warning("No session_token set in config.ini - API requests may fail or return limited data")
+        return None
+    return token
+
+
+def api_headers():
+    return {
+        "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+        "Accept": "application/json, text/plain, */*",
+        "Origin": "https://fansly.com",
+        "Referer": "https://fansly.com/",
+    }
+
+
+def api_get(path, token=None):
+    url = f"{FANSLY_API}/{path}"
+    if token:
+        sep = "&" if "?" in url else "?"
+        url = f"{url}{sep}sessionToken={token}"
+    log.info(f"GET {url}")
+    r = requests.get(url, headers=api_headers(), timeout=15)
+    if not r.ok:
+        log.error(f"HTTP {r.status_code} for {url}: {r.text[:200]}")
+        sys.exit(1)
+    return r.json()
+
+
+def parse_tags_from_content(content):
+    """Extract #hashtags and @mentions from post content, return (clean_details, tags, mentioned_performers)."""
+    if not content:
+        return "", [], []
+
+    tags = []
+    seen_tags = set()
+    for m in re.finditer(r'#(\w+)', content):
+        name = m.group(1)
+        if name.lower() not in seen_tags:
+            seen_tags.add(name.lower())
+            tags.append({"name": name})
+
+    mentioned = []
+    seen_names = set()
+    for m in re.finditer(r'@(\w+)', content):
+        name = m.group(1)
+        if name.lower() not in seen_names:
+            seen_names.add(name.lower())
+            mentioned.append(name)
+
+    # Strip only standalone hashtag lines from details, keep list items like "- #tag"
+    # and keep @mentions
+    lines = content.split("\n")
+    detail_lines = []
+    for line in lines:
+        stripped = line.strip()
+        # Skip lines that are purely hashtags (no other content)
+        if stripped and re.match(r'^(#\w+\s*)+$', stripped):
+            continue
+        detail_lines.append(line)
+    details = "\n".join(detail_lines).strip()
+    return details, tags, mentioned
+
+
+def find_image(data, key="media"):
+    """
+    Walk the response looking for a usable image URL.
+    Fansly nests media differently depending on post type.
+    """
+    # Try accountMedia first
+    for am in data.get("response", {}).get("accountMedia", []):
+        media = am.get("media", {})
+        # Try variants first (higher quality)
+        for variant in media.get("variants", []):
+            for loc in variant.get("locations", []):
+                url = loc.get("location", "")
+                if url:
+                    return url
+        # Fall back to direct locations
+        for loc in media.get("locations", []):
+            url = loc.get("location", "")
+            if url:
+                return url
+
+    # Try preview media
+    for pm in data.get("response", {}).get("accountMediaBundles", []):
+        for am in pm.get("accountMedia", []):
+            media = am.get("media", {})
+            for loc in media.get("locations", []):
+                url = loc.get("location", "")
+                if url:
+                    return url
+
+    return None
+
+
+def scrape_scene(post_id, token):
+    data = api_get(f"post?ids={post_id}&ngsw-bypass=true", token)
+    resp = data.get("response", {})
+
+    posts = resp.get("posts", [])
+    if not posts:
+        log.error(f"No post found for id {post_id}")
+        sys.exit(1)
+
+    post     = posts[0]
+    accounts = resp.get("accounts", [])
+
+    # Match account to post owner by accountId, don't assume accounts[0]
+    post_account_id = str(post.get("accountId", ""))
+    account = next(
+        (a for a in accounts if str(a.get("id", "")) == post_account_id),
+        accounts[0] if accounts else {}
+    )
+
+    content  = post.get("content", "") or ""
+    details, tags, mentioned = parse_tags_from_content(content)
+
+    # Title = first non-empty line after stripping hashtags
+    title = ""
+    for line in content.split("\n"):
+        candidate = re.sub(r'\s*#\w+', '', line).strip()
+        if candidate:
+            title = candidate
+            break
+    if not title:
+        title = f"Post {post_id}"
+
+    # If title has no letters/digits, append "studio - date" for clarity
+    if not re.search(r'[a-zA-Z0-9]', title):
+        username = account.get("username", "")
+        created_at = post.get("createdAt")
+        if created_at:
+            try:
+                date_str = datetime.fromtimestamp(int(created_at), tz=timezone.utc).strftime("%Y-%m-%d")
+            except Exception:
+                date_str = ""
+        else:
+            date_str = ""
+        suffix = " - ".join(p for p in [username, date_str] if p)
+        if suffix:
+            title = f"{title} - {suffix}"
+
+    scrape = {}
+    scrape["title"]   = title
+    scrape["details"] = details
+    scrape["code"]    = str(post.get("id", post_id))
+
+    # Date
+    created_at = post.get("createdAt")
+    if created_at:
+        try:
+            scrape["date"] = datetime.fromtimestamp(
+                int(created_at), tz=timezone.utc
+            ).strftime("%Y-%m-%d")
+        except Exception:
+            pass
+
+    # Image
+    image = find_image(data)
+    if image:
+        scrape["image"] = image
+
+    # Tags
+    if tags:
+        scrape["tags"] = tags
+
+    # Performer — account owner plus any @mentioned performers
+    username = account.get("username", "")
+    performers = []
+    if username:
+        performers.append({"name": username})
+    for name in mentioned:
+        if name.lower() != username.lower():
+            performers.append({"name": name})
+    if performers:
+        scrape["performers"] = performers
+
+    # Studio
+    if username:
+        scrape["studio"] = {
+            "name": f"{username} (Fansly)",
+            "url":  f"https://fansly.com/{username}",
+        }
+
+    scrape["urls"] = [f"https://fansly.com/post/{post_id}"]
+    return scrape
+
+
+def scrape_performer_by_name(name, token):
+    data = api_get(f"account?usernames={name}&ngsw-bypass=true", token)
+    accounts = data.get("response", [])
+    if not accounts:
+        return []
+
+    results = []
+    for acc in accounts:
+        p = build_performer(acc)
+        if p:
+            results.append(p)
+    return results
+
+
+def scrape_performer_by_url(url, token):
+    m = re.match(r'^https?://fansly\.com/([^/?#]+)', url)
+    if not m:
+        log.error(f"Could not parse username from URL: {url}")
+        sys.exit(1)
+    username = m.group(1)
+    data = api_get(f"account?usernames={username}&ngsw-bypass=true", token)
+    accounts = data.get("response", [])
+    if not accounts:
+        log.error(f"No account found for {username}")
+        sys.exit(1)
+    return build_performer(accounts[0])
+
+
+def build_performer(acc):
+    if not acc:
+        return None
+    username = acc.get("username", "")
+    scrape = {}
+    scrape["name"]    = username
+    scrape["aliases"] = acc.get("displayName", "")
+    scrape["details"] = acc.get("about", "")
+    scrape["country"] = acc.get("location", "")
+    if username:
+        scrape["urls"] = [f"https://fansly.com/{username}/posts"]
+
+    # Avatar image
+    avatar = acc.get("avatar", {}) or {}
+    for loc in avatar.get("locations", []):
+        url = loc.get("location", "")
+        if url:
+            scrape["image"] = url
+            break
+
+    return scrape
+
+
+if __name__ == "__main__":
+    fragment = json.loads(sys.stdin.read())
+
+    token = get_token()
+    mode  = sys.argv[1] if len(sys.argv) > 1 else "scene"
+
+    if mode == "performer_name":
+        name = fragment.get("name", "")
+        results = scrape_performer_by_name(name, token)
+        print(json.dumps(results))
+
+    elif mode == "performer_url":
+        url = fragment.get("url", "")
+        result = scrape_performer_by_url(url, token)
+        print(json.dumps(result))
+
+    else:
+        # Scene by URL
+        url = fragment.get("url", "")
+        m = re.search(r'/post/(\d+)', url)
+        if not m:
+            log.error(f"Could not parse post ID from URL: {url}")
+            sys.exit(1)
+        post_id = m.group(1)
+        result = scrape_scene(post_id, token)
+        print(json.dumps(result))
\ No newline at end of file
diff --git a/scrapers/Fansly/FanslyAPI/FanslyAPI.yml b/scrapers/Fansly/FanslyAPI/FanslyAPI.yml
new file mode 100644
index 0000000..2a0631f
--- /dev/null
+++ b/scrapers/Fansly/FanslyAPI/FanslyAPI.yml
@@ -0,0 +1,29 @@
+name: Fansly (API)
+sceneByURL:
+  - action: script
+    url:
+      - fansly.com/post/
+    script:
+      - python3
+      - FanslyAPI.py
+    scraper: FanslyAPI
+
+performerByName:
+  action: script
+  script:
+    - python3
+    - FanslyAPI.py
+    - performer_name
+  scraper: FanslyAPI
+
+performerByURL:
+  - action: script
+    url:
+      - fansly.com
+    script:
+      - python3
+      - FanslyAPI.py
+      - performer_url
+    scraper: FanslyAPI
+
+# Last Updated May 09, 2026