SunRed/discord-tweeter
1
0
Fork 1
Code Issues Pull requests Releases1 Packages1 Activity Actions

fix(web): Minor typo of struct and add @ in front of username

Browse source
This commit is contained in:
Manuel 2025-03-19 20:36:24 +01:00
parent 56225d85e8
commit 8ff9e56182
Signed by: Manuel
GPG key ID: 4085037435E1F07A
3 changed files with 12 additions and 12 deletions

4
pkg/web/templates/tweet.html
View file

@ -5,8 +5,8 @@
<meta name="theme-color" content="#26a7de"> <meta name="theme-color" content="#26a7de">
<link rel="canonical" href="{{ .URL }}"> <link rel="canonical" href="{{ .URL }}">
<meta property="twitter:site" content="{{ .Username }}"> <meta property="twitter:site" content="@{{ .Username }}">
<meta property="twitter:creator" content="{{ .Username }}"> <meta property="twitter:creator" content="@{{ .Username }}">
<meta property="twitter:title" content="{{ .Title }}"> <meta property="twitter:title" content="{{ .Title }}">
{{- range $idx, $e := .Images }} {{- range $idx, $e := .Images }}
<meta property="twitter:image" content="{{ $e }}"> <meta property="twitter:image" content="{{ $e }}">

4
pkg/web/templates/video.html
View file

@ -6,8 +6,8 @@
<link rel="canonical" href="{{ .URL }}"> <link rel="canonical" href="{{ .URL }}">
{{- if .Videos }} {{- if .Videos }}
<meta property="twitter:site" content="{{ .Username }}"> <meta property="twitter:site" content="@{{ .Username }}">
<meta property="twitter:creator" content="{{ .Username }}"> <meta property="twitter:creator" content="@{{ .Username }}">
{{- range $idx, $e := .Videos }} {{- range $idx, $e := .Videos }}
<meta property="twitter:player:stream" content="{{ $e }}"> <meta property="twitter:player:stream" content="{{ $e }}">
<meta property="og:video" content="{{ $e }}"> <meta property="og:video" content="{{ $e }}">

16
pkg/web/web.go
View file

@ -23,7 +23,7 @@ const (
//go:embed templates/*.html //go:embed templates/*.html
var templateFiles embed.FS var templateFiles embed.FS
type Reponse struct { type Response struct {
StatusCode int StatusCode int
ContentType string ContentType string
Content string Content string
@ -34,7 +34,7 @@ type WebServer struct {
scraper *ts.Scraper scraper *ts.Scraper
templates *template.Template templates *template.Template
avatarCache *cache.Cache[string, string] avatarCache *cache.Cache[string, string]
responseCache *cache.Cache[string, Reponse] responseCache *cache.Cache[string, Response]
Server *http.Server Server *http.Server
} }
@ -64,7 +64,7 @@ func New(config *config.Config, scraper *ts.Scraper) (*WebServer, error) {
scraper, scraper,
tmpl, tmpl,
cache.New[string, string](), cache.New[string, string](),
cache.New[string, Reponse](), cache.New[string, Response](),
&http.Server{ &http.Server{
Handler: sm, Handler: sm,
Addr: fmt.Sprintf(":%d", config.WebPort), Addr: fmt.Sprintf(":%d", config.WebPort),
@ -130,7 +130,7 @@ func (ws WebServer) handleTemplate(w http.ResponseWriter, r *http.Request, id st
} }
if !slices.Contains(ws.config.Channels, tweet.Username) { if !slices.Contains(ws.config.Channels, tweet.Username) {
res := Reponse{http.StatusBadRequest, "text/plain", "Bad Request"} res := Response{http.StatusBadRequest, "text/plain", "Bad Request"}
ws.responseCache.Set(template+"-"+id, res, TweetCacheTime) ws.responseCache.Set(template+"-"+id, res, TweetCacheTime)
response(w, res) response(w, res)
return return
@ -182,7 +182,7 @@ func (ws WebServer) handleTemplate(w http.ResponseWriter, r *http.Request, id st
return return
} }
res := Reponse{http.StatusOK, "text/html", tpl.String()} res := Response{http.StatusOK, "text/html", tpl.String()}
ws.responseCache.Set(template+"-"+id, res, TweetCacheTime) ws.responseCache.Set(template+"-"+id, res, TweetCacheTime)
response(w, res) response(w, res)
} }
@ -197,14 +197,14 @@ func validUserAgent(ua string, uas []string) bool {
} }
func badRequest(w http.ResponseWriter) { func badRequest(w http.ResponseWriter) {
response(w, Reponse{http.StatusBadRequest, "text/plain", "Bad Request"}) response(w, Response{http.StatusBadRequest, "text/plain", "Bad Request"})
} }
func serverError(w http.ResponseWriter) { func serverError(w http.ResponseWriter) {
response(w, Reponse{http.StatusInternalServerError, "text/plain", "Internal Server Error"}) response(w, Response{http.StatusInternalServerError, "text/plain", "Internal Server Error"})
} }
func response(w http.ResponseWriter, res Reponse) { func response(w http.ResponseWriter, res Response) {
w.WriteHeader(res.StatusCode) w.WriteHeader(res.StatusCode)
w.Header().Set("Content-Type", res.ContentType) w.Header().Set("Content-Type", res.ContentType)
fmt.Fprint(w, res.Content) fmt.Fprint(w, res.Content)