simplify 404 checking for users
このコミットが含まれているのは:
コミット
362d53432d
|
@ -3,7 +3,6 @@ package pages
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
@ -42,20 +41,8 @@ func HandleUser(c *fiber.Ctx) error {
|
||||||
// Declare Array used for displaying data
|
// Declare Array used for displaying data
|
||||||
var userArray []User
|
var userArray []User
|
||||||
|
|
||||||
resp, err := http.Get("https://github.com/" + c.Params("user"))
|
|
||||||
if err != nil {
|
|
||||||
log.Println(err)
|
|
||||||
}
|
|
||||||
if resp.StatusCode == 404 {
|
|
||||||
// I need a better way to do this
|
|
||||||
return c.Status(404).Render("error", fiber.Map{
|
|
||||||
"error": "User " + c.Params("user") + " not found",
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// User README
|
// User README
|
||||||
var readmee string
|
var readmee string
|
||||||
|
|
||||||
err0 := requests.
|
err0 := requests.
|
||||||
URL("https://raw.githubusercontent.com/" + c.Params("user") + "/" + c.Params("user") + "/master/README.md").
|
URL("https://raw.githubusercontent.com/" + c.Params("user") + "/" + c.Params("user") + "/master/README.md").
|
||||||
ToString(&readmee).
|
ToString(&readmee).
|
||||||
|
@ -121,7 +108,7 @@ func HandleUser(c *fiber.Ctx) error {
|
||||||
sc.OnHTML("div.js-yearly-contributions", func(e *colly.HTMLElement) {
|
sc.OnHTML("div.js-yearly-contributions", func(e *colly.HTMLElement) {
|
||||||
Scrape.Contributions = e.ChildText("h2")
|
Scrape.Contributions = e.ChildText("h2")
|
||||||
})
|
})
|
||||||
} else {
|
} else if Scrape.Type == "http://schema.org/Organization" {
|
||||||
sc.OnHTML("div.container-xl div.flex-md-items-center div.flex-1", func(e *colly.HTMLElement) {
|
sc.OnHTML("div.container-xl div.flex-md-items-center div.flex-1", func(e *colly.HTMLElement) {
|
||||||
// Main info
|
// Main info
|
||||||
Scrape.Name = e.ChildText("h1.h2")
|
Scrape.Name = e.ChildText("h1.h2")
|
||||||
|
@ -146,6 +133,10 @@ func HandleUser(c *fiber.Ctx) error {
|
||||||
Scrape.OrgMembers = append(Scrape.OrgMembers, strings.TrimPrefix(el.Attr("alt"), "@"))
|
Scrape.OrgMembers = append(Scrape.OrgMembers, strings.TrimPrefix(el.Attr("alt"), "@"))
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
} else {
|
||||||
|
return c.Status(404).Render("error", fiber.Map{
|
||||||
|
"error": "User " + c.Params("user") + " not found",
|
||||||
|
})
|
||||||
}
|
}
|
||||||
sc.Visit("https://github.com/" + c.Params("user") + "/")
|
sc.Visit("https://github.com/" + c.Params("user") + "/")
|
||||||
// Fixing the output a bit
|
// Fixing the output a bit
|
||||||
|
|
読み込み中…
新しいイシューから参照