From f6a50eee26428d3ebaae8d51795654e5fc4f8b3e Mon Sep 17 00:00:00 2001 From: m15o Date: Fri, 24 Dec 2021 12:27:11 +0100 Subject: [PATCH] Adding TOS --- go.mod | 3 +- go.sum | 14 ------ web/handler/handler.go | 2 +- web/handler/html.go | 54 +++++++--------------- web/handler/html/index.html | 8 ++-- web/handler/html/intro.html | 32 ------------- web/handler/html/login.html | 1 - web/handler/html/register.html | 1 + web/handler/html/tos.html | 12 +++++ web/handler/{intro_show.go => tos_show.go} | 4 +- web/handler/tpl.go | 2 +- web/web.go | 2 +- 12 files changed, 40 insertions(+), 95 deletions(-) delete mode 100644 web/handler/html/intro.html create mode 100644 web/handler/html/tos.html rename web/handler/{intro_show.go => tos_show.go} (66%) diff --git a/go.mod b/go.mod index 034aa9d..7c35bf4 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,9 @@ go 1.16 require ( github.com/fogleman/gg v1.3.0 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 - github.com/gorilla/csrf v1.7.1 // indirect + github.com/gorilla/csrf v1.7.1 github.com/gorilla/mux v1.8.0 github.com/gorilla/sessions v1.2.1 - github.com/kr/pretty v0.3.0 // indirect github.com/lib/pq v1.10.4 golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 golang.org/x/image v0.0.0-20211028202545-6944b10bf410 diff --git a/go.sum b/go.sum index a940c36..2f4ae9c 100644 --- a/go.sum +++ b/go.sum @@ -1,31 +1,19 @@ -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/gorilla/csrf v1.7.1 h1:Ir3o2c1/Uzj6FBxMlAUB6SivgVMy1ONXwYgXn+/aHPE= github.com/gorilla/csrf v1.7.1/go.mod h1:+a/4tCmqhG6/w4oafeAZ9pEa3/NZOWYVbD9fV0FwIQA= -github.com/gorilla/feeds v1.1.1 h1:HwKXxqzcRNg9to+BbvJog4+f3s/xzvtZXICcQGutYfY= -github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 h1:/pEO3GD/ABYAjuakUS6xSEmmlyVS4kxBNkeA9tLJiTI= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ= @@ -37,5 +25,3 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= diff --git a/web/handler/handler.go b/web/handler/handler.go index 8726542..5d7d042 100644 --- a/web/handler/handler.go +++ b/web/handler/handler.go @@ -75,7 +75,7 @@ func New(cfg *config.Config, sess *session.Session, data *storage.Storage) (http router.HandleFunc("/current-status.js", h.showCurrentStatusJSView).Methods(http.MethodGet) router.HandleFunc("/current-status", h.showCurrentStatusView).Methods(http.MethodGet) router.HandleFunc("/manage", h.showManageView).Methods(http.MethodGet) - router.HandleFunc("/intro", h.showIntroView).Methods(http.MethodGet) + router.HandleFunc("/tos", h.showTOSView).Methods(http.MethodGet) router.HandleFunc("/about/status-updater", h.showStatusUpdaterView).Methods(http.MethodGet) router.HandleFunc("/users/{user}.atom", h.showAtomView).Methods(http.MethodGet) router.HandleFunc("/users/{user}", h.showUserView).Methods(http.MethodGet) diff --git a/web/handler/html.go b/web/handler/html.go index 2c089a2..68719c1 100644 --- a/web/handler/html.go +++ b/web/handler/html.go @@ -161,10 +161,10 @@ var TplMap = map[string]string{ {{ .csrfField }} {{ template "status_form" .status }} - +

+ status updater bookmarklet
+ status widget for your homepage +

Subscribe via Atom

{{ else }}

Welcome!

@@ -184,38 +184,6 @@ var TplMap = map[string]string{ {{ end }} `, - "intro": `{{ define "content" }} -
-

Introduction

-

- Welcome! You've just found a little internet tool that lets you set your current status - and see the status of others. -

- -

Your status

-

- Once you've registered, you will be able to set your current status. A status is anything you are currently doing, - on your mind, or that you think about. It can be your mood, the song you are listening to, the book you are reading, or the new - cool link you've just found. A status has a maximum length of 140 characters and can be updated as often as you'd like. -

-

Status updater

-

- Use the status updater bookmarklet to update your status from anywhere, and capture all your feelings on your - profile page. -

-

Homepage widgets

-

Current Status Widget

-

Status Feed Widget

- -

Use the current status widget to display your latest status directly on - homepage, or the status feed widget to display the last few ones. -

-

- Use the status updater bookmarklet to update your status from anywhere, and capture all your feelings on your - profile page, which aggregates all your statuses. You can fully customize it with CSS and HTML. Make it yours! -

-
-{{ end }}`, "login": `{{ define "content" }}

Login

@@ -232,7 +200,6 @@ var TplMap = map[string]string{ -
@@ -295,6 +262,7 @@ var TplMap = map[string]string{ +

By clicking the following button you agree to our Terms of Service.

@@ -372,6 +340,18 @@ var TplMap = map[string]string{

That's it! From now on, whenever you want to update your status, click the status updater button from your bookmarks and a pop-up window will launch to let you update it.

+{{ end }}`, + "tos": `{{ define "content" }} +
+

Terms of service

+

In order to use Status Cafe, you must agree to the following rules. A user not respecting these rules will have their account removed and will be banned from the service. The general rule is to be nice, friendly and respectful to anyone and their status.

+

Racist, bigoted or otherwise hate speech is not permitted. Status Cafe is an inclusive place that will not tolerate anyone promoting hateful ideas and language.

+

Illegal activities such as promoting malware, phishing or publishing something that promotes content that infringes copyright, patent or trademark you do not own is not permitted.

+

Pornographic content is not allowed.

+

Spamming, including unsolicited advertising isn't allowed. While it's perfectly fine to talk about your projects and link them, using Status Cafe only as a way to drive traffic to an external site isn't allowed.

+

Harassing, bullying, picking on a user isn't permitted.

+

Revealing information (doxing) from a user isn't allowed.

+
{{ end }}`, "user": `{{ define "head" }} diff --git a/web/handler/html/index.html b/web/handler/html/index.html index bfffc03..23ca61e 100644 --- a/web/handler/html/index.html +++ b/web/handler/html/index.html @@ -10,10 +10,10 @@ {{ .csrfField }} {{ template "status_form" .status }} - +

+ status updater bookmarklet
+ status widget for your homepage +

Subscribe via Atom

{{ else }}

Welcome!

diff --git a/web/handler/html/intro.html b/web/handler/html/intro.html deleted file mode 100644 index b25faa7..0000000 --- a/web/handler/html/intro.html +++ /dev/null @@ -1,32 +0,0 @@ -{{ define "content" }} -
-

Introduction

-

- Welcome! You've just found a little internet tool that lets you set your current status - and see the status of others. -

- -

Your status

-

- Once you've registered, you will be able to set your current status. A status is anything you are currently doing, - on your mind, or that you think about. It can be your mood, the song you are listening to, the book you are reading, or the new - cool link you've just found. A status has a maximum length of 140 characters and can be updated as often as you'd like. -

-

Status updater

-

- Use the status updater bookmarklet to update your status from anywhere, and capture all your feelings on your - profile page. -

-

Homepage widgets

-

Current Status Widget

-

Status Feed Widget

- -

Use the current status widget to display your latest status directly on - homepage, or the status feed widget to display the last few ones. -

-

- Use the status updater bookmarklet to update your status from anywhere, and capture all your feelings on your - profile page, which aggregates all your statuses. You can fully customize it with CSS and HTML. Make it yours! -

-
-{{ end }} \ No newline at end of file diff --git a/web/handler/html/login.html b/web/handler/html/login.html index dc2c85d..ca74c0c 100644 --- a/web/handler/html/login.html +++ b/web/handler/html/login.html @@ -14,7 +14,6 @@ -
diff --git a/web/handler/html/register.html b/web/handler/html/register.html index 26e183b..905fdd8 100644 --- a/web/handler/html/register.html +++ b/web/handler/html/register.html @@ -30,6 +30,7 @@ +

By clicking the following button you agree to our Terms of Service.

diff --git a/web/handler/html/tos.html b/web/handler/html/tos.html new file mode 100644 index 0000000..23e9bd3 --- /dev/null +++ b/web/handler/html/tos.html @@ -0,0 +1,12 @@ +{{ define "content" }} +
+

Terms of service

+

In order to use Status Cafe, you must agree to the following rules. A user not respecting these rules will have their account removed and will be banned from the service. The general rule is to be nice, friendly and respectful to anyone and their status.

+

Racist, bigoted or otherwise hate speech is not permitted. Status Cafe is an inclusive place that will not tolerate anyone promoting hateful ideas and language.

+

Illegal activities such as promoting malware, phishing or publishing something that promotes content that infringes copyright, patent or trademark you do not own is not permitted.

+

Pornographic content is not allowed.

+

Spamming, including unsolicited advertising isn't allowed. While it's perfectly fine to talk about your projects and link them, using Status Cafe only as a way to drive traffic to an external site isn't allowed.

+

Harassing, bullying, picking on a user isn't permitted.

+

Revealing information (doxing) from a user isn't allowed.

+
+{{ end }} \ No newline at end of file diff --git a/web/handler/intro_show.go b/web/handler/tos_show.go similarity index 66% rename from web/handler/intro_show.go rename to web/handler/tos_show.go index fccb7db..9388b29 100644 --- a/web/handler/intro_show.go +++ b/web/handler/tos_show.go @@ -2,9 +2,9 @@ package handler import "net/http" -func (h *Handler) showIntroView(w http.ResponseWriter, r *http.Request) { +func (h *Handler) showTOSView(w http.ResponseWriter, r *http.Request) { user, _ := h.getUser(r) - h.renderLayout(w, "intro", nil, user) + h.renderLayout(w, "tos", nil, user) } func (h *Handler) showStatusUpdaterView(w http.ResponseWriter, r *http.Request) { diff --git a/web/handler/tpl.go b/web/handler/tpl.go index 9c9ccdd..0a1d6bc 100644 --- a/web/handler/tpl.go +++ b/web/handler/tpl.go @@ -16,7 +16,7 @@ func (h *Handler) initTpl() { for name, content := range TplMap { views[name] = template.Must(template.New("main").Funcs(template.FuncMap{ "faces": func() []string { - return []string{"🙂", "😎", "😛", "🥰", "❤️", "👽", "😱", "🤔", "😯", "🤒", "😡", "🥺", "🥳", "🤖", "💀", "😴", "😭", "🤐", "🤢", "👀", "☕", "🍺", "📖", "🔥", "❄️", "✨", "💡", "🎶", "✈️", "🚄", "🍿", "📰", "✏️", "🍱", "🎄", "🎁", "🌧️", "🌙", "🎨", "📺", "🍕", "✅"} + return []string{"🙂", "😎", "😛", "🥰", "❤️", "👽", "😱", "🤔", "😯", "🤒", "😡", "🥺", "🥳", "🤖", "💀", "😴", "😭", "🤐", "💾", "👀", "☕", "🍺", "📖", "🔥", "❄️", "✨", "💡", "🎶", "✈️", "🚄", "🍿", "📰", "✏️", "🍱", "🎄", "🎁", "🌧️", "🌙", "🎨", "📺", "🍕", "✅"} }}).Parse(commonTemplates + content)) } } diff --git a/web/web.go b/web/web.go index b081e41..72f280a 100644 --- a/web/web.go +++ b/web/web.go @@ -19,6 +19,6 @@ func Serve(data *storage.Storage, cfg *config.Config) error { log.Fatal(err) } fmt.Printf("Starting HTTP server on port 8000\n") - err = http.ListenAndServe(":8000", csrf.Protect([]byte("32-byte-long-auth-key"))(s)) + err = http.ListenAndServe(":8000", csrf.Protect([]byte("32-byte-long-auth-key"), csrf.MaxAge(0))(s)) return err }