diff --git a/README.md b/README.md
index 3cff4182a..135c162fc 100644
--- a/README.md
+++ b/README.md
@@ -464,7 +464,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
* NorBits
* NORDiCHD
* Ntelogo
- * OKFUN PT
* OKPT
* Old Greek Tracker
* Old Toons World
diff --git a/src/Jackett.Common/Definitions/okfunpt.yml b/src/Jackett.Common/Definitions/okfunpt.yml
deleted file mode 100644
index 0d4337ad4..000000000
--- a/src/Jackett.Common/Definitions/okfunpt.yml
+++ /dev/null
@@ -1,183 +0,0 @@
----
-id: okfunpt
-name: OKFUN PT
-description: "OKFUN PT is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: zh-CN
-type: private
-encoding: UTF-8
-requestDelay: 5
-certificates:
- - d44084e0ce0c6251dcc5c3d7eca8ed204bfd407d # Expired 19 May 2017
-links:
- - https://pt.okfun.org/
-
-caps:
- categorymappings:
- - {id: 401, cat: Movies, desc: "Movies(電影)", default: true}
- - {id: 404, cat: TV/Documentary, desc: "Documentaries(紀錄片)", default: true}
- - {id: 405, cat: TV/Anime, desc: "Anime(動畫)", default: true}
- - {id: 402, cat: TV, desc: "TV Series(電視劇)", default: true}
- - {id: 403, cat: TV, desc: "TV Shows(綜藝)", default: true}
- - {id: 406, cat: Audio/Video, desc: "MV", default: true}
- - {id: 407, cat: TV/Sport, desc: "Sport(體育)", default: true}
- - {id: 409, cat: Other, desc: "Misc", default: true}
- - {id: 408, cat: Audio, desc: "Music(音軌)", default: true}
- - {id: 410, cat: XXX, desc: "AV (無碼)", default: false}
- - {id: 411, cat: XXX, desc: "AV (有碼)", default: false}
-
- modes:
- search: [q]
- tv-search: [q, season, ep, imdbid, doubanid]
- movie-search: [q, imdbid, doubanid]
- music-search: [q]
- book-search: [q]
-
-settings:
- - name: username
- type: text
- label: Username
- - name: password
- type: password
- label: Password
- - name: freeleech
- type: checkbox
- label: Search freeleech only
- default: false
- - name: sort
- type: select
- label: Sort requested from site
- default: 4
- options:
- 4: created
- 7: seeders
- 5: size
- 1: title
- - name: type
- type: select
- label: Order requested from site
- default: desc
- options:
- desc: desc
- asc: asc
- - name: info_tpp
- type: info
- label: Results Per Page
- default: For best results, change the Torrents per page: setting to 100 on your account profile.
- - name: info_activity
- type: info
- label: Account Inactivity
- default: "Account retention rules:
- Veteran User and above will be retained forever
- Elite User and above will not have their account deleted after parking (in the control panel).
- Users with a parked account will be deleted if they do not log in for 400 consecutive days
- Users with a non-parked account will be deleted if they do not log in for 150 consecutive days
- Users who have no traffic (i.e. upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.
"
-
-login:
- path: login.php
- method: form
- form: form[action="takelogin.php"]
- captcha:
- type: image
- selector: img[alt="CAPTCHA"]
- input: imagestring
- inputs:
- username: "{{ .Config.username }}"
- password: "{{ .Config.password }}"
- logout: ""
- securelogin: ""
- ssl: yes
- trackerssl: yes
- error:
- - selector: td.embedded:has(h2:contains("失败"))
- test:
- path: index.php
- selector: a[href="logout.php"]
-
-search:
- paths:
- - path: torrents.php
- categories: [401, 402, 403, 404, 405, 406, 407, 408, 409]
- - path: special.php
- categories: [410, 411]
- inputs:
- $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
- # currently supports only one query id at one time.
- search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
- # 0 incldead, 1 active, 2 dead
- incldead: 0
- # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
- spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
- # 0 title, 1 descr, 3 uploader, 4 imdburl
- search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
- # 0 AND, 1 OR, 2 exact
- search_mode: 0
- sort: "{{ .Config.sort }}"
- type: "{{ .Config.type }}"
- notnewword: 1
-
- rows:
- selector: table.torrents > tbody > tr:has(a[href^="download.php?id="])
-
- fields:
- category:
- selector: a[href^="?cat="]
- attribute: href
- filters:
- - name: querystring
- args: cat
- title:
- selector: a[href^="details.php?id="]
- details:
- selector: a[href^="details.php?id="]
- attribute: href
- download:
- selector: a[href^="download.php?id="]
- attribute: href
- imdbid:
- selector: a[href*="imdb.com/title/tt"]
- attribute: href
- doubanid:
- selector: a[href*="movie.douban.com/subject/"]
- attribute: href
- date_elapsed:
- # time type: time elapsed (default)
- selector: td:nth-child(4) > span[title]
- attribute: title
- optional: true
- filters:
- - name: append
- args: " +08:00" # CST
- - name: dateparse
- args: "yyyy-MM-dd HH:mm:ss zzz"
- date_added:
- # time added
- selector: td:nth-child(4):not(:has(span))
- optional: true
- filters:
- - name: append
- args: " +08:00" # CST
- - name: dateparse
- args: "yyyy-MM-ddHH:mm:ss zzz"
- date:
- text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
- size:
- selector: td:nth-child(5)
- seeders:
- selector: td:nth-child(6)
- leechers:
- selector: td:nth-child(7)
- grabs:
- selector: td:nth-child(8)
- downloadvolumefactor:
- case:
- font.promotion.free: 0
- font.promotion.twoupfree: 0
- font.promotion.halfdown: 0.5
- font.promotion.twouphalfdown: 0.5
- font.promotion.thirtypercent: 0.3
- "*": 1
- uploadvolumefactor:
- case:
- font.promotion.twoup: 2
- font.promotion.twoupfree: 2
- font.promotion.twouphalfdown: 2
- "*": 1
- description:
- selector: td:nth-child(2) > font:last-child
-# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs
index ebc1dfab6..918b0bf69 100644
--- a/src/Jackett.Updater/Program.cs
+++ b/src/Jackett.Updater/Program.cs
@@ -534,6 +534,7 @@ namespace Jackett.Updater
"Definitions/nyoo.yml",
"Definitions/oasis.yml",
"Definitions/obscure.yml",
+ "Definitions/okfunpt.yml",
"Definitions/omgwtftrackr.yml",
"Definitions/oncesearch.yml",
"Definitions/onlineselfeducation.yml",