From b4c4b3fbf068cd228a2bd0dcabf6373223fac4ca Mon Sep 17 00:00:00 2001 From: Timur Ismagilov Date: Mon, 21 Mar 2022 00:10:09 +0300 Subject: [PATCH] API: Get rid of *-json URLs I doubt anybody really used the two. They will make a comeback later. --- views/stuff.qtpl | 20 --- views/stuff.qtpl.go | 352 ++++++++++++++++---------------------------- web/backlinks.go | 11 -- web/search.go | 12 -- 4 files changed, 130 insertions(+), 265 deletions(-) diff --git a/views/stuff.qtpl b/views/stuff.qtpl index 73045e4..8053acf 100644 --- a/views/stuff.qtpl +++ b/views/stuff.qtpl @@ -98,26 +98,6 @@ {% endfunc %} -It outputs a poorly formatted JSON, but it works and is valid. -{% func TitleSearchJSON(query string, generator func(string) <-chan string) %} -{% code - // Lol - counter := 0 -%} -{ - "source_query": "{%s query %}", - "results": [ - {% for hyphaName := range generator(query) %} - {% if counter > 0 %}, {% endif %}{ - "canonical_name": "{%s hyphaName %}", - "beautiful_name": "{%s util.BeautifulName(hyphaName) %}", - "url": "{%s cfg.URL + "/hypha/" + hyphaName %}" - }{% code counter++ %} - {% endfor %} - ] -} -{% endfunc %} - {% func BacklinksHTML(hyphaName string, generator func(string) <-chan string, lc *l18n.Localizer) %}
diff --git a/views/stuff.qtpl.go b/views/stuff.qtpl.go index 34a9ae6..efc004e 100644 --- a/views/stuff.qtpl.go +++ b/views/stuff.qtpl.go @@ -321,106 +321,14 @@ func TitleSearchHTML(query string, generator func(string) <-chan string, lc *l18 //line views/stuff.qtpl:99 } -// It outputs a poorly formatted JSON, but it works and is valid. - -//line views/stuff.qtpl:102 -func StreamTitleSearchJSON(qw422016 *qt422016.Writer, query string, generator func(string) <-chan string) { -//line views/stuff.qtpl:102 - qw422016.N().S(` -`) -//line views/stuff.qtpl:104 - // Lol - counter := 0 - -//line views/stuff.qtpl:106 - qw422016.N().S(` -{ - "source_query": "`) -//line views/stuff.qtpl:108 - qw422016.E().S(query) -//line views/stuff.qtpl:108 - qw422016.N().S(`", - "results": [ - `) -//line views/stuff.qtpl:110 - for hyphaName := range generator(query) { -//line views/stuff.qtpl:110 - qw422016.N().S(` - `) -//line views/stuff.qtpl:111 - if counter > 0 { -//line views/stuff.qtpl:111 - qw422016.N().S(`, `) -//line views/stuff.qtpl:111 - } -//line views/stuff.qtpl:111 - qw422016.N().S(`{ - "canonical_name": "`) -//line views/stuff.qtpl:112 - qw422016.E().S(hyphaName) -//line views/stuff.qtpl:112 - qw422016.N().S(`", - "beautiful_name": "`) -//line views/stuff.qtpl:113 - qw422016.E().S(util.BeautifulName(hyphaName)) -//line views/stuff.qtpl:113 - qw422016.N().S(`", - "url": "`) -//line views/stuff.qtpl:114 - qw422016.E().S(cfg.URL + "/hypha/" + hyphaName) -//line views/stuff.qtpl:114 - qw422016.N().S(`" - }`) -//line views/stuff.qtpl:115 - counter++ - -//line views/stuff.qtpl:115 - qw422016.N().S(` - `) -//line views/stuff.qtpl:116 - } -//line views/stuff.qtpl:116 - qw422016.N().S(` - ] -} -`) -//line views/stuff.qtpl:119 -} - -//line views/stuff.qtpl:119 -func WriteTitleSearchJSON(qq422016 qtio422016.Writer, query string, generator func(string) <-chan string) { -//line views/stuff.qtpl:119 - qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:119 - StreamTitleSearchJSON(qw422016, query, generator) -//line views/stuff.qtpl:119 - qt422016.ReleaseWriter(qw422016) -//line views/stuff.qtpl:119 -} - -//line views/stuff.qtpl:119 -func TitleSearchJSON(query string, generator func(string) <-chan string) string { -//line views/stuff.qtpl:119 - qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:119 - WriteTitleSearchJSON(qb422016, query, generator) -//line views/stuff.qtpl:119 - qs422016 := string(qb422016.B) -//line views/stuff.qtpl:119 - qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:119 - return qs422016 -//line views/stuff.qtpl:119 -} - -//line views/stuff.qtpl:121 +//line views/stuff.qtpl:101 func StreamBacklinksHTML(qw422016 *qt422016.Writer, hyphaName string, generator func(string) <-chan string, lc *l18n.Localizer) { -//line views/stuff.qtpl:121 +//line views/stuff.qtpl:101 qw422016.N().S(`

`) -//line views/stuff.qtpl:124 +//line views/stuff.qtpl:104 qw422016.N().S(lc.Get( "ui.backlinks_heading", &l18n.Replacements{ @@ -431,194 +339,194 @@ func StreamBacklinksHTML(qw422016 *qt422016.Writer, hyphaName string, generator ), }, )) -//line views/stuff.qtpl:133 +//line views/stuff.qtpl:113 qw422016.N().S(`

`) -//line views/stuff.qtpl:134 +//line views/stuff.qtpl:114 qw422016.E().S(lc.Get("ui.backlinks_desc")) -//line views/stuff.qtpl:134 +//line views/stuff.qtpl:114 qw422016.N().S(`

`) -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 } -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 func WriteBacklinksHTML(qq422016 qtio422016.Writer, hyphaName string, generator func(string) <-chan string, lc *l18n.Localizer) { -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 StreamBacklinksHTML(qw422016, hyphaName, generator, lc) -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 qt422016.ReleaseWriter(qw422016) -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 } -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 func BacklinksHTML(hyphaName string, generator func(string) <-chan string, lc *l18n.Localizer) string { -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 WriteBacklinksHTML(qb422016, hyphaName, generator, lc) -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 qs422016 := string(qb422016.B) -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 return qs422016 -//line views/stuff.qtpl:144 +//line views/stuff.qtpl:124 } -//line views/stuff.qtpl:146 +//line views/stuff.qtpl:126 func StreamHelpHTML(qw422016 *qt422016.Writer, content, lang string, lc *l18n.Localizer) { -//line views/stuff.qtpl:146 +//line views/stuff.qtpl:126 qw422016.N().S(`
`) -//line views/stuff.qtpl:150 +//line views/stuff.qtpl:130 qw422016.N().S(content) -//line views/stuff.qtpl:150 +//line views/stuff.qtpl:130 qw422016.N().S(`
`) -//line views/stuff.qtpl:153 +//line views/stuff.qtpl:133 qw422016.N().S(helpTopicsHTML(lang, lc)) -//line views/stuff.qtpl:153 +//line views/stuff.qtpl:133 qw422016.N().S(`
`) -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 } -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 func WriteHelpHTML(qq422016 qtio422016.Writer, content, lang string, lc *l18n.Localizer) { -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 StreamHelpHTML(qw422016, content, lang, lc) -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 qt422016.ReleaseWriter(qw422016) -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 } -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 func HelpHTML(content, lang string, lc *l18n.Localizer) string { -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 WriteHelpHTML(qb422016, content, lang, lc) -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 qs422016 := string(qb422016.B) -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 return qs422016 -//line views/stuff.qtpl:155 +//line views/stuff.qtpl:135 } -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:137 func StreamHelpEmptyErrorHTML(qw422016 *qt422016.Writer, lc *l18n.Localizer) { -//line views/stuff.qtpl:157 +//line views/stuff.qtpl:137 qw422016.N().S(`

`) -//line views/stuff.qtpl:158 +//line views/stuff.qtpl:138 qw422016.E().S(lc.Get("help.empty_error_title")) -//line views/stuff.qtpl:158 +//line views/stuff.qtpl:138 qw422016.N().S(`

`) -//line views/stuff.qtpl:159 +//line views/stuff.qtpl:139 qw422016.E().S(lc.Get("help.empty_error_line_1")) -//line views/stuff.qtpl:159 +//line views/stuff.qtpl:139 qw422016.N().S(`

`) -//line views/stuff.qtpl:160 +//line views/stuff.qtpl:140 qw422016.E().S(lc.Get("help.empty_error_line_2a")) -//line views/stuff.qtpl:160 +//line views/stuff.qtpl:140 qw422016.N().S(` `) -//line views/stuff.qtpl:160 +//line views/stuff.qtpl:140 qw422016.E().S(lc.Get("help.empty_error_link")) -//line views/stuff.qtpl:160 +//line views/stuff.qtpl:140 qw422016.N().S(` `) -//line views/stuff.qtpl:160 +//line views/stuff.qtpl:140 qw422016.E().S(lc.Get("help.empty_error_line_2b")) -//line views/stuff.qtpl:160 +//line views/stuff.qtpl:140 qw422016.N().S(`

`) -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 } -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 func WriteHelpEmptyErrorHTML(qq422016 qtio422016.Writer, lc *l18n.Localizer) { -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 StreamHelpEmptyErrorHTML(qw422016, lc) -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 qt422016.ReleaseWriter(qw422016) -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 } -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 func HelpEmptyErrorHTML(lc *l18n.Localizer) string { -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 WriteHelpEmptyErrorHTML(qb422016, lc) -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 qs422016 := string(qb422016.B) -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 return qs422016 -//line views/stuff.qtpl:161 +//line views/stuff.qtpl:141 } -//line views/stuff.qtpl:163 +//line views/stuff.qtpl:143 func StreamHyphaListHTML(qw422016 *qt422016.Writer, lc *l18n.Localizer) { -//line views/stuff.qtpl:163 +//line views/stuff.qtpl:143 qw422016.N().S(`

`) -//line views/stuff.qtpl:166 +//line views/stuff.qtpl:146 qw422016.E().S(lc.Get("ui.list_heading")) -//line views/stuff.qtpl:166 +//line views/stuff.qtpl:146 qw422016.N().S(`

`) -//line views/stuff.qtpl:167 +//line views/stuff.qtpl:147 qw422016.E().S(lc.GetPlural("ui.list_desc", hyphae.Count())) -//line views/stuff.qtpl:167 +//line views/stuff.qtpl:147 qw422016.N().S(`

    `) -//line views/stuff.qtpl:170 +//line views/stuff.qtpl:150 hyphaNames := make(chan string) sortedHypha := hyphae.PathographicSort(hyphaNames) for hypha := range hyphae.YieldExistingHyphae() { @@ -626,134 +534,134 @@ func StreamHyphaListHTML(qw422016 *qt422016.Writer, lc *l18n.Localizer) { } close(hyphaNames) -//line views/stuff.qtpl:176 +//line views/stuff.qtpl:156 qw422016.N().S(` `) -//line views/stuff.qtpl:177 +//line views/stuff.qtpl:157 for hyphaName := range sortedHypha { -//line views/stuff.qtpl:177 +//line views/stuff.qtpl:157 qw422016.N().S(` `) -//line views/stuff.qtpl:178 +//line views/stuff.qtpl:158 h := hyphae.ByName(hyphaName) -//line views/stuff.qtpl:178 +//line views/stuff.qtpl:158 qw422016.N().S(`
  • `) -//line views/stuff.qtpl:181 +//line views/stuff.qtpl:161 qw422016.E().S(util.BeautifulName(h.CanonicalName())) -//line views/stuff.qtpl:181 +//line views/stuff.qtpl:161 qw422016.N().S(` `) -//line views/stuff.qtpl:183 +//line views/stuff.qtpl:163 switch h := h.(type) { -//line views/stuff.qtpl:184 +//line views/stuff.qtpl:164 case *hyphae.MediaHypha: -//line views/stuff.qtpl:184 +//line views/stuff.qtpl:164 qw422016.N().S(` `) -//line views/stuff.qtpl:186 +//line views/stuff.qtpl:166 qw422016.E().S(filepath.Ext(h.MediaFilePath())[1:]) -//line views/stuff.qtpl:186 +//line views/stuff.qtpl:166 qw422016.N().S(` `) -//line views/stuff.qtpl:188 +//line views/stuff.qtpl:168 } -//line views/stuff.qtpl:188 +//line views/stuff.qtpl:168 qw422016.N().S(`
    • `) -//line views/stuff.qtpl:190 +//line views/stuff.qtpl:170 } -//line views/stuff.qtpl:190 +//line views/stuff.qtpl:170 qw422016.N().S(`
`) -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 } -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 func WriteHyphaListHTML(qq422016 qtio422016.Writer, lc *l18n.Localizer) { -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 StreamHyphaListHTML(qw422016, lc) -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 qt422016.ReleaseWriter(qw422016) -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 } -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 func HyphaListHTML(lc *l18n.Localizer) string { -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 WriteHyphaListHTML(qb422016, lc) -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 qs422016 := string(qb422016.B) -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 return qs422016 -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:174 } -//line views/stuff.qtpl:196 +//line views/stuff.qtpl:176 func StreamCommonScripts(qw422016 *qt422016.Writer) { -//line views/stuff.qtpl:196 +//line views/stuff.qtpl:176 qw422016.N().S(` `) -//line views/stuff.qtpl:197 +//line views/stuff.qtpl:177 for _, scriptPath := range cfg.CommonScripts { -//line views/stuff.qtpl:197 +//line views/stuff.qtpl:177 qw422016.N().S(` `) -//line views/stuff.qtpl:199 +//line views/stuff.qtpl:179 } -//line views/stuff.qtpl:199 +//line views/stuff.qtpl:179 qw422016.N().S(` `) -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 } -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 func WriteCommonScripts(qq422016 qtio422016.Writer) { -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 StreamCommonScripts(qw422016) -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 qt422016.ReleaseWriter(qw422016) -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 } -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 func CommonScripts() string { -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 WriteCommonScripts(qb422016) -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 qs422016 := string(qb422016.B) -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 return qs422016 -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:180 } diff --git a/web/backlinks.go b/web/backlinks.go index 6173431..d727c74 100644 --- a/web/backlinks.go +++ b/web/backlinks.go @@ -2,7 +2,6 @@ package web import ( "github.com/bouncepaw/mycorrhiza/hyphae/backlinks" - "io" "net/http" "github.com/gorilla/mux" @@ -15,7 +14,6 @@ import ( func initBacklinks(r *mux.Router) { r.PathPrefix("/backlinks/").HandlerFunc(handlerBacklinks) - r.PathPrefix("/backlinks-json/").HandlerFunc(handlerBacklinksJSON) } // handlerBacklinks lists all backlinks to a hypha. @@ -30,12 +28,3 @@ func handlerBacklinks(w http.ResponseWriter, rq *http.Request) { lc, user.FromRequest(rq))) } - -func handlerBacklinksJSON(w http.ResponseWriter, rq *http.Request) { - hyphaName := util.HyphaNameFromRq(rq, "backlinks") - w.WriteHeader(http.StatusOK) - _, _ = io.WriteString( - w, - views.TitleSearchJSON(hyphaName, backlinks.YieldHyphaBacklinks), - ) -} diff --git a/web/search.go b/web/search.go index 22f0ddc..729c397 100644 --- a/web/search.go +++ b/web/search.go @@ -15,7 +15,6 @@ import ( func initSearch(r *mux.Router) { r.HandleFunc("/title-search/", handlerTitleSearch) - r.HandleFunc("/title-search-json/", handlerTitleSearchJSON) } func handlerTitleSearch(w http.ResponseWriter, rq *http.Request) { @@ -37,14 +36,3 @@ func handlerTitleSearch(w http.ResponseWriter, rq *http.Request) { ), ) } - -func handlerTitleSearchJSON(w http.ResponseWriter, rq *http.Request) { - util.PrepareRq(rq) - _ = rq.ParseForm() - query := rq.FormValue("q") - w.WriteHeader(http.StatusOK) - _, _ = io.WriteString( - w, - views.TitleSearchJSON(query, shroom.YieldHyphaNamesContainingString), - ) -}