diff --git a/breezewiki.rkt b/breezewiki.rkt index a8b8c28..3fc9b8f 100644 --- a/breezewiki.rkt +++ b/breezewiki.rkt @@ -12,7 +12,6 @@ (require-reloadable "src/page-category.rkt" page-category) (require-reloadable "src/page-global-search.rkt" page-global-search) (require-reloadable "src/page-home.rkt" page-home) -(require-reloadable "src/page-it-works.rkt" page-it-works) (require-reloadable "src/page-not-found.rkt" page-not-found) (require-reloadable "src/page-proxy.rkt" page-proxy) (require-reloadable "src/page-redirect-wiki-home.rkt" redirect-wiki-home) @@ -36,7 +35,6 @@ page-category page-global-search page-home - page-it-works page-not-found page-proxy page-search diff --git a/dist.rkt b/dist.rkt index 777e81a..805df48 100644 --- a/dist.rkt +++ b/dist.rkt @@ -6,7 +6,6 @@ (require (only-in "src/page-category.rkt" page-category)) (require (only-in "src/page-global-search.rkt" page-global-search)) (require (only-in "src/page-home.rkt" page-home)) -(require (only-in "src/page-it-works.rkt" page-it-works)) (require (only-in "src/page-not-found.rkt" page-not-found)) (require (only-in "src/page-proxy.rkt" page-proxy)) (require (only-in "src/page-redirect-wiki-home.rkt" redirect-wiki-home)) @@ -25,7 +24,6 @@ page-category page-global-search page-home - page-it-works page-not-found page-proxy page-search diff --git a/src/dispatcher-tree.rkt b/src/dispatcher-tree.rkt index 9e072bc..b68cf9c 100644 --- a/src/dispatcher-tree.rkt +++ b/src/dispatcher-tree.rkt @@ -44,7 +44,6 @@ (pathprocedure:make "/" (hash-ref ds 'page-home)) (pathprocedure:make "/proxy" (hash-ref ds 'page-proxy)) (pathprocedure:make "/search" (hash-ref ds 'page-global-search)) - (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 (hash-ref ds 'page-category))) (filter:make (pregexp (format "^/~a/wiki/File:.+$" px-wikiname)) (lift:make (hash-ref ds 'page-file))) (filter:make (pregexp (format "^/~a/wiki/.+$" px-wikiname)) (lift:make (hash-ref ds 'page-wiki))) diff --git a/src/page-file.rkt b/src/page-file.rkt index 1802568..a8a41a8 100644 --- a/src/page-file.rkt +++ b/src/page-file.rkt @@ -31,7 +31,8 @@ (rawImageUrl . "https://static.wikia.nocookie.net/examplefile") (userName . "blankie") (isPostedIn . #t) - (smallerArticleList . (#hasheq((titleText . "Test:Example article")))) + (smallerArticleList . (#hasheq((title . "Example_article") + (titleText . "Example article")))) (articleListIsSmaller . 0) (exists . #t) (imageDescription . #f)))) @@ -88,8 +89,8 @@ ,(if is-posted-in `(p "This file is used in " ,@(map (λ (article) - (define title (jp "/titleText" article)) - (define page-path (regexp-replace* #rx" " title "_")) + (define page-path (jp "/title" article)) + (define title (jp "/titleText" article page-path)) `(span ,(if (eq? (car smaller-article-list) article) "" ", ") (a (@ (href ,(format "/~a/wiki/~a" wikiname page-path))) ,title))) diff --git a/src/page-home.rkt b/src/page-home.rkt index 86c316d..b16f66a 100644 --- a/src/page-home.rkt +++ b/src/page-home.rkt @@ -49,7 +49,7 @@ ,(apply format "~a: ~a" x)))) examples)) (h2 "Testimonials") - (p (@ (class "testimonial")) ">so glad someone introduced me to a F*ndom alternative (BreezeWiki) because that x-factorized spillway of an ad-infested radioactive dumpsite can go die in a fire —RB") + (p (@ (class "testimonial")) ">So glad to never have to touch fandom's garbage platform directly ever again —RNL") (p (@ (class "testimonial")) ">you are so right that fandom still sucks even with adblock somehow. even zapping all the stupid padding it still sucks —Minimus") (p (@ (class "testimonial")) ">attempting to go to a wiki's forum page with breezewiki doesn't work, which is based honestly —Tom Skeleton") (p (@ (class "testimonial")) ">Fandom pages crashing and closing, taking forever to load and locking up as they load the ads on the site... they are causing the site to crash because they are trying to load video ads both at the top and bottom of the site as well as two or three banner ads, then a massive top of site ad and eventually my anti-virus shuts the whole site down because it's literally pulling more resources than WoW in ultra settings... —Anonymous") diff --git a/src/page-it-works.rkt b/src/page-it-works.rkt deleted file mode 100644 index ce9e05f..0000000 --- a/src/page-it-works.rkt +++ /dev/null @@ -1,15 +0,0 @@ -#lang racket/base -(require racket/dict - net/url - web-server/http - web-server/dispatchers/dispatch - "application-globals.rkt") - -(provide - page-it-works) - -(define (page-it-works req) - (define b? (dict-ref (url-query (request-uri req)) 'b #f)) - (if b? - (generate-redirect "/stampylongnose/wiki/It_Works") - (next-dispatcher))) diff --git a/src/page-wiki.rkt b/src/page-wiki.rkt index 488886f..07f2f81 100644 --- a/src/page-wiki.rkt +++ b/src/page-wiki.rkt @@ -52,7 +52,7 @@ (a (@ (data-test-wikilink) (href "https://test.fandom.com/wiki/Another_Page") (title "Another Page")) "Another Page")))) (figure (@ (class "thumb tnone")) - (a (@ (href "https://static.wikia.nocookie.net/nice-image.png") (class "image") (data-test-figure-a)) + (a (@ (href "https://static.wikia.nocookie.net/nice-image.png") (class "image")) (img (@ (src "data:image/gif;base64,R0lGODlhAQABAIABAAAAAP///yH5BAEAAAEALAAAAAABAAEAQAICTAEAOw%3D%3D") (data-src "https://static.wikia.nocookie.net/nice-image-thumbnail.png") (class "thumbimage lazyload")))) @@ -188,8 +188,7 @@ (λ (v) (and (config-true? 'strict_proxy) (eq? element-type 'a) - (or (has-class? "image-thumbnail" v) - (has-class? "image" v)))) + (has-class? "image-thumbnail" v))) (λ (v) (attribute-maybe-update 'href u-proxy-url v))) ; proxy images from src attributes, if strict_proxy is set (curry u @@ -255,11 +254,6 @@ (λ (t a c) (and (eq? t 'a) (has-class? "image-thumbnail" a))) transformed)))) "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fnice-image.png") - (check-equal? (get-attribute 'href (bits->attributes - ((query-selector - (λ (t a c) (member '(data-test-figure-a) a)) - transformed)))) - "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fnice-image.png") ; check that noscript images are removed (check-equal? ((query-selector (λ (t a c) (eq? t 'noscript)) transformed)) #f)) diff --git a/src/url-utils.rkt b/src/url-utils.rkt index b70b245..10df089 100644 --- a/src/url-utils.rkt +++ b/src/url-utils.rkt @@ -22,7 +22,7 @@ (module+ test (require "typed-rackunit.rkt")) -(define px-wikiname "[a-zA-Z0-9-]{1,50}") +(define px-wikiname "[a-zA-Z0-9-]{3,50}") ;; https://url.spec.whatwg.org/#urlencoded-serializing