mirror of
https://github.com/writeas/htmlhouse
synced 2025-07-18 21:08:16 +00:00
Make thumbnails host configurable
This commit is contained in:
parent
c001ce6eea
commit
d924964b36
@ -52,6 +52,7 @@ DB_USER=dbuser DB_PASSWORD=pass DB_DB=htmlhouse PRIVATE_KEY=keys/dev PUBLIC_KEY=
|
||||
| `PORT` | Port to run app on | `8080` |
|
||||
| `STATIC_DIR` | Relative dir where static files are stored | `static` |
|
||||
| `AUTO_APPROVE` | Automatically approves public posts | false |
|
||||
| `PREVIEWS_HOST` | Fully-qualified URL (without trailing slash) of screenshot server | None. |
|
||||
| `TWITTER_KEY` | Twitter consumer key | `notreal` |
|
||||
| `TWITTER_SECRET` | Twitter consumer secret | `notreal` |
|
||||
| `TWITTER_TOKEN` | Twitter access token of the posting Twitter account | `notreal` |
|
||||
|
@ -18,9 +18,10 @@ type config struct {
|
||||
HostName string `env:"key=HOST default=https://html.house"`
|
||||
ServerPort int `env:"key=PORT default=8080"`
|
||||
|
||||
AutoApprove bool `env:"key=AUTO_APPROVE default=false"`
|
||||
AdminPass string `env:"key=ADMIN_PASS default=uhoh"`
|
||||
BrowseItems int `env:"key=BROWSE_ITEMS default=10"`
|
||||
AutoApprove bool `env:"key=AUTO_APPROVE default=false"`
|
||||
PreviewsHost string `env:"key=PREVIEWS_HOST`
|
||||
AdminPass string `env:"key=ADMIN_PASS default=uhoh"`
|
||||
BrowseItems int `env:"key=BROWSE_ITEMS default=10"`
|
||||
|
||||
// Twitter configuration
|
||||
TwitterConsumerKey string `env:"key=TWITTER_KEY default=notreal"`
|
||||
|
@ -89,7 +89,7 @@ func addPublicAccess(app *app, houseID, html string) error {
|
||||
data := url.Values{}
|
||||
data.Set("url", fmt.Sprintf("%s/%s.html", app.cfg.HostName, houseID))
|
||||
|
||||
u, err := url.ParseRequestURI("https://peeper.html.house")
|
||||
u, err := url.ParseRequestURI(app.cfg.PreviewsHost)
|
||||
u.Path = "/"
|
||||
urlStr := fmt.Sprintf("%v", u)
|
||||
|
||||
|
17
models.go
17
models.go
@ -7,13 +7,14 @@ import (
|
||||
|
||||
type (
|
||||
PublicHouse struct {
|
||||
ID string `json:"id"`
|
||||
Title string `json:"title"`
|
||||
URL string `json:"url"`
|
||||
ThumbURL string `json:"thumb_url"`
|
||||
Created time.Time `json:"created"`
|
||||
Updated time.Time `json:"updated"`
|
||||
Views int `json:"views"`
|
||||
ID string `json:"id"`
|
||||
Title string `json:"title"`
|
||||
URL string `json:"url"`
|
||||
thumbHost string `json:"-"`
|
||||
ThumbURL string `json:"thumb_url"`
|
||||
Created time.Time `json:"created"`
|
||||
Updated time.Time `json:"updated"`
|
||||
Views int `json:"views"`
|
||||
}
|
||||
|
||||
HouseStats struct {
|
||||
@ -30,6 +31,6 @@ type (
|
||||
func (h *PublicHouse) process(app *app) {
|
||||
h.URL = fmt.Sprintf("%s/%s.html", app.cfg.HostName, h.ID)
|
||||
if h.ThumbURL != "" {
|
||||
h.ThumbURL = "https://peeper.html.house/" + h.ThumbURL
|
||||
h.ThumbURL = fmt.Sprintf("%s/%s", app.cfg.PreviewsHost, h.ThumbURL)
|
||||
}
|
||||
}
|
||||
|
@ -39,7 +39,7 @@
|
||||
</header>
|
||||
|
||||
{{ range .Houses }}<div class="open-house">
|
||||
<a href="/{{.ID}}.html"><img src="https://peeper.html.house/{{.ThumbURL}}" />
|
||||
<a href="/{{.ID}}.html"><img src="{{.thumbHost}}/{{.ThumbURL}}" />
|
||||
<div class="house-name">{{.Title}}</div></a>
|
||||
</div>{{end}}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user