agnes/s1llyw0rdz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

quite a few things

Browse source
This commit is contained in:
m15o 2021-11-26 23:36:48 +01:00
parent e3238c54ad
commit 755e314a5f
24 changed files with 165 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
assets/style.css
View file

@ -15,8 +15,11 @@ section {
row-gap: 1em; row-gap: 1em;
} }
.status-username { a {
font-weight: bold; font-weight: bold;
}
.status-username {
margin-bottom: .5em; margin-bottom: .5em;
} }
@ -28,6 +31,26 @@ section {
margin-bottom: 1em; margin-bottom: 1em;
} }
dt {
font-weight: bold;
}
dd {
margin-bottom: 1em;
}
.profile-picture {
float: right;
}
nav {
margin-bottom: 1em;
}
h1, h2 {
margin-top: 0;
}
@media (min-width: 650px) { @media (min-width: 650px) {
.cols { .cols {
grid-template-columns: repeat(2, 1fr); grid-template-columns: repeat(2, 1fr);

2
model/user.go
View file

@ -13,6 +13,8 @@ type User struct {
Hash []byte Hash []byte
Homepage string Homepage string
About string About string
Style string
Picture string
CreatedAt time.Time CreatedAt time.Time
} }

2
storage/migration.go
View file

@ -7,7 +7,7 @@ import (
"strconv" "strconv"
) )
const schemaVersion = 3 const schemaVersion = 6
func Migrate(db *sql.DB) { func Migrate(db *sql.DB) {
var currentVersion int var currentVersion int

6
storage/sql.go
View file

@ -32,4 +32,10 @@ create table statuses
add column homepage varchar(500) not null DEFAULT '', add column homepage varchar(500) not null DEFAULT '',
add column about varchar(500) not null DEFAULT ''; add column about varchar(500) not null DEFAULT '';
`, `,
"schema_version_4": `alter table users
alter column about TYPE TEXT;`,
"schema_version_5": `alter table users
add column style TEXT not null DEFAULT '';`,
"schema_version_6": `alter table users
add column picture varchar(500) not null DEFAULT '';`,
} }

2
storage/sql/schema_version_4.sql Normal file
View file

@ -0,0 +1,2 @@
alter table users
alter column about TYPE TEXT;

2
storage/sql/schema_version_5.sql Normal file
View file

@ -0,0 +1,2 @@
alter table users
add column style TEXT not null DEFAULT '';

2
storage/sql/schema_version_6.sql Normal file
View file

@ -0,0 +1,2 @@
alter table users
add column picture varchar(500) not null DEFAULT '';

10
storage/status.go
View file

@ -70,27 +70,27 @@ func (s *Storage) StatusById(id int64) (model.Status, error) {
return status, err return status, err
} }
func (s *Storage) StatusByUsername(user string, perPage int, page int64) ([]model.Status, error) { func (s *Storage) StatusByUsername(user string, perPage int, page int64) ([]model.Status, bool, error) {
rows, err := s.db.Query(statusQueryBuilder{ rows, err := s.db.Query(statusQueryBuilder{
where: `author = $1`, where: `author = $1`,
limit: strconv.Itoa(perPage + 1), limit: strconv.Itoa(perPage + 1),
offset: `$2`, offset: `$2`,
}.build(), user, page*int64(perPage)) }.build(), user, page*int64(perPage))
if err != nil { if err != nil {
return nil, err return nil, false, err
} }
var statuses []model.Status var statuses []model.Status
for rows.Next() { for rows.Next() {
post, err := s.populateStatus(rows) post, err := s.populateStatus(rows)
if err != nil { if err != nil {
return statuses, err return nil, false, err
} }
statuses = append(statuses, post) statuses = append(statuses, post)
} }
if len(statuses) > perPage { if len(statuses) > perPage {
return statuses[0:perPage], err return statuses[0:perPage], true, err
} }
return statuses, err return statuses, false, err
} }
func (s *Storage) Statuses(page int64, perPage int) ([]model.Status, bool, error) { func (s *Storage) Statuses(page int64, perPage int) ([]model.Status, bool, error) {

10
storage/user.go
View file

@ -4,10 +4,10 @@ import (
"status/model" "status/model"
) )
const queryFindName = `SELECT name, hash, created_at, homepage, about FROM users WHERE name=lower($1);` const queryFindName = `SELECT name, hash, created_at, homepage, about, style, picture FROM users WHERE name=lower($1);`
func (s *Storage) queryUser(q string, params ...interface{}) (user model.User, err error) { func (s *Storage) queryUser(q string, params ...interface{}) (user model.User, err error) {
err = s.db.QueryRow(q, params...).Scan(&user.Name, &user.Hash, &user.CreatedAt, &user.Homepage, &user.About) err = s.db.QueryRow(q, params...).Scan(&user.Name, &user.Hash, &user.CreatedAt, &user.Homepage, &user.About, &user.Style, &user.Picture)
return return
} }
@ -77,11 +77,11 @@ func (s *Storage) DeleteUser(username string) error {
return err return err
} }
func (s *Storage) UpdateSettings(username, homepage, about string) error { func (s *Storage) UpdateSettings(username, homepage, about, style, picture string) error {
stmt, err := s.db.Prepare(`UPDATE users SET homepage = $1, about = $2 WHERE name = $3;`) stmt, err := s.db.Prepare(`UPDATE users SET homepage = $1, about = $2, style = $3, picture = $4 WHERE name = $5;`)
if err != nil { if err != nil {
return err return err
} }
_, err = stmt.Exec(homepage, about, username) _, err = stmt.Exec(homepage, about, style, picture, username)
return err return err
} }

10
web/handler/common.go
View file

@ -16,7 +16,13 @@ var TplCommonMap = map[string]string{
</head> </head>
<body> <body>
<header> <header>
<p>status ☕</p> <nav>
<a href="/">status ☕</a>
{{ if .logged }}
<a href="/settings">settings</a> <a href="/users/{{ .logged }}">{{ .logged }}</a>(<a href="/logout">logout</a>)
{{ else }}
<a href="/register">register</a> <a href="/login">login</a>
{{ end }}</nav>
</header> </header>
<main> <main>
{{ template "content" . }} {{ template "content" . }}
@ -32,7 +38,7 @@ var TplCommonMap = map[string]string{
`, `,
"status": `{{ define "status" }} "status": `{{ define "status" }}
<article class="status"> <article class="status">
<div class="status-username"><a href="/users/{{ .User }}">{{ .User }}</a>'s status, updated {{ .TimeAgo }}</div> <div class="status-username"><a href="/users/{{ .User }}">{{ .User }}</a>, {{ .TimeAgo }}</div>
<p class="status-content">{{ .Content }}</p> <p class="status-content">{{ .Content }}</p>
</article> </article>
{{ end }}`, {{ end }}`,

4
web/handler/form/settings.go
View file

@ -7,11 +7,15 @@ import (
type SettingsForm struct { type SettingsForm struct {
Homepage string Homepage string
About string About string
Style string
Picture string
} }
func NewSettingsForm(r *http.Request) *SettingsForm { func NewSettingsForm(r *http.Request) *SettingsForm {
return &SettingsForm{ return &SettingsForm{
Homepage: r.FormValue("homepage"), Homepage: r.FormValue("homepage"),
About: r.FormValue("about"), About: r.FormValue("about"),
Style: r.FormValue("style"),
Picture: r.FormValue("picture"),
} }
} }

36
web/handler/html.go
View file

@ -84,7 +84,7 @@ Are you sure you you want to delete the following status?
{{ end }} {{ end }}
<form action="/status-save" method="post"> <form action="/status-save" method="post">
<div class="field"> <div class="field">
<textarea name="content" placeholder="What's new?" required style="width: 100%; box-sizing: border-box; height: 100px;" autofocus></textarea> <textarea name="content" maxlength="140" placeholder="What's new?" required style="width: 100%; box-sizing: border-box; height: 100px;" autofocus></textarea>
</div> </div>
<input type="submit" value="Submit"> <input type="submit" value="Submit">
<h3>Update status with bookmarklet</h3> <h3>Update status with bookmarklet</h3>
@ -154,17 +154,31 @@ Are you sure you you want to delete the following status?
</div> </div>
<div class="field"> <div class="field">
<label for="about">about</label> <label for="picture">picture URL</label>
<textarea name="about" id="about">{{ .About }}</textarea> <input type="text" name="picture" id="picture" value="{{ .Picture }}" autocomplete="off"/>
</div> </div>
<div class="field">
<label for="about">about</label>
<textarea name="about" id="about" rows="20">{{ .About }}</textarea>
</div>
<div class="field">
<label for="style">style</label>
<textarea name="style" id="style" rows="20">{{ .Style }}</textarea>
</div>
<input type="submit" value="Submit"> <input type="submit" value="Submit">
</form> </form>
</section> </section>
{{ end }}`, {{ end }}`,
"user": `{{ define "content" }} "user": `{{ define "head" }}
<style>{{ .style }}</style>
{{ end }}
{{ define "content" }}
<div class="cols"> <div class="cols">
<section> <section>
<img src="{{ .picture }}" width="100" class="profile-picture"/>
<h2>{{ .user }}</h2> <h2>{{ .user }}</h2>
<dl> <dl>
<dt>Homepage</dt> <dt>Homepage</dt>
@ -178,6 +192,20 @@ Are you sure you you want to delete the following status?
{{ range .statuses }} {{ range .statuses }}
{{ template "status" . }} {{ template "status" . }}
{{ end }} {{ end }}
{{ if or .showMore (ne 0 .page) }}
<p>
{{ if ne 0 .page }}
{{ if eq 0 .prev_page }}
<a href="{{ .user }}">Newer statuses</a>
{{ else }}
<a href="{{ .user }}?page={{ .prev_page }}">Newer statuses</a>
{{ end }}
{{ end }}
{{ if .showMore }}
<a href="{{ .user }}?page={{ .next_page }}">Older statuses</a>
{{- end }}
</p>
{{ end }}
</section> </section>
</div> </div>
{{ end }}`, {{ end }}`,

8
web/handler/html/common/layout.html
View file

@ -11,7 +11,13 @@
</head> </head>
<body> <body>
<header> <header>
<p>status ☕</p> <nav>
<a href="/">status ☕</a>
{{ if .logged }}
<a href="/settings">settings</a> <a href="/users/{{ .logged }}">{{ .logged }}</a>(<a href="/logout">logout</a>)
{{ else }}
<a href="/register">register</a> <a href="/login">login</a>
{{ end }}</nav>
</header> </header>
<main> <main>
{{ template "content" . }} {{ template "content" . }}

2
web/handler/html/common/status.html
View file

@ -1,6 +1,6 @@
{{ define "status" }} {{ define "status" }}
<article class="status"> <article class="status">
<div class="status-username"><a href="/users/{{ .User }}">{{ .User }}</a>'s status, updated {{ .TimeAgo }}</div> <div class="status-username"><a href="/users/{{ .User }}">{{ .User }}</a>, {{ .TimeAgo }}</div>
<p class="status-content">{{ .Content }}</p> <p class="status-content">{{ .Content }}</p>
</article> </article>
{{ end }} {{ end }}

2
web/handler/html/index.html
View file

@ -10,7 +10,7 @@
{{ end }} {{ end }}
<form action="/status-save" method="post"> <form action="/status-save" method="post">
<div class="field"> <div class="field">
<textarea name="content" placeholder="What's new?" required style="width: 100%; box-sizing: border-box; height: 100px;" autofocus></textarea> <textarea name="content" maxlength="140" placeholder="What's new?" required style="width: 100%; box-sizing: border-box; height: 100px;" autofocus></textarea>
</div> </div>
<input type="submit" value="Submit"> <input type="submit" value="Submit">
<h3>Update status with bookmarklet</h3> <h3>Update status with bookmarklet</h3>

13
web/handler/html/settings.html
View file

@ -11,10 +11,19 @@
</div> </div>
<div class="field"> <div class="field">
<label for="about">about</label> <label for="picture">picture URL</label>
<textarea name="about" id="about">{{ .About }}</textarea> <input type="text" name="picture" id="picture" value="{{ .Picture }}" autocomplete="off"/>
</div> </div>
<div class="field">
<label for="about">about</label>
<textarea name="about" id="about" rows="20">{{ .About }}</textarea>
</div>
<div class="field">
<label for="style">style</label>
<textarea name="style" id="style" rows="20">{{ .Style }}</textarea>
</div>
<input type="submit" value="Submit"> <input type="submit" value="Submit">
</form> </form>
</section> </section>

19
web/handler/html/user.html
View file

@ -1,6 +1,11 @@
{{ define "head" }}
<style>{{ .style }}</style>
{{ end }}
{{ define "content" }} {{ define "content" }}
<div class="cols"> <div class="cols">
<section> <section>
<img src="{{ .picture }}" width="100" class="profile-picture"/>
<h2>{{ .user }}</h2> <h2>{{ .user }}</h2>
<dl> <dl>
<dt>Homepage</dt> <dt>Homepage</dt>
@ -14,6 +19,20 @@
{{ range .statuses }} {{ range .statuses }}
{{ template "status" . }} {{ template "status" . }}
{{ end }} {{ end }}
{{ if or .showMore (ne 0 .page) }}
<p>
{{ if ne 0 .page }}
{{ if eq 0 .prev_page }}
<a href="{{ .user }}">Newer statuses</a>
{{ else }}
<a href="{{ .user }}?page={{ .prev_page }}">Newer statuses</a>
{{ end }}
{{ end }}
{{ if .showMore }}
<a href="{{ .user }}?page={{ .next_page }}">Older statuses</a>
{{- end }}
</p>
{{ end }}
</section> </section>
</div> </div>
{{ end }} {{ end }}

5
web/handler/index_show.go
View file

@ -10,12 +10,13 @@ type Update struct {
} }
func (h *Handler) showIndexView(w http.ResponseWriter, r *http.Request) { func (h *Handler) showIndexView(w http.ResponseWriter, r *http.Request) {
user, _ := h.sess.Get(r)
statuses, err := h.storage.LatestStatuses() statuses, err := h.storage.LatestStatuses()
if err != nil { if err != nil {
serverError(w, err) serverError(w, err)
return return
} }
session, err := h.sess.Store.Get(r, "ichi") session, err := h.sess.Store.Get(r, "status")
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
@ -28,5 +29,5 @@ func (h *Handler) showIndexView(w http.ResponseWriter, r *http.Request) {
h.renderLayout(w, "index", map[string]interface{}{ h.renderLayout(w, "index", map[string]interface{}{
"statuses": statuses, "statuses": statuses,
"flash": flash, "flash": flash,
}, "") }, user)
} }

4
web/handler/settings_show.go
View file

@ -13,7 +13,7 @@ func (h *Handler) showSettingsView(w http.ResponseWriter, r *http.Request) {
unauthorized(w) unauthorized(w)
return return
} }
session, err := h.sess.Store.Get(r, "ichi") session, err := h.sess.Store.Get(r, "status")
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
@ -27,5 +27,7 @@ func (h *Handler) showSettingsView(w http.ResponseWriter, r *http.Request) {
"flash": flash, "flash": flash,
"About": user.About, "About": user.About,
"Homepage": user.Homepage, "Homepage": user.Homepage,
"Style": user.Style,
"Picture": user.Picture,
}, username) }, username)
} }

4
web/handler/settings-update.go → web/handler/settings_update.go
View file

@ -13,11 +13,11 @@ func (h *Handler) updateSettings(w http.ResponseWriter, r *http.Request) {
return return
} }
f := form.NewSettingsForm(r) f := form.NewSettingsForm(r)
if err := h.storage.UpdateSettings(user, f.Homepage, f.About); err != nil { if err := h.storage.UpdateSettings(user, f.Homepage, f.About, f.Style, f.Picture); err != nil {
serverError(w, err) serverError(w, err)
return return
} }
session, err := h.sess.Store.Get(r, "ichi") session, err := h.sess.Store.Get(r, "status")
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return

2
web/handler/status_edit.go
View file

@ -33,7 +33,7 @@ func (h *Handler) showEditStatusView(w http.ResponseWriter, r *http.Request) {
unauthorized(w) unauthorized(w)
return return
} }
session, err := h.sess.Store.Get(r, "ichi") session, err := h.sess.Store.Get(r, "status")
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return

2
web/handler/status_save.go
View file

@ -29,7 +29,7 @@ func (h *Handler) saveStatus(w http.ResponseWriter, r *http.Request) {
return return
} }
if r.URL.Query().Get("silent") != "1" { if r.URL.Query().Get("silent") != "1" {
session, err := h.sess.Store.Get(r, "ichi") session, err := h.sess.Store.Get(r, "status")
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return

2
web/handler/status_update.go
View file

@ -35,7 +35,7 @@ func (h *Handler) updateStatus(w http.ResponseWriter, r *http.Request) {
serverError(w, err) serverError(w, err)
return return
} }
session, err := h.sess.Store.Get(r, "ichi") session, err := h.sess.Store.Get(r, "status")
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return

31
web/handler/user_show.go
View file

@ -9,30 +9,43 @@ import (
"golang.org/x/image/font" "golang.org/x/image/font"
"golang.org/x/image/font/gofont/goregular" "golang.org/x/image/font/gofont/goregular"
"golang.org/x/image/math/fixed" "golang.org/x/image/math/fixed"
"html/template"
"image" "image"
"image/color" "image/color"
"image/draw" "image/draw"
"strconv"
//"image/png" //"image/png"
"net/http" "net/http"
) )
func (h *Handler) showUserView(w http.ResponseWriter, r *http.Request) { func (h *Handler) showUserView(w http.ResponseWriter, r *http.Request) {
var page int64 = 0
if val, ok := r.URL.Query()["page"]; ok && len(val[0]) == 1 {
page, _ = strconv.ParseInt(val[0], 10, 64)
}
username := mux.Vars(r)["user"] username := mux.Vars(r)["user"]
user, err := h.storage.UserByName(username) user, err := h.storage.UserByName(username)
if err != nil { if err != nil {
notFound(w) notFound(w)
return return
} }
statuses, err := h.storage.StatusByUsername(mux.Vars(r)["user"], 20, 0) statuses, showMore, err := h.storage.StatusByUsername(mux.Vars(r)["user"], 20, page)
if err != nil { if err != nil {
serverError(w, err) serverError(w, err)
return return
} }
h.renderLayout(w, "user", map[string]interface{}{ h.renderLayout(w, "user", map[string]interface{}{
"user": username, "user": username,
"statuses": statuses, "statuses": statuses,
"homepage": user.Homepage, "homepage": user.Homepage,
"about": user.About, "about": template.HTML(user.About),
"picture": user.Picture,
"style": template.CSS(user.Style),
"showMore": showMore,
"page": page,
"next_page": page + 1,
"prev_page": page - 1,
}, username) }, username)
} }
@ -48,7 +61,7 @@ func (h *Handler) showUserStatusView(w http.ResponseWriter, r *http.Request) {
notFound(w) notFound(w)
return return
} }
statuses, err := h.storage.StatusByUsername(mux.Vars(r)["user"], 1, 0) statuses, _, err := h.storage.StatusByUsername(mux.Vars(r)["user"], 1, 0)
if err != nil { if err != nil {
serverError(w, err) serverError(w, err)
return return
@ -113,7 +126,7 @@ func (h *Handler) showUserStatusImageView(w http.ResponseWriter, r *http.Request
notFound(w) notFound(w)
return return
} }
statuses, err := h.storage.StatusByUsername(mux.Vars(r)["user"], 1, 0) statuses, _, err := h.storage.StatusByUsername(mux.Vars(r)["user"], 1, 0)
if err != nil { if err != nil {
serverError(w, err) serverError(w, err)
return return
@ -137,11 +150,11 @@ func (h *Handler) showUserStatusImageView(w http.ResponseWriter, r *http.Request
} }
width := 350 width := 350
dc := gg.NewContext(width, 80) dc := gg.NewContext(width, 84)
dc.SetHexColor(background) dc.SetHexColor(background)
dc.Clear() dc.Clear()
dc.SetHexColor(foreground) dc.SetHexColor(foreground)
dc.DrawStringWrapped(text, 19, 16, 0, 0, float64(width-(2*16)), 1.5, gg.AlignLeft) dc.DrawStringWrapped(text, 8, 4, 0, 0, float64(width-(2*16)), 1.5, gg.AlignLeft)
dc.EncodePNG(w) dc.EncodePNG(w)
//dc.SavePNG("out.png") //dc.SavePNG("out.png")