From 7837d50fd4f7a3e85e7b243d12c1460c1dcda9e9 Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Sun, 7 Jul 2019 20:24:54 -0400 Subject: [PATCH] upon further consultation with the golden goose, tonks will henceforth be known as honk backs. --- README | 2 +- docs/changelog.txt | 2 ++ docs/manual.txt | 2 +- fun.go | 7 +++++++ honk.go | 1 + views/honk.html | 4 ++-- views/style.css | 6 +++--- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/README b/README index d9ecddf..97c9e33 100644 --- a/README +++ b/README @@ -6,7 +6,7 @@ Take control of your honks. Join the federation in the fight against the evil empire. Send honks. Receive honks. And not just honks. -Bonk, donk, tonk, all your favorite activities are here. +Bonk, donk, zonk, all your favorite activities are here. Public RSS. diff --git a/docs/changelog.txt b/docs/changelog.txt index 9f42ea7..91c61fd 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -2,6 +2,8 @@ changelog -- next ++ Tonks are now honk backs. + + Show both avatars for bonks. Other minor refinements to UI. + Minimal support for Video activity and PeerTube compat. diff --git a/docs/manual.txt b/docs/manual.txt index 43f0abe..622565c 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -14,7 +14,7 @@ Limited markdown support: Large images are rescaled and reduced. -The tonk button will prefill the forms for replies. +The honk back button will prefill the forms for replies. -- sensitive honks diff --git a/fun.go b/fun.go index 53dfbf8..90c8bde 100644 --- a/fun.go +++ b/fun.go @@ -35,6 +35,13 @@ func reverbolate(honks []*Honk) { filt := htfilter.New() for _, h := range honks { h.What += "ed" + if h.What == "tonked" { + h.What = "honked back" + h.Style = "subtle" + } + if !h.Public { + h.Style = "limited" + } if h.Whofore == 2 || h.Whofore == 3 { h.URL = h.XID h.Noise = mentionize(h.Noise) diff --git a/honk.go b/honk.go index e5aacce..5ea3057 100644 --- a/honk.go +++ b/honk.go @@ -71,6 +71,7 @@ type Honk struct { Public bool Whofore int64 HTML template.HTML + Style string Donks []*Donk } diff --git a/views/honk.html b/views/honk.html index 3243031..e854dbc 100644 --- a/views/honk.html +++ b/views/honk.html @@ -1,4 +1,4 @@ -
+
{{ $bonkcsrf := .BonkCSRF }} {{ with .Honk }}
@@ -68,7 +68,7 @@ in reply to: {{ .RID }} {{ else }} {{ end }} - + diff --git a/views/style.css b/views/style.css index febbaa7..95742d7 100644 --- a/views/style.css +++ b/views/style.css @@ -149,13 +149,13 @@ input[type=file] { .honk button { margin-left: 4em; } -.tonked { +.subtle { } -.tonked .noise { +.subtle .noise { color: #aab; font-size: 0.8em; } -.tonked .noise a { +.subtle .noise a { color: #aab; } .limited {