Compare commits

..

No commits in common. "main" and "main" have entirely different histories.
main ... main

15 changed files with 122 additions and 214 deletions

View File

@ -1,5 +1,6 @@
#lang racket/base #lang racket/base
(require "../src/data.rkt" (require (prefix-in easy: net/http-easy)
"../src/data.rkt"
"xexpr-utils.rkt") "xexpr-utils.rkt")
(provide (provide

View File

@ -22,6 +22,8 @@
(provide (provide
; headers to always send on all http responses ; headers to always send on all http responses
always-headers always-headers
; timeout durations for http-easy requests
timeouts
; generates a consistent footer ; generates a consistent footer
application-footer application-footer
; generates a consistent template for wiki page content to sit in ; generates a consistent template for wiki page content to sit in
@ -37,6 +39,7 @@
(define always-headers (define always-headers
(list (header #"Referrer-Policy" #"same-origin") ; header to not send referers to fandom (list (header #"Referrer-Policy" #"same-origin") ; header to not send referers to fandom
(header #"Link" (string->bytes/latin-1 link-header)))) (header #"Link" (string->bytes/latin-1 link-header))))
(define timeouts (easy:make-timeout-config #:lease 5 #:connect 5))
(define-runtime-path path-static "../static") (define-runtime-path path-static "../static")
(define theme-icons (define theme-icons
@ -110,7 +113,7 @@
(div (@ (class "niwa__left")) (div (@ (class "niwa__left"))
(p ,((extwiki-group^-description group) props)) (p ,((extwiki-group^-description group) props))
(p ,((extwiki^-description xt) props)) (p ,((extwiki^-description xt) props))
(p "This wiki's core community has largely migrated away from Fandom. You should " (p "This wiki's core community has wholly migrated away from Fandom. You should "
(a (@ (href ,go)) "go to " ,(extwiki^-name xt) " now!")) (a (@ (href ,go)) "go to " ,(extwiki^-name xt) " now!"))
(p (@ (class "niwa__feedback")) (p (@ (class "niwa__feedback"))
,@(add-between ,@(add-between
@ -172,7 +175,7 @@
(define styles (define styles
(list (list
(format "~a/wikia.php?controller=ThemeApi&method=themeVariables&variant=~a" origin (user-cookies^-theme user-cookies)) (format "~a/wikia.php?controller=ThemeApi&method=themeVariables&variant=~a" origin (user-cookies^-theme user-cookies))
(format "~a/load.php?lang=en&modules=site.styles%7Cskin.fandomdesktop.styles%7Cext.fandom.PortableInfoboxFandomDesktop.css%7Cext.fandom.GlobalComponents.CommunityHeaderBackground.css%7Cext.fandom.photoGallery.gallery.css%7Cext.gadget.site-styles%2Csound-styles&only=styles&skin=fandomdesktop" origin))) (format "~a/load.php?lang=en&modules=site.styles%7Cskin.fandomdesktop.styles%7Cext.fandom.PortableInfoboxFandomDesktop.css%7Cext.fandom.GlobalComponents.CommunityHeaderBackground.css%7Cext.gadget.site-styles%2Csound-styles&only=styles&skin=fandomdesktop" origin)))
(if (config-true? 'strict_proxy) (if (config-true? 'strict_proxy)
(map u-proxy-url styles) (map u-proxy-url styles)
styles)] styles)]
@ -200,11 +203,10 @@
`(script (@ (type "module") (src ,(get-static-url "search-suggestions.js")))) `(script (@ (type "module") (src ,(get-static-url "search-suggestions.js"))))
"") "")
(script (@ (type "module") (src ,(get-static-url "countdown.js")))) (script (@ (type "module") (src ,(get-static-url "countdown.js"))))
(script (@ (defer) (src ,(get-static-url "tabs.js"))))
(link (@ (rel "icon") (href ,(u (λ (v) (config-true? 'strict_proxy)) (link (@ (rel "icon") (href ,(u (λ (v) (config-true? 'strict_proxy))
(λ (v) (u-proxy-url v)) (λ (v) (u-proxy-url v))
(head-data^-icon-url head-data)))))) (head-data^-icon-url head-data))))))
(body (@ (class ,(head-data^-body-class head-data) " bw-tabs-nojs")) (body (@ (class ,(head-data^-body-class head-data)))
,(let ([extension-eligible? ,(let ([extension-eligible?
(cond/var (cond/var
[(not req) #f] [(not req) #f]

View File

@ -7,8 +7,8 @@
(prefix-in easy: net/http-easy) (prefix-in easy: net/http-easy)
db db
memo memo
"fandom-request.rkt"
"static-data.rkt" "static-data.rkt"
"whole-utils.rkt"
"../lib/url-utils.rkt" "../lib/url-utils.rkt"
"../lib/xexpr-utils.rkt" "../lib/xexpr-utils.rkt"
"../archiver/archiver-database.rkt" "../archiver/archiver-database.rkt"
@ -54,21 +54,21 @@
(vector-ref row 3))) (vector-ref row 3)))
siteinfo-default)] siteinfo-default)]
[else [else
(define res (define dest-url
(fandom-get-api (format "https://~a.fandom.com/api.php?~a"
wikiname wikiname
'(("action" . "query") (params->query '(("action" . "query")
("meta" . "siteinfo") ("meta" . "siteinfo")
("siprop" . "general|rightsinfo") ("siprop" . "general|rightsinfo")
("format" . "json") ("format" . "json")
("formatversion" . "2")))) ("formatversion" . "2")))))
(cond [(= (easy:response-status-code res) 200) (log-outgoing dest-url)
(define data (easy:response-json res)) (define res (easy:get dest-url))
(siteinfo^ (jp "/query/general/sitename" data) (define data (easy:response-json res))
(second (regexp-match #rx"/wiki/(.*)" (jp "/query/general/base" data))) (siteinfo^ (jp "/query/general/sitename" data)
(license^ (jp "/query/rightsinfo/text" data) (second (regexp-match #rx"/wiki/(.*)" (jp "/query/general/base" data)))
(jp "/query/rightsinfo/url" data)))] (license^ (jp "/query/rightsinfo/text" data)
[else siteinfo-default])])) (jp "/query/rightsinfo/url" data)))]))
(define/memoize (head-data-getter wikiname) #:hash hash (define/memoize (head-data-getter wikiname) #:hash hash
;; data will be stored here, can be referenced by the memoized closure ;; data will be stored here, can be referenced by the memoized closure

View File

@ -33,43 +33,26 @@
; don't forget that I'm returning *code* - return a call to the function ; don't forget that I'm returning *code* - return a call to the function
(datum->syntax stx `(make-dispatcher-tree ,ds))) (datum->syntax stx `(make-dispatcher-tree ,ds)))
; guard that the page returned a response, otherwise print more detailed debugging information
(define-syntax-rule (page ds name)
(λ (req)
(define dispatcher (hash-ref ds (quote name)))
(define page-response (dispatcher req))
(if (response? page-response)
page-response
(response/output
#:code 500
#:mime-type #"text/plain"
(λ (out)
(for ([port (list (current-error-port) out)])
(parameterize ([current-output-port port])
(printf "error in ~a:~n expected page to return a response~n actually returned: ~v~n"
(quote name)
page-response))))))))
(define (make-dispatcher-tree ds) (define (make-dispatcher-tree ds)
(define subdomain-dispatcher (hash-ref ds 'subdomain-dispatcher)) (define subdomain-dispatcher (hash-ref ds 'subdomain-dispatcher))
(define tree (define tree
(sequencer:make (sequencer:make
subdomain-dispatcher subdomain-dispatcher
(pathprocedure:make "/" (page ds page-home)) (pathprocedure:make "/" (hash-ref ds 'page-home))
(pathprocedure:make "/proxy" (page ds page-proxy)) (pathprocedure:make "/proxy" (hash-ref ds 'page-proxy))
(pathprocedure:make "/search" (page ds page-global-search)) (pathprocedure:make "/search" (hash-ref ds 'page-global-search))
(pathprocedure:make "/set-user-settings" (page ds page-set-user-settings)) (pathprocedure:make "/set-user-settings" (hash-ref ds 'page-set-user-settings))
(pathprocedure:make "/buddyfight/wiki/It_Doesn't_Work!!" (page ds page-it-works)) (pathprocedure:make "/buddyfight/wiki/It_Doesn't_Work!!" (hash-ref ds 'page-it-works))
(filter:make (pregexp (format "^/~a/wiki/Category:.+$" px-wikiname)) (lift:make (page ds page-category))) (filter:make (pregexp (format "^/~a/wiki/Category:.+$" px-wikiname)) (lift:make (hash-ref ds 'page-category)))
(filter:make (pregexp (format "^/~a/wiki/File:.+$" px-wikiname)) (lift:make (page ds page-file))) (filter:make (pregexp (format "^/~a/wiki/File:.+$" px-wikiname)) (lift:make (hash-ref ds 'page-file)))
(if (config-true? 'feature_offline::enabled) (if (config-true? 'feature_offline::enabled)
(filter:make (pregexp (format "^/~a/wiki/.+$" px-wikiname)) (lift:make (page ds page-wiki-offline))) (filter:make (pregexp (format "^/~a/wiki/.+$" px-wikiname)) (lift:make (hash-ref ds 'page-wiki-offline)))
(λ (_conn _req) (next-dispatcher))) (λ (_conn _req) (next-dispatcher)))
(filter:make (pregexp (format "^/~a/wiki/.+$" px-wikiname)) (lift:make (page ds page-wiki))) (filter:make (pregexp (format "^/~a/wiki/.+$" px-wikiname)) (lift:make (hash-ref ds 'page-wiki)))
(filter:make (pregexp (format "^/~a/search$" px-wikiname)) (lift:make (page ds page-search))) (filter:make (pregexp (format "^/~a/search$" px-wikiname)) (lift:make (hash-ref ds 'page-search)))
(filter:make (pregexp (format "^/~a(/(wiki(/)?)?)?$" px-wikiname)) (lift:make (page ds redirect-wiki-home))) (filter:make (pregexp (format "^/~a(/(wiki(/)?)?)?$" px-wikiname)) (lift:make (hash-ref ds 'redirect-wiki-home)))
(if (config-true? 'feature_offline::enabled) (if (config-true? 'feature_offline::enabled)
(filter:make (pregexp (format "^/archive/~a/(styles|images)/.+$" px-wikiname)) (lift:make (page ds page-static-archive))) (filter:make (pregexp (format "^/archive/~a/(styles|images)/.+$" px-wikiname)) (lift:make (hash-ref ds 'page-static-archive)))
(λ (_conn _req) (next-dispatcher))) (λ (_conn _req) (next-dispatcher)))
(hash-ref ds 'static-dispatcher) (hash-ref ds 'static-dispatcher)
(lift:make (hash-ref ds 'page-not-found)))) (lift:make (hash-ref ds 'page-not-found))))

View File

@ -71,13 +71,6 @@
(λ (props) (λ (props)
'(p "The wiki was founded by Citricsquid on July 16th, 2009 as a way to document information from Minecraft. Since November 15th, 2010, it has been hosted by Curse Media. On December 12th, 2018, it moved to Fandom as it purchased Curse Media. Since September 24, 2023, it forked from Fandom and has been hosted by Weird Gloop."))) '(p "The wiki was founded by Citricsquid on July 16th, 2009 as a way to document information from Minecraft. Since November 15th, 2010, it has been hosted by Curse Media. On December 12th, 2018, it moved to Fandom as it purchased Curse Media. Since September 24, 2023, it forked from Fandom and has been hosted by Weird Gloop.")))
'Tardis
(extwiki-group^
"Tardis"
'(("Forking announcement" . "https://tardis.wiki/wiki/Tardis:Forking_announcement")
("Discussion on Reddit" . "https://old.reddit.com/r/doctorwho/comments/1azxmrl/tardis_wiki_has_regenerated/"))
(λ (props) '()))
'empty 'empty
(extwiki-group^ (extwiki-group^
"Misc" "Misc"
@ -426,15 +419,6 @@
(λ (props) (λ (props)
`())) `()))
(extwiki^
'("tardis") 'default
'Tardis
"Tardis Data Core"
"https://tardis.wiki/wiki/Doctor_Who_Wiki"
"https://tardis.wiki/images/Tardis_images/e/e6/Site-logo.png"
(λ (props)
`()))
;; fandom wikinames * empty * empty * Name * Home Page ;; fandom wikinames * empty * empty * Name * Home Page
(extwiki^ '("aether") 'empty 'empty "Aether Wiki" "https://aether.wiki.gg/wiki/Aether_Wiki" #f #f) (extwiki^ '("aether") 'empty 'empty "Aether Wiki" "https://aether.wiki.gg/wiki/Aether_Wiki" #f #f)
(extwiki^ '("before-darkness-falls") 'empty 'empty "Before Darkness Falls Wiki" "https://beforedarknessfalls.wiki.gg/wiki/Before_Darkness_Falls_Wiki" #f #f) (extwiki^ '("before-darkness-falls") 'empty 'empty "Before Darkness Falls Wiki" "https://beforedarknessfalls.wiki.gg/wiki/Before_Darkness_Falls_Wiki" #f #f)

View File

@ -1,48 +0,0 @@
#lang typed/racket/base
(require "config.rkt"
"../lib/url-utils.rkt")
(define-type Headers (HashTable Symbol (U Bytes String)))
(require/typed net/http-easy
[#:opaque Timeout-Config timeout-config?]
[#:opaque Response response?]
[#:opaque Session session?]
[current-session (Parameter Session)]
[make-timeout-config ([#:lease Positive-Real] [#:connect Positive-Real] -> Timeout-Config)]
[get ((U Bytes String)
[#:close? Boolean]
[#:headers Headers]
[#:timeouts Timeout-Config]
[#:max-attempts Exact-Positive-Integer]
[#:max-redirects Exact-Nonnegative-Integer]
[#:user-agent (U Bytes String)]
-> Response)])
(provide
fandom-get
fandom-get-api
timeouts)
(define timeouts (make-timeout-config #:lease 5 #:connect 5))
(: no-headers Headers)
(define no-headers '#hasheq())
(: fandom-get (String String [#:headers (Option Headers)] -> Response))
(define (fandom-get wikiname path #:headers [headers #f])
(define dest-url (string-append "https://www.fandom.com" path))
(define host (string-append wikiname ".fandom.com"))
(log-outgoing wikiname path)
(get dest-url
#:timeouts timeouts
#:headers (hash-set (or headers no-headers) 'Host host)))
(: fandom-get-api (String (Listof (Pair String String)) [#:headers (Option Headers)] -> Response))
(define (fandom-get-api wikiname params #:headers [headers #f])
(fandom-get wikiname
(string-append "/api.php?" (params->query params))
#:headers headers))
(: log-outgoing (String String -> Void))
(define (log-outgoing wikiname path)
(when (config-true? 'log_outgoing)
(printf "out: ~a ~a~n" wikiname path)))

View File

@ -15,11 +15,11 @@
"application-globals.rkt" "application-globals.rkt"
"config.rkt" "config.rkt"
"data.rkt" "data.rkt"
"fandom-request.rkt"
"page-wiki.rkt" "page-wiki.rkt"
"../lib/syntax.rkt" "../lib/syntax.rkt"
"../lib/thread-utils.rkt" "../lib/thread-utils.rkt"
"../lib/url-utils.rkt" "../lib/url-utils.rkt"
"whole-utils.rkt"
"../lib/xexpr-utils.rkt") "../lib/xexpr-utils.rkt")
(provide (provide
@ -73,24 +73,30 @@
(define-values (members-data page-data siteinfo) (define-values (members-data page-data siteinfo)
(thread-values (thread-values
(λ () (λ ()
(easy:response-json (define dest-url
(fandom-get-api (format "~a/api.php?~a"
wikiname origin
`(("action" . "query") (params->query `(("action" . "query")
("list" . "categorymembers") ("list" . "categorymembers")
("cmtitle" . ,prefixed-category) ("cmtitle" . ,prefixed-category)
("cmlimit" . "max") ("cmlimit" . "max")
("formatversion" . "2") ("formatversion" . "2")
("format" . "json"))))) ("format" . "json")))))
(log-outgoing dest-url)
(define dest-res (easy:get dest-url #:timeouts timeouts))
(easy:response-json dest-res))
(λ () (λ ()
(easy:response-json (define dest-url
(fandom-get-api (format "~a/api.php?~a"
wikiname origin
`(("action" . "parse") (params->query `(("action" . "parse")
("page" . ,prefixed-category) ("page" . ,prefixed-category)
("prop" . "text|headhtml|langlinks") ("prop" . "text|headhtml|langlinks")
("formatversion" . "2") ("formatversion" . "2")
("format" . "json"))))) ("format" . "json")))))
(log-outgoing dest-url)
(define dest-res (easy:get dest-url #:timeouts timeouts))
(easy:response-json dest-res))
(λ () (λ ()
(siteinfo-fetch wikiname)))) (siteinfo-fetch wikiname))))

View File

@ -15,11 +15,11 @@
"application-globals.rkt" "application-globals.rkt"
"config.rkt" "config.rkt"
"data.rkt" "data.rkt"
"fandom-request.rkt"
"page-wiki.rkt" "page-wiki.rkt"
"../lib/syntax.rkt" "../lib/syntax.rkt"
"../lib/thread-utils.rkt" "../lib/thread-utils.rkt"
"../lib/url-utils.rkt" "../lib/url-utils.rkt"
"whole-utils.rkt"
"../lib/xexpr-utils.rkt") "../lib/xexpr-utils.rkt")
(provide page-file) (provide page-file)
@ -40,7 +40,8 @@
(imageDescription . #f)))) (imageDescription . #f))))
(define (url-content-type url) (define (url-content-type url)
(define dest-res (easy:head url)) (log-outgoing url)
(define dest-res (easy:head url #:timeouts timeouts))
(easy:response-headers-ref dest-res 'content-type)) (easy:response-headers-ref dest-res 'content-type))
(define (get-media-html url content-type) (define (get-media-html url content-type)
@ -105,18 +106,20 @@
(response-handler (response-handler
(define wikiname (path/param-path (first (url-path (request-uri req))))) (define wikiname (path/param-path (first (url-path (request-uri req)))))
(define prefixed-title (path/param-path (caddr (url-path (request-uri req))))) (define prefixed-title (path/param-path (caddr (url-path (request-uri req)))))
(define source-url (format "https://~a.fandom.com/wiki/~a" wikiname prefixed-title)) (define origin (format "https://~a.fandom.com" wikiname))
(define source-url (format "~a/wiki/~a" origin prefixed-title))
(define-values (media-detail siteinfo) (define-values (media-detail siteinfo)
(thread-values (thread-values
(λ () (λ ()
(define dest-res (define dest-url
(fandom-get (format "~a/wikia.php?~a"
wikiname origin
(format "/wikia.php?~a" (params->query `(("format" . "json") ("controller" . "Lightbox")
(params->query `(("format" . "json") ("controller" . "Lightbox") ("method" . "getMediaDetail")
("method" . "getMediaDetail") ("fileTitle" . ,prefixed-title)))))
("fileTitle" . ,prefixed-title)))))) (log-outgoing dest-url)
(define dest-res (easy:get dest-url #:timeouts timeouts))
(easy:response-json dest-res)) (easy:response-json dest-res))
(λ () (λ ()
(siteinfo-fetch wikiname)))) (siteinfo-fetch wikiname))))

View File

@ -2,6 +2,7 @@
(require racket/dict (require racket/dict
racket/list racket/list
racket/string racket/string
(prefix-in easy: net/http-easy)
; html libs ; html libs
html-writing html-writing
; web server libs ; web server libs
@ -17,6 +18,7 @@
"../lib/syntax.rkt" "../lib/syntax.rkt"
"../lib/thread-utils.rkt" "../lib/thread-utils.rkt"
"../lib/url-utils.rkt" "../lib/url-utils.rkt"
"whole-utils.rkt"
"../lib/xexpr-utils.rkt") "../lib/xexpr-utils.rkt")
(provide (provide

View File

@ -17,12 +17,12 @@
"application-globals.rkt" "application-globals.rkt"
"config.rkt" "config.rkt"
"data.rkt" "data.rkt"
"fandom-request.rkt"
"../lib/pure-utils.rkt" "../lib/pure-utils.rkt"
"../lib/syntax.rkt" "../lib/syntax.rkt"
"../lib/thread-utils.rkt" "../lib/thread-utils.rkt"
"../lib/tree-updater.rkt" "../lib/tree-updater.rkt"
"../lib/url-utils.rkt" "../lib/url-utils.rkt"
"whole-utils.rkt"
"../lib/xexpr-utils.rkt") "../lib/xexpr-utils.rkt")
(provide (provide
@ -38,20 +38,25 @@
(define (page-wiki req) (define (page-wiki req)
(define wikiname (path/param-path (first (url-path (request-uri req))))) (define wikiname (path/param-path (first (url-path (request-uri req)))))
(define user-cookies (user-cookies-getter req)) (define user-cookies (user-cookies-getter req))
(define origin (format "https://~a.fandom.com" wikiname))
(define path (string-join (map path/param-path (cddr (url-path (request-uri req)))) "/")) (define path (string-join (map path/param-path (cddr (url-path (request-uri req)))) "/"))
(define source-url (format "https://~a.fandom.com/wiki/~a" wikiname path)) (define source-url (format "https://~a.fandom.com/wiki/~a" wikiname path))
(define-values (dest-res siteinfo) (define-values (dest-res siteinfo)
(thread-values (thread-values
(λ () (λ ()
(fandom-get-api (define dest-url
wikiname (format "~a/api.php?~a"
`(("action" . "parse") origin
("page" . ,path) (params->query `(("action" . "parse")
("prop" . "text|headhtml|langlinks") ("page" . ,path)
("formatversion" . "2") ("prop" . "text|headhtml|langlinks")
("format" . "json")) ("formatversion" . "2")
#:headers `#hasheq((cookie . ,(format "theme=~a" (user-cookies^-theme user-cookies)))))) ("format" . "json")))))
(log-outgoing dest-url)
(easy:get dest-url
#:timeouts timeouts
#:headers `#hasheq((cookie . ,(format "theme=~a" (user-cookies^-theme user-cookies))))))
(λ () (λ ()
(siteinfo-fetch wikiname)))) (siteinfo-fetch wikiname))))
@ -98,13 +103,4 @@
#:code 200 #:code 200
#:headers headers #:headers headers
(λ (out) (λ (out)
(write-html body out))))))] (write-html body out))))))]))
[(eq? 404 (easy:response-status-code dest-res))
(next-dispatcher)]
[else
(response-handler
(error 'page-wiki "Tried to load page ~a/~v~nSadly, the page didn't load because Fandom returned status code ~a with response:~n~a"
wikiname
path
(easy:response-status-code dest-res)
(easy:response-body dest-res)))]))

View File

@ -3,8 +3,8 @@
(prefix-in easy: net/http-easy) (prefix-in easy: net/http-easy)
"application-globals.rkt" "application-globals.rkt"
"config.rkt" "config.rkt"
"fandom-request.rkt"
"../lib/url-utils.rkt" "../lib/url-utils.rkt"
"whole-utils.rkt"
"../lib/xexpr-utils.rkt") "../lib/xexpr-utils.rkt")
(provide (provide
@ -17,14 +17,20 @@
'(#hasheq((ns . 0) (pageid . 219) (size . 1482) (snippet . "") (timestamp . "2022-08-21T08:54:23Z") (title . "Gacha Capsule") (wordcount . 214)) #hasheq((ns . 0) (pageid . 201) (size . 1198) (snippet . "") (timestamp . "2022-07-11T17:52:47Z") (title . "Badges") (wordcount . 181))))) '(#hasheq((ns . 0) (pageid . 219) (size . 1482) (snippet . "") (timestamp . "2022-08-21T08:54:23Z") (title . "Gacha Capsule") (wordcount . 214)) #hasheq((ns . 0) (pageid . 201) (size . 1198) (snippet . "") (timestamp . "2022-07-11T17:52:47Z") (title . "Badges") (wordcount . 181)))))
(define (search-fandom wikiname query params) (define (search-fandom wikiname query params)
(define res ;; constructing the URL where I want to get fandom data from...
(fandom-get-api (define origin (format "https://~a.fandom.com" wikiname))
wikiname ;; the dest-URL will look something like https://minecraft.fandom.com/api.php?action=query&list=search&srsearch=Spawner&formatversion=2&format=json
`(("action" . "query") (define dest-url
("list" . "search") (format "~a/api.php?~a"
("srsearch" . ,query) origin
("formatversion" . "2") (params->query `(("action" . "query")
("format" . "json")))) ("list" . "search")
("srsearch" . ,query)
("formatversion" . "2")
("format" . "json")))))
;; HTTP request to dest-url for search results
(log-outgoing dest-url)
(define res (easy:get dest-url #:timeouts timeouts))
(define json (easy:response-json res)) (define json (easy:response-json res))
(define search-results (jp "/query/search" json)) (define search-results (jp "/query/search" json))
(generate-results-content-fandom wikiname query search-results)) (generate-results-content-fandom wikiname query search-results))

View File

@ -5,6 +5,7 @@
"application-globals.rkt" "application-globals.rkt"
"../lib/html-parsing/main.rkt" "../lib/html-parsing/main.rkt"
"../lib/url-utils.rkt" "../lib/url-utils.rkt"
"whole-utils.rkt"
"../lib/xexpr-utils.rkt") "../lib/xexpr-utils.rkt")
(provide (provide
@ -35,7 +36,8 @@
("hl.tag.post" . "</mark>") ("hl.tag.post" . "</mark>")
("sort" . ,(cdr sort)))))) ("sort" . ,(cdr sort))))))
;; HTTP request to dest-url for search results ;; HTTP request to dest-url for search results
(define res (easy:get dest-url #:timeouts (easy:make-timeout-config #:lease 5 #:connect 5))) (log-outgoing dest-url)
(define res (easy:get dest-url #:timeouts timeouts))
(define json (easy:response-json res)) (define json (easy:response-json res))
;; build result objects ;; build result objects

11
src/whole-utils.rkt Normal file
View File

@ -0,0 +1,11 @@
#lang typed/racket/base
(require "config.rkt")
(provide
; prints "out: <url>"
log-outgoing)
(: log-outgoing (String -> Void))
(define (log-outgoing url-string)
(when (config-true? 'log_outgoing)
(printf "out: ~a~n" url-string)))

View File

@ -202,11 +202,11 @@ figcaption, .lightbox-caption, .thumbcaption {
padding: 0; padding: 0;
} }
/* show tabs if tabs.js isn't loaded */ /* show tabs always */
.bw-tabs-nojs .wds-tabs__wrapper { .wds-tabs__wrapper {
display: none; display: none;
} }
.bw-tabs-nojs .wds-tab__content { .wds-tab__content {
display: block; display: block;
} }

View File

@ -1,40 +0,0 @@
"use strict";
const tabFromHash = location.hash.length > 1 ? location.hash.substring(1) : null
for (const tabber of document.body.querySelectorAll(".wds-tabber")) {
for (const [tab, content] of getTabberTabs(tabber)) {
// set up click listener on every tab
tab.addEventListener("click", e => {
setCurrentTab(tabber, tab, content)
e.preventDefault()
})
// re-open a specific tab on page load based on the URL hash
if (tab.dataset.hash === tabFromHash) {
setCurrentTab(tabber, tab, content)
tab.scrollIntoView()
}
}
}
function getTabberTabs(tabber) {
// need to scope the selector to handle nested tabs. see /unturned/wiki/Crate for an example
const tabs = [...tabber.querySelectorAll(":scope > .wds-tabs__wrapper .wds-tabs__tab")]
const contents = [...tabber.querySelectorAll(":scope > .wds-tab__content")]
return tabs.map((_, index) => [tabs[index], contents[index]]) // transpose arrays into [[tab, content], ...]
}
function setCurrentTab(tabber, tab, content) {
// clear currently selected tab
getTabberTabs(tabber).flat().forEach(e => e.classList.remove("wds-is-current"))
// select new tab
tab.classList.add("wds-is-current")
content.classList.add("wds-is-current")
if (tab.dataset.hash) {
history.replaceState(null, "", `#${tab.dataset.hash}`)
}
}
document.body.classList.remove("bw-tabs-nojs")