diff --git a/cmd/twitter/main.go b/cmd/twitter/main.go index a3ab8ee..5cc905a 100644 --- a/cmd/twitter/main.go +++ b/cmd/twitter/main.go @@ -32,7 +32,7 @@ func main() { flag.BoolVar(show_version_flag, "v", false, "") session_name := flag.String("session", "", "Name of session file to use") - addr := flag.String("addr", "localhost:1488", "port to listen on") // Random port that's probably not in use + addr := flag.String("addr", "localhost:1973", "port to listen on") // Random port that's probably not in use how_many := flag.Int("n", 50, "") flag.IntVar(how_many, "number", 50, "") diff --git a/internal/webserver/tpl/tweet_page_includes/single_tweet.tpl b/internal/webserver/tpl/tweet_page_includes/single_tweet.tpl index 1ab7907..70aefdd 100644 --- a/internal/webserver/tpl/tweet_page_includes/single_tweet.tpl +++ b/internal/webserver/tpl/tweet_page_includes/single_tweet.tpl @@ -70,24 +70,25 @@ {{end}} {{range $main_tweet.Urls}} - - - - - - - {{.Domain}} - - +
+ + + + + + + {{(.GetDomain)}} + + +
{{end}} {{range $main_tweet.Polls}} {{template "poll" .}} diff --git a/pkg/scraper/url.go b/pkg/scraper/url.go index 80334a5..fb32946 100644 --- a/pkg/scraper/url.go +++ b/pkg/scraper/url.go @@ -26,6 +26,17 @@ type Url struct { IsContentDownloaded bool `db:"is_content_downloaded"` } +func (u Url) GetDomain() string { + if u.Domain != "" { + return u.Domain + } + urlstruct, err := url.Parse(u.Text) + if err != nil { + panic(err) + } + return urlstruct.Host +} + func ParseAPIUrlCard(apiCard APICard) Url { values := apiCard.BindingValues ret := Url{}