Archive/Rssmon2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert item and tag get to non-query params

Browse Source
This commit is contained in:
Bel LaPointe
2018-10-10 15:31:50 -06:00
parent f48e9e23e3
commit 7ee5f9829c
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/server.go
View File

@@ -142,15 +142,14 @@ func (s *Server) newFeed(w http.ResponseWriter, r *http.Request) {
}
func (s *Server) getFeedTag(w http.ResponseWriter, r *http.Request) {
url, err := url.ParseQuery(r.URL.RawQuery)
if err != nil {
logger.Logf("cannot get feed tag to read: %v", err)
s.mybad(w, r)
url := advance(r)
if url == "" {
s.bad(w, r)
return
}
feedBody, err := s.getFeedTagHandler(url.Get("url"))
feedBody, err := s.getFeedTagHandler(url)
if err != nil {
logger.Logf("cannot get feed tag %s: %v", url.Get("url"), err)
logger.Logf("cannot get feed tag %s: %v", url, err)
s.mybad(w, r)
return
}
@@ -158,15 +157,14 @@ func (s *Server) getFeedTag(w http.ResponseWriter, r *http.Request) {
}
func (s *Server) getFeedItem(w http.ResponseWriter, r *http.Request) {
url, err := url.ParseQuery(r.URL.RawQuery)
if err != nil {
logger.Logf("cannot get feed item to read: %v", err)
s.mybad(w, r)
url := advance(r)
if url == "" {
s.bad(w, r)
return
}
feedBody, err := s.getFeedItemHandler(url.Get("url"))
feedBody, err := s.getFeedItemHandler(url)
if err != nil {
logger.Logf("cannot get feed item %s: %v", url.Get("url"), err)
logger.Logf("cannot get feed item %s: %v", url, err)
s.mybad(w, r)
return
}

4
server/server_test.go
View File

@@ -49,10 +49,10 @@ func Test_Server(t *testing.T) {
if err := checkStatus("GET", "api/feed?url=localhost_1234", http.StatusOK); err != nil {
t.Errorf(err.Error())
}
if err := checkStatus("GET", "api/feed/item?url=localhost_1234", http.StatusOK); err != nil {
if err := checkStatus("GET", "api/feed/item/localhost_1234", http.StatusOK); err != nil {
t.Errorf(err.Error())
}
if err := checkStatus("GET", "api/feed/tag?url=b", http.StatusOK); err != nil {
if err := checkStatus("GET", "api/feed/tag/b", http.StatusOK); err != nil {
t.Errorf(err.Error())
}
syscall.Kill(syscall.Getpid(), syscall.SIGINT)