commento.js: use a event listener in CSS overrides

Closes https://gitlab.com/commento/commento/-/issues/302

.gitlab-ci.yml

@@ -1,24 +1,11 @@
 stages:
-  - check-dco
   - go-fmt
   - go-test
   - build-src
-  - aws-upload-tags
   - build-docker
   - docker-registry-master
   - docker-registry-tags
 
-check-dco:
-  stage: check-dco
-  image: debian:buster
-  except:
-    - master
-    - tags
-  script:
-    - apt update
-    - apt install -y curl git jq
-    - bash ./scripts/check-dco
-
 build-src:
   stage: build-src
   image: debian:buster
@@ -34,25 +21,6 @@ build-src:
     - make devel
     - make prod
 
-aws-upload-tags:
-  stage: aws-upload-tags
-  image: debian:buster
-  environment: aws-upload-tags
-  variables:
-    AWS_ACCESS_KEY_ID: $AWS_ACCESS_KEY_ID
-    AWS_SECRET_ACCESS_KEY: $AWS_SECRET_ACCESS_KEY
-  only:
-    - tags
-  before_script:
-    - bash $CI_PROJECT_DIR/scripts/gitlab-ci-build-prescript
-  script:
-    - export GOPATH=/go
-    - export PATH=$PATH:/go/bin
-    - cd /go/src/$CI_PROJECT_NAME
-    - make prod
-    - cd build/prod && tar -zcvf /commento-linux-amd64-$(git describe --tags).tar.gz .
-    - aws s3 cp /commento-linux-amd64-$(git describe --tags).tar.gz s3://commento-release/
-
 build-docker:
   stage: build-docker
   image: docker:stable
@@ -66,7 +34,7 @@ build-docker:
 
 go-test:
   stage: go-test
-  image: golang:1.10.2
+  image: golang:1.14
   services:
     - postgres:latest
   variables:
@@ -81,7 +49,6 @@ go-test:
     - mkdir -p /go/src /go/bin /go/pkg
     - export GOPATH=/go
     - export PATH=$PATH:/go/bin
-    - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
     - ln -s $CI_PROJECT_DIR /go/src/$CI_PROJECT_NAME
   script:
     - cd /go/src/$CI_PROJECT_NAME
@@ -89,7 +56,7 @@ go-test:
 
 go-fmt:
   stage: go-fmt
-  image: golang:1.10.2
+  image: golang:1.14
   except:
     - master
     - tags

Dockerfile

@@ -1,66 +1,48 @@
 # backend build (api server)
-FROM golang:1.10.2-alpine AS api-build
+FROM golang:1.14-alpine AS api-build
+RUN apk add --no-cache --update bash dep make git curl g++
 
-COPY ./api /go/src/commento/api
+COPY ./api /go/src/commento/api/
 WORKDIR /go/src/commento/api
-
-RUN apk update && apk add bash make git curl
-RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-
 RUN make prod -j$(($(nproc) + 1))
 
 
 # frontend build (html, js, css, images)
-FROM node:10.3.0-alpine AS frontend-build
+FROM node:10-alpine AS frontend-build
+RUN apk add --no-cache --update bash make python2 g++
 
-COPY ./frontend /commento/frontend/
+COPY ./frontend /commento/frontend
 WORKDIR /commento/frontend/
-
-RUN apk update && apk add bash make
-RUN npm install -g html-minifier@3.5.7 uglify-js@3.4.1 sass@1.5.1
-
 RUN make prod -j$(($(nproc) + 1))
 
 
-# templates build
-FROM alpine:3.7 AS templates-build
+# templates and db build
+FROM alpine:3.9 AS templates-db-build
+RUN apk add --no-cache --update bash make
 
 COPY ./templates /commento/templates
 WORKDIR /commento/templates
-
-RUN apk update && apk add bash make
-
 RUN make prod -j$(($(nproc) + 1))
 
-
-# db build
-FROM alpine:3.7 AS db-build
-
 COPY ./db /commento/db
 WORKDIR /commento/db
-
-RUN apk update && apk add bash make
-
 RUN make prod -j$(($(nproc) + 1))
 
 
 # final image
 FROM alpine:3.7
+RUN apk add --no-cache --update ca-certificates
 
 COPY --from=api-build /go/src/commento/api/build/prod/commento /commento/commento
+COPY --from=frontend-build /commento/frontend/build/prod/js /commento/js
+COPY --from=frontend-build /commento/frontend/build/prod/css /commento/css
+COPY --from=frontend-build /commento/frontend/build/prod/images /commento/images
+COPY --from=frontend-build /commento/frontend/build/prod/fonts /commento/fonts
 COPY --from=frontend-build /commento/frontend/build/prod/*.html /commento/
-COPY --from=frontend-build /commento/frontend/build/prod/css/*.css /commento/css/
-COPY --from=frontend-build /commento/frontend/build/prod/js/*.js /commento/js/
-COPY --from=frontend-build /commento/frontend/build/prod/images/* /commento/images/
-COPY --from=frontend-build /commento/frontend/build/prod/fonts/* /commento/fonts/
-COPY --from=templates-build /commento/templates/build/prod/templates/ /commento/templates/
-COPY --from=db-build /commento/db/build/prod/db/ /commento/db/
-
-RUN apk update && apk add ca-certificates --no-cache
+COPY --from=templates-db-build /commento/templates/build/prod/templates /commento/templates/
+COPY --from=templates-db-build /commento/db/build/prod/db /commento/db/
 
 EXPOSE 8080
-
 WORKDIR /commento/
-
 ENV COMMENTO_BIND_ADDRESS="0.0.0.0"
 ENTRYPOINT ["/commento/commento"]

README.md

@@ -1,90 +1,21 @@
-<p align="center">
-<a href="https://commento.io"><img src="https://user-images.githubusercontent.com/7521600/33375172-14b21f68-d52f-11e7-9b30-477682bccf8f.png" width=300></a>
-</p>
+### Commento
 
-<p align="center"><b>A bloat-free and privacy-focused discussion platform.</b></p>
+##### [Homepage](https://commento.io) &nbsp;&ndash;&nbsp; [Demo](https://demo.commento.io) &nbsp;&ndash;&nbsp; [Documentation](https://docs.commento.io) &nbsp;&ndash;&nbsp; [Contributing](https://docs.commento.io/contributing/) &nbsp;&ndash;&nbsp; [#commento on Freenode](http://webchat.freenode.net/?channels=%23commento)
 
-### What is Commento?
+Commento is a platform that you can embed in your website to allow your readers to add comments. It's reasonably fast lightweight. Supports markdown, import from Disqus, voting, automated spam detection, moderation tools, sticky comments, thread locking, OAuth login, single sign-on, and email notifications.
 
-Commento allows you to foster discussion on your website &ndash; if you have a blog, you can embed Commento if you want your readers to add comments. It's fast and bloat-free, has a modern interface, and is reasonably secure. Unlike most alternatives, Commento is lightweight and privacy-focused; I'll never sell your data, show ads, embed third-party tracking scripts, or inject affiliate links.
+###### How is this different from Disqus, Facebook Comments, and the rest?
 
-### Frequently Asked Questions
+Most other products in this space do not respect your privacy; showing ads is their primary business model and that nearly always comes at the users' cost. Commento has no ads; you're the customer, not the product. While Commento is [free software](https://www.gnu.org/philosophy/free-sw.en.html), in order to keep the service sustainable, the [hosted cloud version](https://commento.io) is not offered free of cost. Commento is also orders of magnitude lighter than alternatives.
 
-**I don't want to install and manage Commento on a server.**  
-You can use [Commento.io](https://commento.io), the cloud version of Commento, where I do the server hosting, updates, and security and performance tuning for you. To make the hosted service self-sustainable, it is not free. You may choose the plan that best matches your financial situation and needs &ndash; all plans have all features.
+###### Why should I care about my readers' privacy?
 
-**What features does Commento have?**  
-Commento comes with a lot of useful features out-of-the-box: rich text support, upvotes and downvotes, automatic spam detection, moderation tools, sticky comments, thread locking, OAuth login, email notifications, and more!
+For starters, your readers value their privacy. Not caring about them is disrespectful and you will end up alienating your audience; they won't come back. Disqus still isn't GDPR-compliant (according to their <a href="https://help.disqus.com/terms-and-policies/privacy-faq" title="At the time of writing (28 December 2018)" rel="nofollow">privacy policy</a>). Disqus adds megabytes to your page size; what happens when a random third-party script that is injected into your website turns malicious?
 
-**What does Commento look like? Do you have a demo?**  
-Check out [demo.commento.io](https://demo.commento.io) to play around with a live demo of Commento.
+#### Installation
 
-**How is Commento different from Disqus, Facebook Comments, and the rest?**  
-Most other products in this space do not respect your privacy; showing adverts is their primary business model and that nearly always comes at the users' cost. There is no free lunch. Commento is also orders of magnitude lighter than alternatives &ndash; while Disqus and Facebook take megabytes of download to load, Commento is just 11 kB.
+Read the [documentation to get started](https://docs.commento.io/installation/).
 
-**Is Commento free software?**  
-Yes. Commento is made [freely available](https://gitlab.com/commento/commento) under the [MIT license](https://gitlab.com/commento/commento/blob/master/LICENSE). And it will always stay that way.
+#### Contributing
 
-**Disqus has a free plan. Why is the [cloud version](https://commento.io) not free of cost?**  
-When I say Commento is free, I mean [free as in freedom](https://www.gnu.org/philosophy/free-sw.en.html). The cloud version is not offered free of cost because servers cost money and offering the service for free would not be sustainable. Unlike most alternatives, Commento does not operate on adverts and shady tactics; you're the customer, not the product.
-
-**I have nothing to hide. Why should I care about my privacy?**  
-The thing about privacy is that once you give up control over your information, you can't get it back. You may be fine with having your personal information sold to unknown third-parties today, but when your insurance company uses this information against you tomorrow, you'll regret it. And you'll have no recourse to correct this. Read [this Wikipedia article](https://en.wikipedia.org/wiki/Nothing_to_hide_argument) for more information.
-
-<div><p style="margin: 0px 0px"><b>As a blog owner, why should I worry about my readers' privacy?</b><br>
-Good question. For starters, your readers value their privacy. Not caring about them is disrespectful and you will end up alienating your audience; they won't come back. But even if you ignore this, you have bigger questions to answer:</p>
-<ul>
- <li><b>Legality</b>: Did you know that Disqus still isn't GDPR-compliant (according to their <a href="https://help.disqus.com/terms-and-policies/privacy-faq" title="At the time of writing (28 December 2018)" rel="nofollow">privacy policy</a>)?</li>
- <li><b>Security</b>: What happens when a random third-party script is injected into your website?</li>
- <li><b>Performance</b>: Did you know that half a second increase in page load time results in a 20% decrease in  engagement and site traffic?</li>
- <li><b>Ownership</b>: Who owns the content when your readers create comments?</li>
-</ul></div>
-
-**Who's behind this? Are you an evil corporation?**  
-My name is <a href="https://adtac.in">Adhityaa</a>, and I created the project. As someone who's still a student, I promise you I'm neither evil nor a corporation. But I'm not the only one &ndash; dozens of people have contributed to the project and Commento would not exist without these wonderful people.
-
-**Okay, how do I get started?**  
-Glad you asked! You have two options &ndash; self-hosting Commento on your own server or using the [cloud  version](https://commento.io). Start [from here](https://docs.commento.io/getting-started/) to decide which option is right for you and proceed from there.
-
-### Installation
-
-See our [documentation on how to install Commento](https://docs.commento.io/installation/) to get started.
-
-### Contributing
-
-Commento is possible only because of its community. If this is your first contribution to Commento, please go through the [documentation](https://docs.commento.io/contributing/) before you begin.
-
-Help will always be given to those who ask for it. We use IRC for chat to collaborate with other developers. You're invited to [hang out with us](https://irc.commento.io) in the `#commento-dev` channel on freenode if you want to contribute to Commento!
-
-### Sponsors
-
-Commento development is partially sponsored by [Mozilla](https://mozilla.org) and [DigitalOcean](https://www.digitalocean.com/) independently.
-
-<p align="center">
-<a href="https://www.mozilla.org/en-US/"><img src="https://user-images.githubusercontent.com/7521600/32265838-d05b2d08-bf0a-11e7-92e1-2cb183eae616.png" title="Mozilla" height="40"></a>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-<a href="https://www.digitalocean.com"><img src="https://user-images.githubusercontent.com/7521600/32265839-d093c7da-bf0a-11e7-8d99-96a940041d06.png" title="DigitalOcean" height="40"></a>
-</p>
-
-### License
-
-```
-Copyright 2018 Commento, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-```
+If this is your first contribution to Commento, please go through the [contribution guidelines](https://docs.commento.io/contributing/) before you begin. If you have any questions, join [#commento on Freenode](http://webchat.freenode.net/?channels=%23commento).

api/Gopkg.lock

@@ -1,181 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  digest = "1:5c3894b2aa4d6bead0ceeea6831b305d62879c871780e7b76296ded1b004bc57"
-  name = "cloud.google.com/go"
-  packages = ["compute/metadata"]
-  pruneopts = "UT"
-  revision = "64a2037ec6be8a4b0c1d1f706ed35b428b989239"
-  version = "v0.26.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:9769b231d8f5ff406a012aa7f293e45ed69d11617832a1c3c7b8c6ce1558a2a1"
-  name = "github.com/adtac/go-akismet"
-  packages = ["akismet"]
-  pruneopts = "UT"
-  revision = "0ca9e1023047c869ecd4bd3c20780511597a4a77"
-
-[[projects]]
-  digest = "1:15042ad3498153684d09f393bbaec6b216c8eec6d61f63dff711de7d64ed8861"
-  name = "github.com/golang/protobuf"
-  packages = ["proto"]
-  pruneopts = "UT"
-  revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
-  version = "v1.1.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:d03d0fae6a7a80e89c540787a69ab6e0d3b773fdb3303c0b3d96a15490c6ef32"
-  name = "github.com/gomodule/oauth1"
-  packages = ["oauth"]
-  pruneopts = "UT"
-  revision = "9a59ed3b0a84f454c260f2f8f82918223fc5630f"
-
-[[projects]]
-  digest = "1:c79fb010be38a59d657c48c6ba1d003a8aa651fa56b579d959d74573b7dff8e1"
-  name = "github.com/gorilla/context"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"
-  version = "v1.1.1"
-
-[[projects]]
-  digest = "1:664d37ea261f0fc73dd17f4a1f5f46d01fbb0b0d75f6375af064824424109b7d"
-  name = "github.com/gorilla/handlers"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"
-  version = "v1.4.0"
-
-[[projects]]
-  digest = "1:e73f5b0152105f18bc131fba127d9949305c8693f8a762588a82a48f61756f5f"
-  name = "github.com/gorilla/mux"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"
-  version = "v1.6.2"
-
-[[projects]]
-  digest = "1:37ce7d7d80531b227023331002c0d42b4b4b291a96798c82a049d03a54ba79e4"
-  name = "github.com/lib/pq"
-  packages = [
-    ".",
-    "oid",
-  ]
-  pruneopts = "UT"
-  revision = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"
-
-[[projects]]
-  digest = "1:9fb8ccf24ca918be80e6129761cf232de0c142537f8d9eeb7a3a779a7f38fdd4"
-  name = "github.com/lunny/html2md"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "13aaeeae9fb293668db3ef1e145064684735f3ce"
-
-[[projects]]
-  digest = "1:a1f5a38c6c82d8f1e8a7b9fb9ea8b125b17188cdfb38f2cd08055ff9b51f5ec4"
-  name = "github.com/microcosm-cc/bluemonday"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "dafebb5b6ff2861a0d69af64991e10866c19be85"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:5b3b29ce0e569f62935d9541dff2e16cc09df981ebde48e82259076a73a3d0c7"
-  name = "github.com/op/go-logging"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "b2cb9fa56473e98db8caba80237377e83fe44db5"
-  version = "v1"
-
-[[projects]]
-  digest = "1:8bc629776d035c003c7814d4369521afe67fdb8efc4b5f66540d29343b98cf23"
-  name = "github.com/russross/blackfriday"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "55d61fa8aa702f59229e6cff85793c22e580eaf5"
-  version = "v1.5.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:1ecf2a49df33be51e757d0033d5d51d5f784f35f68e5a38f797b2d3f03357d71"
-  name = "golang.org/x/crypto"
-  packages = [
-    "bcrypt",
-    "blowfish",
-  ]
-  pruneopts = "UT"
-  revision = "de0752318171da717af4ce24d0a2e8626afaeb11"
-
-[[projects]]
-  branch = "master"
-  digest = "1:aa58645c149c9c3b62dc7ff51460602a88fc7b887633f2546fcdde27c91e6f03"
-  name = "golang.org/x/net"
-  packages = [
-    "context",
-    "context/ctxhttp",
-    "html",
-    "html/atom",
-  ]
-  pruneopts = "UT"
-  revision = "c39426892332e1bb5ec0a434a079bf82f5d30c54"
-
-[[projects]]
-  branch = "master"
-  digest = "1:341ceeee37101c62dae441691406bf4ecc71bbeb7b424417879fe88d9f88f487"
-  name = "golang.org/x/oauth2"
-  packages = [
-    ".",
-    "github",
-    "gitlab",
-    "google",
-    "internal",
-    "jws",
-    "jwt",
-  ]
-  pruneopts = "UT"
-  revision = "3d292e4d0cdc3a0113e6d207bb137145ef1de42f"
-
-[[projects]]
-  digest = "1:c8907869850adaa8bd7631887948d0684f3787d0912f1c01ab72581a6c34432e"
-  name = "google.golang.org/appengine"
-  packages = [
-    ".",
-    "internal",
-    "internal/app_identity",
-    "internal/base",
-    "internal/datastore",
-    "internal/log",
-    "internal/modules",
-    "internal/remote_api",
-    "internal/urlfetch",
-    "urlfetch",
-  ]
-  pruneopts = "UT"
-  revision = "b1f26356af11148e710935ed1ac8a7f5702c7612"
-  version = "v1.1.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  input-imports = [
-    "github.com/adtac/go-akismet/akismet",
-    "github.com/gomodule/oauth1/oauth",
-    "github.com/gorilla/handlers",
-    "github.com/gorilla/mux",
-    "github.com/lib/pq",
-    "github.com/lunny/html2md",
-    "github.com/microcosm-cc/bluemonday",
-    "github.com/op/go-logging",
-    "github.com/russross/blackfriday",
-    "golang.org/x/crypto/bcrypt",
-    "golang.org/x/net/html",
-    "golang.org/x/oauth2",
-    "golang.org/x/oauth2/github",
-    "golang.org/x/oauth2/gitlab",
-    "golang.org/x/oauth2/google",
-  ]
-  solver-name = "gps-cdcl"
-  solver-version = 1

api/Gopkg.toml

@@ -1,45 +0,0 @@
-[[constraint]]
-  name = "github.com/gorilla/handlers"
-  version = "1.4.0"
-
-[[constraint]]
-  name = "github.com/gorilla/mux"
-  version = "1.6.2"
-
-[[constraint]]
-  # unfortunately, lib/pq doesn't have semver-ed releases yet
-  # TODO: don't use revisions, use a proper version once this is solved:
-  #   https://github.com/lib/pq/issues/637
-  name = "github.com/lib/pq"
-  revision = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"
-
-[[constraint]]
-  # html2md doesn't have semver-ed releases yet either
-  # TODO: use a version once this is solved:
-  #   https://github.com/lunny/html2md/issues/8
-  name = "github.com/lunny/html2md"
-  revision = "13aaeeae9fb293668db3ef1e145064684735f3ce"
-
-[[constraint]]
-  name = "github.com/microcosm-cc/bluemonday"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/op/go-logging"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "golang.org/x/crypto"
-  branch = "master"
-
-[[constraint]]
-  name = "golang.org/x/oauth2"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/russross/blackfriday"
-  version = "1.5.1"
-
-[prune]
-  go-tests = true
-  unused-packages = true

api/Makefile

@@ -25,15 +25,15 @@ clean:
 # later down the line).
 
 devel-go:
-	dep ensure
-	go build -i -v -o $(GO_DEVEL_BUILD_BINARY)
+	GO111MODULE=on go mod vendor
+	GO111MODULE=on go build -mod=vendor -v -o $(GO_DEVEL_BUILD_BINARY) -ldflags "-X main.version=$(shell git describe --tags)"
 
 prod-go:
-	dep ensure
-	go build -i -v -o $(GO_PROD_BUILD_BINARY)
+	GO111MODULE=on go mod vendor
+	GO111MODULE=on go build -mod=vendor -v -o $(GO_PROD_BUILD_BINARY) -ldflags "-X main.version=$(shell git describe --tags)"
 
 test-go:
-	dep ensure
+	GO111MODULE=on go mod vendor
 	go test -v .
 
 $(shell mkdir -p $(GO_DEVEL_BUILD_DIR) $(GO_PROD_BUILD_DIR))

api/comment.go

@@ -16,4 +16,5 @@ type comment struct {
 	State        string    `json:"state,omitempty"`
 	CreationDate time.Time `json:"creationDate"`
 	Direction    int       `json:"direction"`
+	Deleted      bool      `json:"deleted"`
 }

api/comment_approve.go

@@ -11,7 +11,7 @@ func commentApprove(commentHex string) error {
 
 	statement := `
 		UPDATE comments
-    SET state = 'approved'
+		SET state = 'approved'
 		WHERE commentHex = $1;
 	`
 

api/comment_count_test.go

@@ -20,8 +20,8 @@ func TestCommentCountBasics(t *testing.T) {
 		return
 	}
 
-	if counts["/path.html"] != 2 {
-		t.Errorf("expected count=2 got count=%d", counts["/path.html"])
+	if counts["/path.html"] != 3 {
+		t.Errorf("expected count=3 got count=%d", counts["/path.html"])
 		return
 	}
 }

api/comment_delete.go

@@ -10,8 +10,9 @@ func commentDelete(commentHex string) error {
 	}
 
 	statement := `
-		DELETE FROM comments
-		WHERE commentHex=$1;
+		UPDATE comments
+		SET deleted = true, markdown = '[deleted]', html = '[deleted]', commenterHex = 'anonymous'
+		WHERE commentHex = $1;
 	`
 	_, err := db.Exec(statement, commentHex)
 
@@ -41,6 +42,12 @@ func commentDeleteHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	cm, err := commentGetByCommentHex(*x.CommentHex)
+	if err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
 	domain, _, err := commentDomainPathGet(*x.CommentHex)
 	if err != nil {
 		bodyMarshal(w, response{"success": false, "message": err.Error()})
@@ -53,7 +60,7 @@ func commentDeleteHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if !isModerator {
+	if !isModerator && cm.CommenterHex != c.CommenterHex {
 		bodyMarshal(w, response{"success": false, "message": errorNotModerator.Error()})
 		return
 	}

api/comment_domain_path_get.go

@@ -8,7 +8,7 @@ func commentDomainPathGet(commentHex string) (string, string, error) {
 	}
 
 	statement := `
-    SELECT domain, path
+		SELECT domain, path
 		FROM comments
 		WHERE commentHex = $1;
 	`

api/comment_edit.go

@@ -0,0 +1,66 @@
+package main
+
+import (
+	"net/http"
+)
+
+func commentEdit(commentHex string, markdown string) (string, error) {
+	if commentHex == "" {
+		return "", errorMissingField
+	}
+
+	html := markdownToHtml(markdown)
+
+	statement := `
+		UPDATE comments
+		SET markdown = $2, html = $3
+		WHERE commentHex=$1;
+	`
+	_, err := db.Exec(statement, commentHex, markdown, html)
+
+	if err != nil {
+		// TODO: make sure this is the error is actually non-existant commentHex
+		return "", errorNoSuchComment
+	}
+
+	return html, nil
+}
+
+func commentEditHandler(w http.ResponseWriter, r *http.Request) {
+	type request struct {
+		CommenterToken *string `json:"commenterToken"`
+		CommentHex     *string `json:"commentHex"`
+		Markdown       *string `json:"markdown"`
+	}
+
+	var x request
+	if err := bodyUnmarshal(r, &x); err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	c, err := commenterGetByCommenterToken(*x.CommenterToken)
+	if err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	cm, err := commentGetByCommentHex(*x.CommentHex)
+	if err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	if cm.CommenterHex != c.CommenterHex {
+		bodyMarshal(w, response{"success": false, "message": errorNotAuthorised.Error()})
+		return
+	}
+
+	html, err := commentEdit(*x.CommentHex, *x.Markdown)
+	if err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	bodyMarshal(w, response{"success": true, "html": html})
+}

api/comment_get.go

@@ -0,0 +1,50 @@
+package main
+
+import ()
+
+var commentsRowColumns = `
+	comments.commentHex,
+	comments.commenterHex,
+	comments.markdown,
+	comments.html,
+	comments.parentHex,
+	comments.score,
+	comments.state,
+	comments.deleted,
+	comments.creationDate
+`
+
+func commentsRowScan(s sqlScanner, c *comment) error {
+	return s.Scan(
+		&c.CommentHex,
+		&c.CommenterHex,
+		&c.Markdown,
+		&c.Html,
+		&c.ParentHex,
+		&c.Score,
+		&c.State,
+		&c.Deleted,
+		&c.CreationDate,
+	)
+}
+
+func commentGetByCommentHex(commentHex string) (comment, error) {
+	if commentHex == "" {
+		return comment{}, errorMissingField
+	}
+
+	statement := `
+		SELECT ` + commentsRowColumns + `
+		FROM comments
+		WHERE comments.commentHex = $1;
+	`
+	row := db.QueryRow(statement, commentHex)
+
+	var c comment
+	if err := commentsRowScan(row, &c); err != nil {
+		// TODO: is this the only error?
+		return c, errorNoSuchComment
+	}
+
+	return c, nil
+}

api/comment_list.go

@@ -20,6 +20,7 @@ func commentList(commenterHex string, domain string, path string, includeUnappro
 			parentHex,
 			score,
 			state,
+			deleted,
 			creationDate
 		FROM comments
 		WHERE
@@ -66,6 +67,7 @@ func commentList(commenterHex string, domain string, path string, includeUnappro
 			&c.ParentHex,
 			&c.Score,
 			&c.State,
+			&c.Deleted,
 			&c.CreationDate); err != nil {
 			return nil, nil, errorInternal
 		}
@@ -84,6 +86,10 @@ func commentList(commenterHex string, domain string, path string, includeUnappro
 			}
 		}
 
+		if commenterHex != c.CommenterHex {
+			c.Markdown = ""
+		}
+
 		if !includeUnapproved {
 			c.State = ""
 		}
@@ -185,6 +191,7 @@ func commentListHandler(w http.ResponseWriter, r *http.Request) {
 		"requireIdentification": d.RequireIdentification,
 		"isFrozen":              d.State == "frozen",
 		"isModerator":           isModerator,
+		"defaultSortPolicy":     d.DefaultSortPolicy,
 		"attributes":            p,
 		"configuredOauths": map[string]bool{
 			"commento": d.CommentoProvider,

api/comment_new.go

@@ -30,6 +30,10 @@ func commentNew(commenterHex string, domain string, path string, parentHex strin
 
 	html := markdownToHtml(markdown)
 
+	if err = pageNew(domain, path); err != nil {
+		return "", err
+	}
+
 	statement := `
 		INSERT INTO
 		comments (commentHex, domain, path, commenterHex, parentHex, markdown, html, creationDate, state)
@@ -41,10 +45,6 @@ func commentNew(commenterHex string, domain string, path string, parentHex strin
 		return "", errorInternal
 	}
 
-	if err = pageNew(domain, path); err != nil {
-		return "", err
-	}
-
 	return commentHex, nil
 }
 
@@ -149,6 +149,6 @@ func commentNewHandler(w http.ResponseWriter, r *http.Request) {
 
 	bodyMarshal(w, response{"success": true, "commentHex": commentHex, "state": state, "html": html})
 	if smtpConfigured {
-		go emailNotificationNew(d, path, commenterHex, commentHex, *x.ParentHex, state)
+		go emailNotificationNew(d, path, commenterHex, commentHex, html, *x.ParentHex, state)
 	}
 }

api/comment_new_test.go

@@ -39,10 +39,10 @@ func TestCommentNewUpvoted(t *testing.T) {
 	commentHex, _ := commentNew("temp-commenter-hex", "example.com", "/path.html", "root", "**foo**", "approved", time.Now().UTC())
 
 	statement := `
-    SELECT score
-    FROM comments
-    WHERE commentHex = $1;
-  `
+		SELECT score
+		FROM comments
+		WHERE commentHex = $1;
+	`
 	row := db.QueryRow(statement, commentHex)
 
 	var score int

api/comment_vote.go

@@ -19,7 +19,7 @@ func commentVote(commenterHex string, commentHex string, direction int) error {
 
 	var authorHex string
 	if err := row.Scan(&authorHex); err != nil {
-		logger.Errorf("erorr selecting authorHex for vote")
+		logger.Errorf("error selecting authorHex for vote")
 		return errorInternal
 	}
 
@@ -28,12 +28,12 @@ func commentVote(commenterHex string, commentHex string, direction int) error {
 	}
 
 	statement = `
-    INSERT INTO
-    votes  (commentHex, commenterHex, direction, voteDate)
-    VALUES ($1,         $2,           $3,        $4      )
-    ON CONFLICT (commentHex, commenterHex) DO
-      UPDATE SET direction = $3;
-  `
+		INSERT INTO
+		votes  (commentHex, commenterHex, direction, voteDate)
+		VALUES ($1,         $2,           $3,        $4      )
+		ON CONFLICT (commentHex, commenterHex) DO
+		UPDATE SET direction = $3;
+	`
 	_, err := db.Exec(statement, commentHex, commenterHex, direction, time.Now().UTC())
 	if err != nil {
 		logger.Errorf("error inserting/updating votes: %v", err)

api/commenter_get.go

@@ -2,20 +2,42 @@ package main
 
 import ()
 
+var commentersRowColumns string = `
+	commenters.commenterHex,
+	commenters.email,
+	commenters.name,
+	commenters.link,
+	commenters.photo,
+	commenters.provider,
+	commenters.joinDate
+`
+
+func commentersRowScan(s sqlScanner, c *commenter) error {
+	return s.Scan(
+		&c.CommenterHex,
+		&c.Email,
+		&c.Name,
+		&c.Link,
+		&c.Photo,
+		&c.Provider,
+		&c.JoinDate,
+	)
+}
+
 func commenterGetByHex(commenterHex string) (commenter, error) {
 	if commenterHex == "" {
 		return commenter{}, errorMissingField
 	}
 
 	statement := `
-    SELECT commenterHex, email, name, link, photo, provider, joinDate
-    FROM commenters
-    WHERE commenterHex = $1;
-  `
+		SELECT ` + commentersRowColumns + `
+		FROM commenters
+		WHERE commenterHex = $1;
+	`
 	row := db.QueryRow(statement, commenterHex)
 
-	c := commenter{}
-	if err := row.Scan(&c.CommenterHex, &c.Email, &c.Name, &c.Link, &c.Photo, &c.Provider, &c.JoinDate); err != nil {
+	var c commenter
+	if err := commentersRowScan(row, &c); err != nil {
 		// TODO: is this the only error?
 		return commenter{}, errorNoSuchCommenter
 	}
@@ -29,14 +51,14 @@ func commenterGetByEmail(provider string, email string) (commenter, error) {
 	}
 
 	statement := `
-    SELECT commenterHex, email, name, link, photo, provider, joinDate
-    FROM commenters
-    WHERE email = $1 AND provider = $2;
-  `
+		SELECT ` + commentersRowColumns + `
+		FROM commenters
+		WHERE email = $1 AND provider = $2;
+	`
 	row := db.QueryRow(statement, email, provider)
 
-	c := commenter{}
-	if err := row.Scan(&c.CommenterHex, &c.Email, &c.Name, &c.Link, &c.Photo, &c.Provider, &c.JoinDate); err != nil {
+	var c commenter
+	if err := commentersRowScan(row, &c); err != nil {
 		// TODO: is this the only error?
 		return commenter{}, errorNoSuchCommenter
 	}
@@ -50,22 +72,22 @@ func commenterGetByCommenterToken(commenterToken string) (commenter, error) {
 	}
 
 	statement := `
-    SELECT commenterHex
-    FROM commenterSessions
-    WHERE commenterToken = $1;
+		SELECT ` + commentersRowColumns + `
+		FROM commenterSessions
+		JOIN commenters ON commenterSessions.commenterHex = commenters.commenterHex
+		WHERE commenterToken = $1;
 	`
 	row := db.QueryRow(statement, commenterToken)
 
-	var commenterHex string
-	if err := row.Scan(&commenterHex); err != nil {
-		// TODO: is the only error?
+	var c commenter
+	if err := commentersRowScan(row, &c); err != nil {
+		// TODO: is this the only error?
 		return commenter{}, errorNoSuchToken
 	}
 
-	if commenterHex == "none" {
+	if c.CommenterHex == "none" {
 		return commenter{}, errorNoSuchToken
 	}
 
-	// TODO: use a join instead of two queries?
-	return commenterGetByHex(commenterHex)
+	return c, nil
 }

api/commenter_login.go

@@ -74,5 +74,11 @@ func commenterLoginHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	bodyMarshal(w, response{"success": true, "commenterToken": commenterToken, "commenter": c})
+	e, err := emailGet(c.Email)
+	if err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	bodyMarshal(w, response{"success": true, "commenterToken": commenterToken, "commenter": c, "email": e})
 }

api/commenter_photo.go

@@ -1,8 +1,13 @@
 package main
 
 import (
+	"fmt"
+	"image/jpeg"
 	"io"
 	"net/http"
+	"strings"
+
+	"github.com/disintegration/imaging"
 )
 
 func commenterPhotoHandler(w http.ResponseWriter, r *http.Request) {
@@ -14,13 +19,17 @@ func commenterPhotoHandler(w http.ResponseWriter, r *http.Request) {
 
 	url := c.Photo
 	if c.Provider == "google" {
-		url += "?sz=50"
+		if strings.HasSuffix(url, "photo.jpg") {
+			url += "?sz=38"
+		} else {
+			url += "=s38"
+		}
 	} else if c.Provider == "github" {
-		url += "&s=50"
+		url += "&s=38"
 	} else if c.Provider == "twitter" {
 		url += "?size=normal"
 	} else if c.Provider == "gitlab" {
-		url += "?width=50"
+		url += "?width=38"
 	}
 
 	resp, err := http.Get(url)
@@ -30,5 +39,23 @@ func commenterPhotoHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	defer resp.Body.Close()
 
-	io.Copy(w, resp.Body)
+	if c.Provider != "commento" { // Custom URL avatars need to be resized.
+		io.Copy(w, resp.Body)
+		return
+	}
+
+	// Limit the size of the response to 128 KiB to prevent DoS attacks
+	// that exhaust memory.
+	limitedResp := &io.LimitedReader{R: resp.Body, N: 128 * 1024}
+
+	img, err := jpeg.Decode(limitedResp)
+	if err != nil {
+		fmt.Fprintf(w, "JPEG decode failed: %v\n", err)
+		return
+	}
+
+	if err = imaging.Encode(w, imaging.Resize(img, 38, 0, imaging.Lanczos), imaging.JPEG); err != nil {
+		fmt.Fprintf(w, "image encoding failed: %v\n", err)
+		return
+	}
 }

api/commenter_session_update.go

@@ -8,10 +8,10 @@ func commenterSessionUpdate(commenterToken string, commenterHex string) error {
 	}
 
 	statement := `
-    UPDATE commenterSessions
-    SET commenterHex = $2
-    WHERE commenterToken = $1;
-  `
+		UPDATE commenterSessions
+		SET commenterHex = $2
+		WHERE commenterToken = $1;
+	`
 	_, err := db.Exec(statement, commenterToken, commenterHex)
 	if err != nil {
 		logger.Errorf("error updating commenterHex: %v", err)

api/commenter_update.go

@@ -0,0 +1,69 @@
+package main
+
+import (
+	"net/http"
+)
+
+func commenterUpdate(commenterHex string, email string, name string, link string, photo string, provider string) error {
+	if email == "" || name == "" || photo == "" || provider == "" {
+		return errorMissingField
+	}
+
+	// See utils_sanitise.go's documentation on isHttpsUrl. This is not a URL
+	// validator, just an XSS preventor.
+	// TODO: reject URLs instead of malforming them.
+	if link == "" {
+		link = "undefined"
+	} else if link != "undefined" && !isHttpsUrl(link) {
+		link = "https://" + link
+	}
+
+	statement := `
+		UPDATE commenters
+		SET email = $3, name = $4, link = $5, photo = $6
+		WHERE commenterHex = $1 and provider = $2;
+	`
+	_, err := db.Exec(statement, commenterHex, provider, email, name, link, photo)
+	if err != nil {
+		logger.Errorf("cannot update commenter: %v", err)
+		return errorInternal
+	}
+
+	return nil
+}
+
+func commenterUpdateHandler(w http.ResponseWriter, r *http.Request) {
+	type request struct {
+		CommenterToken *string `json:"commenterToken"`
+		Name           *string `json:"name"`
+		Email          *string `json:"email"`
+		Link           *string `json:"link"`
+		Photo          *string `json:"photo"`
+	}
+
+	var x request
+	if err := bodyUnmarshal(r, &x); err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	c, err := commenterGetByCommenterToken(*x.CommenterToken)
+	if err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	if c.Provider != "commento" {
+		bodyMarshal(w, response{"success": false, "message": errorCannotUpdateOauthProfile.Error()})
+		return
+	}
+
+	*x.Email = c.Email
+
+	if err = commenterUpdate(c.CommenterHex, *x.Email, *x.Name, *x.Link, *x.Photo, c.Provider); err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	bodyMarshal(w, response{"success": true})
+}

api/config.go

@@ -56,6 +56,13 @@ func configParse() error {
 
 		"GITLAB_KEY":    "",
 		"GITLAB_SECRET": "",
+		"GITLAB_URL":    "https://gitlab.com",
+	}
+
+	if os.Getenv("COMMENTO_CONFIG_FILE") != "" {
+		if err := configFileLoad(os.Getenv("COMMENTO_CONFIG_FILE")); err != nil {
+			return err
+		}
 	}
 
 	for key, value := range defaults {
@@ -66,12 +73,6 @@ func configParse() error {
 		}
 	}
 
-	if os.Getenv("CONFIG_FILE") != "" {
-		if err := configFileLoad(os.Getenv("CONFIG_FILE")); err != nil {
-			return err
-		}
-	}
-
 	// Mandatory config parameters
 	for _, env := range []string{"POSTGRES", "PORT", "ORIGIN", "FORBID_NEW_OWNERS", "MAX_IDLE_PG_CONNECTIONS"} {
 		if os.Getenv(env) == "" {

api/config_file.go

@@ -41,11 +41,12 @@ func configFileLoad(filepath string) error {
 			continue
 		}
 
-		if os.Getenv(key[9:]) != "" {
+		if os.Getenv(key) != "" {
+			// Config files have lower precedence.
 			continue
 		}
 
-		os.Setenv(key[9:], value)
+		os.Setenv(key, value)
 	}
 
 	return nil

api/config_file_test.go

@@ -37,19 +37,19 @@ func TestConfigFileLoadBasics(t *testing.T) {
 		return
 	}
 
-	os.Setenv("PORT", "9000")
+	os.Setenv("COMMENTO_PORT", "9000")
 	if err := configFileLoad(f.Name()); err != nil {
 		t.Errorf("unexpected error loading config file: %v", err)
 		return
 	}
 
-	if os.Getenv("PORT") != "9000" {
-		t.Errorf("expected PORT=9000 got PORT=%s", os.Getenv("PORT"))
+	if os.Getenv("COMMENTO_PORT") != "9000" {
+		t.Errorf("expected COMMENTO_PORT=9000 got COMMENTO_PORT=%s", os.Getenv("COMMENTO_PORT"))
 		return
 	}
 
-	if os.Getenv("GZIP_STATIC") != "true" {
-		t.Errorf("expected GZIP_STATIC=true got GZIP_STATIC=%s", os.Getenv("GZIP_STATIC"))
+	if os.Getenv("COMMENTO_GZIP_STATIC") != "true" {
+		t.Errorf("expected COMMENTO_GZIP_STATIC=true got COMMENTO_GZIP_STATIC=%s", os.Getenv("COMMENTO_GZIP_STATIC"))
 		return
 	}
 }

api/config_test.go

@@ -21,6 +21,7 @@ func TestConfigParseBasics(t *testing.T) {
 
 	os.Setenv("COMMENTO_BIND_ADDRESS", "192.168.1.100")
 
+	os.Setenv("COMMENTO_PORT", "")
 	if err := configParse(); err != nil {
 		t.Errorf("unexpected error when parsing config: %v", err)
 		return

api/constants.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "v1.7.0"
+var version string

api/cron_email_notification.go

@@ -1,66 +0,0 @@
-package main
-
-import (
-	"time"
-)
-
-func emailNotificationBegin() error {
-	go func() {
-		for {
-			statement := `
-				SELECT email, sendModeratorNotifications, sendReplyNotifications
-				FROM emails
-				WHERE pendingEmails > 0 AND lastEmailNotificationDate < $1;
-			`
-			rows, err := db.Query(statement, time.Now().UTC().Add(time.Duration(-10)*time.Minute))
-			if err != nil {
-				logger.Errorf("cannot query domains: %v", err)
-				return
-			}
-			defer rows.Close()
-
-			for rows.Next() {
-				var email string
-				var sendModeratorNotifications bool
-				var sendReplyNotifications bool
-				if err = rows.Scan(&email, &sendModeratorNotifications, &sendReplyNotifications); err != nil {
-					logger.Errorf("cannot scan email in cron job to send notifications: %v", err)
-					continue
-				}
-
-				if _, ok := emailQueue[email]; !ok {
-					if err = emailNotificationPendingReset(email); err != nil {
-						logger.Errorf("error resetting pendingEmails: %v", err)
-						continue
-					}
-				}
-
-				cont := true
-				kindListMap := map[string][]emailNotification{}
-				for cont {
-					select {
-					case e := <-emailQueue[email]:
-						if _, ok := kindListMap[e.Kind]; !ok {
-							kindListMap[e.Kind] = []emailNotification{}
-						}
-
-						if (e.Kind == "reply" && sendReplyNotifications) || sendModeratorNotifications {
-							kindListMap[e.Kind] = append(kindListMap[e.Kind], e)
-						}
-					default:
-						cont = false
-						break
-					}
-				}
-
-				for kind, list := range kindListMap {
-					go emailNotificationSend(email, kind, list)
-				}
-			}
-
-			time.Sleep(10 * time.Minute)
-		}
-	}()
-
-	return nil
-}

api/database_connect.go

@@ -3,6 +3,7 @@ package main
 import (
 	"database/sql"
 	_ "github.com/lib/pq"
+	"net/url"
 	"os"
 	"strconv"
 	"time"
@@ -10,9 +11,14 @@ import (
 
 func dbConnect(retriesLeft int) error {
 	con := os.Getenv("POSTGRES")
-	logger.Infof("opening connection to postgres: %s", con)
+	u, err := url.Parse(con)
+	if err != nil {
+		logger.Errorf("invalid postgres connection URI: %v", err)
+		return err
+	}
+	u.User = url.UserPassword(u.User.Username(), "redacted")
+	logger.Infof("opening connection to postgres: %s", u.String())
 
-	var err error
 	db, err = sql.Open("postgres", con)
 	if err != nil {
 		logger.Errorf("cannot open connection to postgres: %v", err)
@@ -32,10 +38,10 @@ func dbConnect(retriesLeft int) error {
 	}
 
 	statement := `
-    CREATE TABLE IF NOT EXISTS migrations (
-      filename TEXT NOT NULL UNIQUE
-    );
-  `
+		CREATE TABLE IF NOT EXISTS migrations (
+			filename TEXT NOT NULL UNIQUE
+		);
+	`
 	_, err = db.Exec(statement)
 	if err != nil {
 		logger.Errorf("cannot create migrations table: %v", err)

api/database_migrate.go

@@ -22,9 +22,9 @@ func migrateFromDir(dir string) error {
 	}
 
 	statement := `
-    SELECT filename
-    FROM migrations;
-  `
+		SELECT filename
+		FROM migrations;
+	`
 	rows, err := db.Query(statement)
 	if err != nil {
 		logger.Errorf("cannot query migrations: %v", err)
@@ -63,10 +63,10 @@ func migrateFromDir(dir string) error {
 				}
 
 				statement = `
-          INSERT INTO
-          migrations (filename)
-          VALUES     ($1      );
-        `
+					INSERT INTO
+					migrations (filename)
+					VALUES     ($1      );
+				`
 				_, err = db.Exec(statement, file.Name())
 				if err != nil {
 					logger.Errorf("cannot insert filename into the migrations table: %v", err)

api/domain.go

@@ -25,4 +25,5 @@ type domain struct {
 	SsoProvider             bool        `json:"ssoProvider"`
 	SsoSecret               string      `json:"ssoSecret"`
 	SsoUrl                  string      `json:"ssoUrl"`
+	DefaultSortPolicy       string      `json:"defaultSortPolicy"`
 }

api/domain_delete.go

@@ -10,8 +10,7 @@ func domainDelete(domain string) error {
 	}
 
 	statement := `
-		DELETE FROM
-		domains
+		DELETE FROM domains
 		WHERE domain = $1;
 	`
 	_, err := db.Exec(statement, domain)
@@ -25,7 +24,7 @@ func domainDelete(domain string) error {
 	`
 	_, err = db.Exec(statement, domain)
 	if err != nil {
-		logger.Errorf("cannot delete views: %v", err)
+		logger.Errorf("cannot delete domain from views: %v", err)
 		return errorInternal
 	}
 
@@ -35,7 +34,17 @@ func domainDelete(domain string) error {
 	`
 	_, err = db.Exec(statement, domain)
 	if err != nil {
-		logger.Errorf("cannot delete domain moderators: %v", err)
+		logger.Errorf("cannot delete domain from moderators: %v", err)
+		return errorInternal
+	}
+
+	statement = `
+		DELETE FROM ssotokens
+		WHERE ssotokens.domain = $1;
+	`
+	_, err = db.Exec(statement, domain)
+	if err != nil {
+		logger.Errorf("cannot delete domain from ssotokens: %v", err)
 		return errorInternal
 	}
 

api/domain_export.go

@@ -15,13 +15,7 @@ func domainExportBeginError(email string, toName string, domain string, err erro
 }
 
 func domainExportBegin(email string, toName string, domain string) {
-	type dataExport struct {
-		Version    int         `json:"version"`
-		Comments   []comment   `json:"comments"`
-		Commenters []commenter `json:"commenters"`
-	}
-
-	e := dataExport{Version: 1, Comments: []comment{}, Commenters: []commenter{}}
+	e := commentoExportV1{Version: 1, Comments: []comment{}, Commenters: []commenter{}}
 
 	statement := `
 		SELECT commentHex, domain, path, commenterHex, markdown, parentHex, score, state, creationDate

api/domain_export_download.go

@@ -27,7 +27,6 @@ func domainExportDownloadHandler(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(w, "Error: that exportHex does not exist\n")
 	}
 
-	w.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s-%v.gz"`, domain, creationDate.Unix()))
-	w.Header().Set("Content-Encoding", "gzip")
+	w.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s-%v.json.gz"`, domain, creationDate.Unix()))
 	w.Write(binData)
 }

api/domain_get.go

@@ -2,40 +2,31 @@ package main
 
 import ()
 
-func domainGet(dmn string) (domain, error) {
-	if dmn == "" {
-		return domain{}, errorMissingField
-	}
+var domainsRowColumns = `
+	domains.domain,
+	domains.ownerHex,
+	domains.name,
+	domains.creationDate,
+	domains.state,
+	domains.importedComments,
+	domains.autoSpamFilter,
+	domains.requireModeration,
+	domains.requireIdentification,
+	domains.moderateAllAnonymous,
+	domains.emailNotificationPolicy,
+	domains.commentoProvider,
+	domains.googleProvider,
+	domains.twitterProvider,
+	domains.githubProvider,
+	domains.gitlabProvider,
+	domains.ssoProvider,
+	domains.ssoSecret,
+	domains.ssoUrl,
+	domains.defaultSortPolicy
+`
 
-	statement := `
-		SELECT
-			domain,
-			ownerHex,
-			name,
-			creationDate,
-			state,
-			importedComments,
-			autoSpamFilter,
-			requireModeration,
-			requireIdentification,
-			moderateAllAnonymous,
-			emailNotificationPolicy,
-			commentoProvider,
-			googleProvider,
-			twitterProvider,
-			githubProvider,
-			gitlabProvider,
-			ssoProvider,
-			ssoSecret,
-			ssoUrl
-		FROM domains
-		WHERE domain = $1;
-	`
-	row := db.QueryRow(statement, dmn)
-
-	var err error
-	d := domain{}
-	if err = row.Scan(
+func domainsRowScan(s sqlScanner, d *domain) error {
+	return s.Scan(
 		&d.Domain,
 		&d.OwnerHex,
 		&d.Name,
@@ -54,7 +45,26 @@ func domainGet(dmn string) (domain, error) {
 		&d.GitlabProvider,
 		&d.SsoProvider,
 		&d.SsoSecret,
-		&d.SsoUrl); err != nil {
+		&d.SsoUrl,
+		&d.DefaultSortPolicy,
+	)
+}
+
+func domainGet(dmn string) (domain, error) {
+	if dmn == "" {
+		return domain{}, errorMissingField
+	}
+
+	statement := `
+		SELECT ` + domainsRowColumns + `
+		FROM domains
+		WHERE domain = $1;
+	`
+	row := db.QueryRow(statement, dmn)
+
+	var err error
+	d := domain{}
+	if err = domainsRowScan(row, &d); err != nil {
 		return d, errorNoSuchDomain
 	}
 

api/domain_import_commento.go

@@ -0,0 +1,168 @@
+package main
+
+import (
+	"bytes"
+	"compress/gzip"
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+)
+
+type commentoExportV1 struct {
+	Version    int         `json:"version"`
+	Comments   []comment   `json:"comments"`
+	Commenters []commenter `json:"commenters"`
+}
+
+func domainImportCommento(domain string, url string) (int, error) {
+	if domain == "" || url == "" {
+		return 0, errorMissingField
+	}
+
+	resp, err := http.Get(url)
+	if err != nil {
+		logger.Errorf("cannot get url: %v", err)
+		return 0, errorCannotDownloadCommento
+	}
+
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		logger.Errorf("cannot read body: %v", err)
+		return 0, errorCannotDownloadCommento
+	}
+
+	zr, err := gzip.NewReader(bytes.NewBuffer(body))
+	if err != nil {
+		logger.Errorf("cannot create gzip reader: %v", err)
+		return 0, errorInternal
+	}
+
+	contents, err := ioutil.ReadAll(zr)
+	if err != nil {
+		logger.Errorf("cannot read gzip contents uncompressed: %v", err)
+		return 0, errorInternal
+	}
+
+	var data commentoExportV1
+	if err := json.Unmarshal(contents, &data); err != nil {
+		logger.Errorf("cannot unmarshal JSON at %s: %v", url, err)
+		return 0, errorInternal
+	}
+
+	if data.Version != 1 {
+		logger.Errorf("invalid data version (got %d, want 1): %v", data.Version, err)
+		return 0, errorUnsupportedCommentoImportVersion
+	}
+
+	// Check if imported commentedHex or email exists, creating a map of
+	// commenterHex (old hex, new hex)
+	commenterHex := map[string]string{"anonymous": "anonymous"}
+	for _, commenter := range data.Commenters {
+		c, err := commenterGetByEmail("commento", commenter.Email)
+		if err != nil && err != errorNoSuchCommenter {
+			logger.Errorf("cannot get commenter by email: %v", err)
+			return 0, errorInternal
+		}
+
+		if err == nil {
+			commenterHex[commenter.CommenterHex] = c.CommenterHex
+			continue
+		}
+
+		randomPassword, err := randomHex(32)
+		if err != nil {
+			logger.Errorf("cannot generate random password for new commenter: %v", err)
+			return 0, errorInternal
+		}
+
+		commenterHex[commenter.CommenterHex], err = commenterNew(commenter.Email,
+			commenter.Name, commenter.Link, commenter.Photo, "commento", randomPassword)
+		if err != nil {
+			return 0, err
+		}
+	}
+
+	// Create a map of (parent hex, comments)
+	comments := make(map[string][]comment)
+	for _, comment := range data.Comments {
+		parentHex := comment.ParentHex
+		comments[parentHex] = append(comments[parentHex], comment)
+	}
+
+	// Import comments, creating a map of comment hex (old hex, new hex)
+	commentHex := map[string]string{"root": "root"}
+	numImported := 0
+	keys := []string{"root"}
+	for i := 0; i < len(keys); i++ {
+		for _, comment := range comments[keys[i]] {
+			cHex, ok := commenterHex[comment.CommenterHex]
+			if !ok {
+				logger.Errorf("cannot get commenter: %v", err)
+				return numImported, errorInternal
+			}
+			parentHex, ok := commentHex[comment.ParentHex]
+			if !ok {
+				logger.Errorf("cannot get parent comment: %v", err)
+				return numImported, errorInternal
+			}
+
+			hex, err := commentNew(
+				cHex,
+				domain,
+				comment.Path,
+				parentHex,
+				comment.Markdown,
+				comment.State,
+				comment.CreationDate)
+			if err != nil {
+				return numImported, err
+			}
+			commentHex[comment.CommentHex] = hex
+			numImported++
+			keys = append(keys, comment.CommentHex)
+		}
+	}
+
+	return numImported, nil
+}
+
+func domainImportCommentoHandler(w http.ResponseWriter, r *http.Request) {
+	type request struct {
+		OwnerToken *string `json:"ownerToken"`
+		Domain     *string `json:"domain"`
+		URL        *string `json:"url"`
+	}
+
+	var x request
+	if err := bodyUnmarshal(r, &x); err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	o, err := ownerGetByOwnerToken(*x.OwnerToken)
+	if err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	domain := domainStrip(*x.Domain)
+	isOwner, err := domainOwnershipVerify(o.OwnerHex, domain)
+	if err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	if !isOwner {
+		bodyMarshal(w, response{"success": false, "message": errorNotAuthorised.Error()})
+		return
+	}
+
+	numImported, err := domainImportCommento(domain, *x.URL)
+	if err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	bodyMarshal(w, response{"success": true, "numImported": numImported})
+}

api/domain_import_commento_test.go

@@ -0,0 +1,121 @@
+package main
+
+import (
+	"compress/gzip"
+	"encoding/json"
+	"fmt"
+	"net"
+	"net/http"
+	"testing"
+	"time"
+)
+
+func TestImportCommento(t *testing.T) {
+	failTestOnError(t, setupTestEnv())
+
+	// Create JSON data
+	data := commentoExportV1{
+		Version: 1,
+		Comments: []comment{
+			{
+				CommentHex:   "5a349182b3b8e25107ab2b12e514f40fe0b69160a334019491d7c204aff6fdc2",
+				Domain:       "localhost:1313",
+				Path:         "/post/first-post/",
+				CommenterHex: "anonymous",
+				Markdown:     "This is a reply!",
+				Html:         "",
+				ParentHex:    "7ed60b1227f6c4850258a2ac0304e1936770117d6f3a379655f775c46b9f13cd",
+				Score:        0,
+				State:        "approved",
+				CreationDate: timeParse(t, "2020-01-27T14:08:44.061525Z"),
+				Direction:    0,
+				Deleted:      false,
+			},
+			{
+				CommentHex:   "7ed60b1227f6c4850258a2ac0304e1936770117d6f3a379655f775c46b9f13cd",
+				Domain:       "localhost:1313",
+				Path:         "/post/first-post/",
+				CommenterHex: "anonymous",
+				Markdown:     "This is a comment!",
+				Html:         "",
+				ParentHex:    "root",
+				Score:        0,
+				State:        "approved",
+				CreationDate: timeParse(t, "2020-01-27T14:07:49.244432Z"),
+				Direction:    0,
+				Deleted:      false,
+			},
+			{
+				CommentHex:   "a7c84f251b5a09d5b65e902cbe90633646437acefa3a52b761fee94002ac54c7",
+				Domain:       "localhost:1313",
+				Path:         "/post/first-post/",
+				CommenterHex: "4629a8216538b73987597d66f266c1a1801b0451f99cf066e7122aa104ef3b07",
+				Markdown:     "This is a test comment, bar foo\n\n#Here is something big\n\n```\nhere code();\n```",
+				Html:         "",
+				ParentHex:    "root",
+				Score:        0,
+				State:        "approved",
+				CreationDate: timeParse(t, "2020-01-27T14:20:21.101653Z"),
+				Direction:    0,
+				Deleted:      false,
+			},
+		},
+		Commenters: []commenter{
+			{
+				CommenterHex: "4629a8216538b73987597d66f266c1a1801b0451f99cf066e7122aa104ef3b07",
+				Email:        "john@doe.com",
+				Name:         "John Doe",
+				Link:         "https://john.doe",
+				Photo:        "undefined",
+				Provider:     "commento",
+				JoinDate:     timeParse(t, "2020-01-27T14:17:59.298737Z"),
+				IsModerator:  false,
+			},
+		},
+	}
+
+	// Create listener with random port
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		t.Errorf("couldn't create listener: %v", err)
+		return
+	}
+	defer func() {
+		_ = listener.Close()
+	}()
+	port := listener.Addr().(*net.TCPAddr).Port
+
+	// Launch http server serving commento json gzipped data
+	go func() {
+		http.Serve(listener, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			gzipper := gzip.NewWriter(w)
+			defer func() {
+				_ = gzipper.Close()
+			}()
+			encoder := json.NewEncoder(gzipper)
+			if err := encoder.Encode(data); err != nil {
+				t.Errorf("couldn't write data: %v", err)
+			}
+		}))
+	}()
+	url := fmt.Sprintf("http://127.0.0.1:%d", port)
+
+	domainNew("temp-owner-hex", "Example", "example.com")
+
+	n, err := domainImportCommento("example.com", url)
+	if err != nil {
+		t.Errorf("unexpected error importing comments: %v", err)
+		return
+	}
+	if n != len(data.Comments) {
+		t.Errorf("imported comments missmatch (got %d, want %d)", n, len(data.Comments))
+	}
+}
+
+func timeParse(t *testing.T, s string) time.Time {
+	time, err := time.Parse(time.RFC3339Nano, s)
+	if err != nil {
+		t.Errorf("couldn't parse time: %v", err)
+	}
+	return time
+}

api/domain_list.go

@@ -10,26 +10,7 @@ func domainList(ownerHex string) ([]domain, error) {
 	}
 
 	statement := `
-		SELECT
-			domain,
-			ownerHex,
-			name,
-			creationDate,
-			state,
-			importedComments,
-			autoSpamFilter,
-			requireModeration,
-			requireIdentification,
-			moderateAllAnonymous,
-			emailNotificationPolicy,
-			commentoProvider,
-			googleProvider,
-			twitterProvider,
-			githubProvider,
-			gitlabProvider,
-			ssoProvider,
-			ssoSecret,
-			ssoUrl
+		SELECT ` + domainsRowColumns + `
 		FROM domains
 		WHERE ownerHex=$1;
 	`
@@ -42,27 +23,8 @@ func domainList(ownerHex string) ([]domain, error) {
 
 	domains := []domain{}
 	for rows.Next() {
-		d := domain{}
-		if err = rows.Scan(
-			&d.Domain,
-			&d.OwnerHex,
-			&d.Name,
-			&d.CreationDate,
-			&d.State,
-			&d.ImportedComments,
-			&d.AutoSpamFilter,
-			&d.RequireModeration,
-			&d.RequireIdentification,
-			&d.ModerateAllAnonymous,
-			&d.EmailNotificationPolicy,
-			&d.CommentoProvider,
-			&d.GoogleProvider,
-			&d.TwitterProvider,
-			&d.GithubProvider,
-			&d.GitlabProvider,
-			&d.SsoProvider,
-			&d.SsoSecret,
-			&d.SsoUrl); err != nil {
+		var d domain
+		if err = domainsRowScan(rows, &d); err != nil {
 			logger.Errorf("cannot Scan domain: %v", err)
 			return nil, errorInternal
 		}

api/domain_update.go

@@ -25,7 +25,8 @@ func domainUpdate(d domain) error {
 			githubProvider=$12,
 			gitlabProvider=$13,
 			ssoProvider=$14,
-			ssoUrl=$15
+			ssoUrl=$15,
+			defaultSortPolicy=$16
 		WHERE domain=$1;
 	`
 
@@ -44,7 +45,8 @@ func domainUpdate(d domain) error {
 		d.GithubProvider,
 		d.GitlabProvider,
 		d.SsoProvider,
-		d.SsoUrl)
+		d.SsoUrl,
+		d.DefaultSortPolicy)
 	if err != nil {
 		logger.Errorf("cannot update non-moderators: %v", err)
 		return errorInternal

api/email.go

@@ -8,7 +8,6 @@ type email struct {
 	Email                      string    `json:"email"`
 	UnsubscribeSecretHex       string    `json:"unsubscribeSecretHex"`
 	LastEmailNotificationDate  time.Time `json:"lastEmailNotificationDate"`
-	PendingEmails              int       `json:"-"`
 	SendReplyNotifications     bool      `json:"sendReplyNotifications"`
 	SendModeratorNotifications bool      `json:"sendModeratorNotifications"`
 }

api/email_get.go

@@ -4,16 +4,34 @@ import (
 	"net/http"
 )
 
+var emailsRowColumns = `
+	emails.email,
+	emails.unsubscribeSecretHex,
+	emails.lastEmailNotificationDate,
+	emails.sendReplyNotifications,
+	emails.sendModeratorNotifications
+`
+
+func emailsRowScan(s sqlScanner, e *email) error {
+	return s.Scan(
+		&e.Email,
+		&e.UnsubscribeSecretHex,
+		&e.LastEmailNotificationDate,
+		&e.SendReplyNotifications,
+		&e.SendModeratorNotifications,
+	)
+}
+
 func emailGet(em string) (email, error) {
 	statement := `
-		SELECT email, unsubscribeSecretHex, lastEmailNotificationDate, pendingEmails, sendReplyNotifications, sendModeratorNotifications
+		SELECT ` + emailsRowColumns + `
 		FROM emails
 		WHERE email = $1;
 	`
 	row := db.QueryRow(statement, em)
 
-	e := email{}
-	if err := row.Scan(&e.Email, &e.UnsubscribeSecretHex, &e.LastEmailNotificationDate, &e.PendingEmails, &e.SendReplyNotifications, &e.SendModeratorNotifications); err != nil {
+	var e email
+	if err := emailsRowScan(row, &e); err != nil {
 		// TODO: is this the only error?
 		return e, errorNoSuchEmail
 	}
@@ -23,14 +41,14 @@ func emailGet(em string) (email, error) {
 
 func emailGetByUnsubscribeSecretHex(unsubscribeSecretHex string) (email, error) {
 	statement := `
-		SELECT email, unsubscribeSecretHex, lastEmailNotificationDate, pendingEmails, sendReplyNotifications, sendModeratorNotifications
+		SELECT ` + emailsRowColumns + `
 		FROM emails
 		WHERE unsubscribeSecretHex = $1;
 	`
 	row := db.QueryRow(statement, unsubscribeSecretHex)
 
 	e := email{}
-	if err := row.Scan(&e.Email, &e.UnsubscribeSecretHex, &e.LastEmailNotificationDate, &e.PendingEmails, &e.SendReplyNotifications, &e.SendModeratorNotifications); err != nil {
+	if err := emailsRowScan(row, &e); err != nil {
 		// TODO: is this the only error?
 		return e, errorNoSuchUnsubscribeSecretHex
 	}

api/email_notification.go

@@ -1,8 +1,6 @@
 package main
 
-import (
-	"time"
-)
+import ()
 
 type emailNotification struct {
 	Email         string
@@ -13,69 +11,3 @@ type emailNotification struct {
 	CommentHex    string
 	Kind          string
 }
-
-var emailQueue map[string](chan emailNotification) = map[string](chan emailNotification){}
-
-func emailNotificationPendingResetAll() error {
-	statement := `
-		UPDATE emails
-		SET pendingEmails = 0;
-	`
-	_, err := db.Exec(statement)
-	if err != nil {
-		logger.Errorf("cannot reset pendingEmails: %v", err)
-		return err
-	}
-
-	return nil
-}
-
-func emailNotificationPendingIncrement(email string) error {
-	statement := `
-		UPDATE emails
-		SET pendingEmails = pendingEmails + 1
-		WHERE email = $1;
-	`
-	_, err := db.Exec(statement, email)
-	if err != nil {
-		logger.Errorf("cannot increment pendingEmails: %v", err)
-		return err
-	}
-
-	return nil
-}
-
-func emailNotificationPendingReset(email string) error {
-	statement := `
-		UPDATE emails
-		SET pendingEmails = 0, lastEmailNotificationDate = $2
-		WHERE email = $1;
-	`
-	_, err := db.Exec(statement, email, time.Now().UTC())
-	if err != nil {
-		logger.Errorf("cannot decrement pendingEmails: %v", err)
-		return err
-	}
-
-	return nil
-}
-
-func emailNotificationEnqueue(e emailNotification) error {
-	if err := emailNotificationPendingIncrement(e.Email); err != nil {
-		logger.Errorf("cannot increment pendingEmails when enqueueing: %v", err)
-		return err
-	}
-
-	if _, ok := emailQueue[e.Email]; !ok {
-		// don't enqueue more than 10 emails as we won't send more than 10 comments
-		// in one email anyway
-		emailQueue[e.Email] = make(chan emailNotification, 10)
-	}
-
-	select {
-	case emailQueue[e.Email] <- e:
-	default:
-	}
-
-	return nil
-}

api/email_notification_new.go

@@ -2,13 +2,11 @@ package main
 
 import ()
 
-func emailNotificationModerator(d domain, path string, title string, commenterHex string, commentHex string, state string) {
+func emailNotificationModerator(d domain, path string, title string, commenterHex string, commentHex string, html string, state string) {
 	if d.EmailNotificationPolicy == "none" {
 		return
 	}
 
-	// We'll need to check again when we're sending in case the comment was
-	// approved midway anyway.
 	if d.EmailNotificationPolicy == "pending-moderation" && state == "approved" {
 		return
 	}
@@ -39,20 +37,37 @@ func emailNotificationModerator(d domain, path string, title string, commenterHe
 			continue
 		}
 
-		emailNotificationPendingIncrement(m.Email)
-		emailNotificationEnqueue(emailNotification{
-			Email:         m.Email,
-			CommenterName: commenterName,
-			Domain:        d.Domain,
-			Path:          path,
-			Title:         title,
-			CommentHex:    commentHex,
-			Kind:          kind,
-		})
+		e, err := emailGet(m.Email)
+		if err != nil {
+			// No such email.
+			continue
+		}
+
+		if !e.SendModeratorNotifications {
+			continue
+		}
+
+		statement := `
+			SELECT name
+			FROM commenters
+			WHERE email = $1;
+		`
+		row := db.QueryRow(statement, m.Email)
+		var name string
+		if err := row.Scan(&name); err != nil {
+			// The moderator has probably not created a commenter account.
+			// We should only send emails to people who signed up, so skip.
+			continue
+		}
+
+		if err := smtpEmailNotification(m.Email, name, kind, d.Domain, path, commentHex, commenterName, title, html, e.UnsubscribeSecretHex); err != nil {
+			logger.Errorf("error sending email to %s: %v", m.Email, err)
+			continue
+		}
 	}
 }
 
-func emailNotificationReply(d domain, path string, title string, commenterHex string, commentHex string, parentHex string, state string) {
+func emailNotificationReply(d domain, path string, title string, commenterHex string, commentHex string, html string, parentHex string, state string) {
 	// No reply notifications for root comments.
 	if parentHex == "root" {
 		return
@@ -105,20 +120,20 @@ func emailNotificationReply(d domain, path string, title string, commenterHex st
 		commenterName = c.Name
 	}
 
-	// We'll check if they want to receive reply notifications later at the time
-	// of sending.
-	emailNotificationEnqueue(emailNotification{
-		Email:         pc.Email,
-		CommenterName: commenterName,
-		Domain:        d.Domain,
-		Path:          path,
-		Title:         title,
-		CommentHex:    commentHex,
-		Kind:          "reply",
-	})
+	epc, err := emailGet(pc.Email)
+	if err != nil {
+		// No such email.
+		return
+	}
+
+	if !epc.SendReplyNotifications {
+		return
+	}
+
+	smtpEmailNotification(pc.Email, pc.Name, "reply", d.Domain, path, commentHex, commenterName, title, html, epc.UnsubscribeSecretHex)
 }
 
-func emailNotificationNew(d domain, path string, commenterHex string, commentHex string, parentHex string, state string) {
+func emailNotificationNew(d domain, path string, commenterHex string, commentHex string, html string, parentHex string, state string) {
 	p, err := pageGet(d.Domain, path)
 	if err != nil {
 		logger.Errorf("cannot get page to send email notification: %v", err)
@@ -128,11 +143,12 @@ func emailNotificationNew(d domain, path string, commenterHex string, commentHex
 	if p.Title == "" {
 		p.Title, err = pageTitleUpdate(d.Domain, path)
 		if err != nil {
-			logger.Errorf("cannot update/get page title to send email notification: %v", err)
-			return
+			// Not being able to update a page title isn't serious enough to skip an
+			// email notification.
+			p.Title = d.Domain
 		}
 	}
 
-	emailNotificationModerator(d, path, p.Title, commenterHex, commentHex, state)
-	emailNotificationReply(d, path, p.Title, commenterHex, commentHex, parentHex, state)
+	emailNotificationModerator(d, path, p.Title, commenterHex, commentHex, html, state)
+	emailNotificationReply(d, path, p.Title, commenterHex, commentHex, html, parentHex, state)
 }

api/email_notification_send.go

@@ -1,63 +0,0 @@
-package main
-
-import (
-	"html/template"
-)
-
-func emailNotificationSend(em string, kind string, notifications []emailNotification) {
-	if len(notifications) == 0 {
-		return
-	}
-
-	e, err := emailGet(em)
-	if err != nil {
-		logger.Errorf("cannot get email: %v", err)
-		return
-	}
-
-	messages := []emailNotificationText{}
-	for _, notification := range notifications {
-		statement := `
-			SELECT html
-			FROM comments
-			WHERE commentHex = $1;
-		`
-		row := db.QueryRow(statement, notification.CommentHex)
-
-		var html string
-		if err = row.Scan(&html); err != nil {
-			// the comment was deleted?
-			// TODO: is this the only error?
-			return
-		}
-
-		messages = append(messages, emailNotificationText{
-			emailNotification: notification,
-			Html:              template.HTML(html),
-		})
-	}
-
-	statement := `
-		SELECT name
-		FROM commenters
-		WHERE email = $1;
-	`
-	row := db.QueryRow(statement, em)
-
-	var name string
-	if err := row.Scan(&name); err != nil {
-		// The moderator has probably not created a commenter account. Let's just
-		// use their email as name.
-		name = nameFromEmail(em)
-	}
-
-	if err := emailNotificationPendingReset(em); err != nil {
-		logger.Errorf("cannot reset after email notification: %v", err)
-		return
-	}
-
-	if err := smtpEmailNotification(em, name, e.UnsubscribeSecretHex, messages, kind); err != nil {
-		logger.Errorf("cannot send email notification: %v", err)
-		return
-	}
-}

api/errors.go

@@ -37,6 +37,7 @@ var errorNotModerator = errors.New("You need to be a moderator to do that.")
 var errorNotADirectory = errors.New("The given path is not a directory.")
 var errorGzip = errors.New("Cannot GZip content.")
 var errorCannotDownloadDisqus = errors.New("We could not download your Disqus export file.")
+var errorCannotDownloadCommento = errors.New("We could not download your Commento export file.")
 var errorSelfVote = errors.New("You cannot vote on your own comment.")
 var errorInvalidConfigFile = errors.New("Invalid config file.")
 var errorInvalidConfigValue = errors.New("Invalid config value.")
@@ -46,3 +47,8 @@ var errorDatabaseMigration = errors.New("Encountered error applying database mig
 var errorNoSuchUnsubscribeSecretHex = errors.New("Invalid unsubscribe link.")
 var errorEmptyPaths = errors.New("Empty paths field.")
 var errorInvalidDomain = errors.New("Invalid domain name. Do not include the URL path after the forward slash.")
+var errorInvalidEntity = errors.New("That entity does not exist.")
+var errorCannotDeleteOwnerWithActiveDomains = errors.New("You cannot delete your account until all domains associated with your account are deleted.")
+var errorNoSuchOwner = errors.New("No such owner.")
+var errorCannotUpdateOauthProfile = errors.New("You cannot update the profile of an external account managed by third-party log in. Please use the appropriate platform to update your details.")
+var errorUnsupportedCommentoImportVersion = errors.New("Unsupported Commento import format version.")

api/forgot.go

@@ -0,0 +1,97 @@
+package main
+
+import (
+	"net/http"
+	"time"
+)
+
+func forgot(email string, entity string) error {
+	if email == "" {
+		return errorMissingField
+	}
+
+	if entity != "owner" && entity != "commenter" {
+		return errorInvalidEntity
+	}
+
+	if !smtpConfigured {
+		return errorSmtpNotConfigured
+	}
+
+	var hex string
+	var name string
+	if entity == "owner" {
+		o, err := ownerGetByEmail(email)
+		if err != nil {
+			if err == errorNoSuchEmail {
+				// TODO: use a more random time instead.
+				time.Sleep(1 * time.Second)
+				return nil
+			} else {
+				logger.Errorf("cannot get owner by email: %v", err)
+				return errorInternal
+			}
+		}
+		hex = o.OwnerHex
+		name = o.Name
+	} else {
+		c, err := commenterGetByEmail("commento", email)
+		if err != nil {
+			if err == errorNoSuchEmail {
+				// TODO: use a more random time instead.
+				time.Sleep(1 * time.Second)
+				return nil
+			} else {
+				logger.Errorf("cannot get commenter by email: %v", err)
+				return errorInternal
+			}
+		}
+		hex = c.CommenterHex
+		name = c.Name
+	}
+
+	resetHex, err := randomHex(32)
+	if err != nil {
+		return err
+	}
+
+	var statement string
+
+	statement = `
+		INSERT INTO
+		resetHexes (resetHex, hex, entity, sendDate)
+		VALUES     ($1,       $2,  $3,     $4      );
+	`
+	_, err = db.Exec(statement, resetHex, hex, entity, time.Now().UTC())
+	if err != nil {
+		logger.Errorf("cannot insert resetHex: %v", err)
+		return errorInternal
+	}
+
+	err = smtpResetHex(email, name, resetHex)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func forgotHandler(w http.ResponseWriter, r *http.Request) {
+	type request struct {
+		Email  *string `json:"email"`
+		Entity *string `json:"entity"`
+	}
+
+	var x request
+	if err := bodyUnmarshal(r, &x); err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	if err := forgot(*x.Email, *x.Entity); err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	bodyMarshal(w, response{"success": true})
+}

api/go.mod

@@ -0,0 +1,23 @@
+module gitlab.com/commento/commento/api
+
+go 1.12
+
+require (
+	cloud.google.com/go v0.26.0 // indirect
+	github.com/adtac/go-akismet v0.0.0-20181220032308-0ca9e1023047
+	github.com/disintegration/imaging v1.6.2
+	github.com/golang/protobuf v1.1.0 // indirect
+	github.com/gomodule/oauth1 v0.0.0-20181215000758-9a59ed3b0a84
+	github.com/gorilla/context v1.1.1 // indirect
+	github.com/gorilla/handlers v1.4.0
+	github.com/gorilla/mux v1.6.2
+	github.com/lib/pq v0.0.0-20180523175426-90697d60dd84
+	github.com/lunny/html2md v0.0.0-20180317074532-13aaeeae9fb2
+	github.com/microcosm-cc/bluemonday v1.0.0
+	github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473
+	github.com/russross/blackfriday v1.5.1
+	golang.org/x/crypto v0.0.0-20180808211826-de0752318171
+	golang.org/x/net v0.0.0-20180811021610-c39426892332
+	golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc
+	google.golang.org/appengine v1.1.0 // indirect
+)

api/go.sum

@@ -0,0 +1,37 @@
+cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/adtac/go-akismet v0.0.0-20181220032308-0ca9e1023047 h1:ZC99vhH6LlWY7bstM3JhEZl1c0a0DWZPFe7+hvRwTlc=
+github.com/adtac/go-akismet v0.0.0-20181220032308-0ca9e1023047/go.mod h1:DU/mtPMgEDGGfgxGATXm2Br5+F7JOClQj9nHVKZMlns=
+github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
+github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+github.com/golang/protobuf v1.1.0 h1:0iH4Ffd/meGoXqF2lSAhZHt8X+cPgkfn/cb6Cce5Vpc=
+github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/gomodule/oauth1 v0.0.0-20181215000758-9a59ed3b0a84 h1:NlNEdePx7QY9Z4rds4EIe1dvUT8Ao1PZgLS80S5YTbU=
+github.com/gomodule/oauth1 v0.0.0-20181215000758-9a59ed3b0a84/go.mod h1:4r/a8/3RkhMBxJQWL5qzbOEcaQmNPIkNoI7P8sXeI08=
+github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
+github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
+github.com/gorilla/mux v1.6.2 h1:Pgr17XVTNXAk3q/r4CpKzC5xBM/qW1uVLV+IhRZpIIk=
+github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/lib/pq v0.0.0-20180523175426-90697d60dd84 h1:it29sI2IM490luSc3RAhp5WuCYnc6RtbfLVAB7nmC5M=
+github.com/lib/pq v0.0.0-20180523175426-90697d60dd84/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lunny/html2md v0.0.0-20180317074532-13aaeeae9fb2 h1:eShptbR1fYhyKFFrjdSY1QuW6ymkTLlgyNEeZMchy3s=
+github.com/lunny/html2md v0.0.0-20180317074532-13aaeeae9fb2/go.mod h1:lUUaVYlpAQ1Oo6vIZfec6CXQZjOvFZLyqaR8Dl7m+hk=
+github.com/microcosm-cc/bluemonday v1.0.0 h1:dr58SIfmOwOVr+m4Ye1xLWv8Dk9OFwXAtYnbJSmJ65k=
+github.com/microcosm-cc/bluemonday v1.0.0/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
+github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473 h1:J1QZwDXgZ4dJD2s19iqR9+U00OWM2kDzbf1O/fmvCWg=
+github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
+github.com/russross/blackfriday v1.5.1 h1:B8ZN6pD4PVofmlDCDUdELeYrbsVIDM/bpjW3v3zgcRc=
+github.com/russross/blackfriday v1.5.1/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+golang.org/x/crypto v0.0.0-20180808211826-de0752318171 h1:vYogbvSFj2YXcjQxFHu/rASSOt9sLytpCaSkiwQ135I=
+golang.org/x/crypto v0.0.0-20180808211826-de0752318171/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/net v0.0.0-20180811021610-c39426892332 h1:efGso+ep0DjyCBJPjvoz0HI6UldX4Md2F1rZFe1ir0E=
+golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc h1:3ElrZeO6IBP+M8kgu5YFwRo92Gqr+zBg3aooYQ6ziqU=
+golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=

api/main.go

@@ -10,8 +10,6 @@ func main() {
 	exitIfError(smtpTemplatesLoad())
 	exitIfError(oauthConfigure())
 	exitIfError(markdownRendererCreate())
-	exitIfError(emailNotificationPendingResetAll())
-	exitIfError(emailNotificationBegin())
 	exitIfError(sigintCleanupSetup())
 	exitIfError(versionCheckStart())
 	exitIfError(domainExportCleanupBegin())

api/oauth_github_callback.go

@@ -84,13 +84,11 @@ func githubCallbackHandler(w http.ResponseWriter, r *http.Request) {
 		email = user["email"].(string)
 	}
 
-	if user["name"] == nil {
-		fmt.Fprintf(w, "Error: no name returned by Github")
-		return
+	name := user["login"].(string)
+	if user["name"] != nil {
+		name = user["name"].(string)
 	}
 
-	name := user["name"].(string)
-
 	link := "undefined"
 	if user["html_url"] != nil {
 		link = user["html_url"].(string)
@@ -109,7 +107,6 @@ func githubCallbackHandler(w http.ResponseWriter, r *http.Request) {
 
 	var commenterHex string
 
-	// TODO: in case of returning users, update the information we have on record?
 	if err == errorNoSuchCommenter {
 		commenterHex, err = commenterNew(email, name, link, photo, "github", "")
 		if err != nil {
@@ -117,6 +114,11 @@ func githubCallbackHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	} else {
+		if err = commenterUpdate(c.CommenterHex, email, name, link, photo, "github"); err != nil {
+			logger.Warningf("cannot update commenter: %s", err)
+			// not a serious enough to exit with an error
+		}
+
 		commenterHex = c.CommenterHex
 	}
 

api/oauth_gitlab.go

@@ -35,6 +35,8 @@ func gitlabOauthConfigure() error {
 		},
 		Endpoint: gitlab.Endpoint,
 	}
+	gitlabConfig.Endpoint.AuthURL = os.Getenv("GITLAB_URL") + "/oauth/authorize"
+	gitlabConfig.Endpoint.TokenURL = os.Getenv("GITLAB_URL") + "/oauth/token"
 
 	gitlabConfigured = true
 

api/oauth_gitlab_callback.go

@@ -6,6 +6,7 @@ import (
 	"golang.org/x/oauth2"
 	"io/ioutil"
 	"net/http"
+	"os"
 )
 
 func gitlabCallbackHandler(w http.ResponseWriter, r *http.Request) {
@@ -24,7 +25,7 @@ func gitlabCallbackHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	resp, err := http.Get("https://gitlab.com/api/v4/user?access_token=" + token.AccessToken)
+	resp, err := http.Get(os.Getenv("GITLAB_URL") + "/api/v4/user?access_token=" + token.AccessToken)
 	if err != nil {
 		fmt.Fprintf(w, "Error: %s", err.Error())
 		return
@@ -76,7 +77,6 @@ func gitlabCallbackHandler(w http.ResponseWriter, r *http.Request) {
 
 	var commenterHex string
 
-	// TODO: in case of returning users, update the information we have on record?
 	if err == errorNoSuchCommenter {
 		commenterHex, err = commenterNew(email, name, link, photo, "gitlab", "")
 		if err != nil {
@@ -84,6 +84,11 @@ func gitlabCallbackHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	} else {
+		if err = commenterUpdate(c.CommenterHex, email, name, link, photo, "gitlab"); err != nil {
+			logger.Warningf("cannot update commenter: %s", err)
+			// not a serious enough to exit with an error
+		}
+
 		commenterHex = c.CommenterHex
 	}
 

api/oauth_google_callback.go

@@ -52,23 +52,32 @@ func googleCallbackHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	name := user["name"].(string)
+
+	link := "undefined"
+	if user["link"] != nil {
+		link = user["link"].(string)
+	}
+
+	photo := "undefined"
+	if user["picture"] != nil {
+		photo = user["picture"].(string)
+	}
+
 	var commenterHex string
 
-	// TODO: in case of returning users, update the information we have on record?
 	if err == errorNoSuchCommenter {
-		var link string
-		if val, ok := user["link"]; ok {
-			link = val.(string)
-		} else {
-			link = "undefined"
-		}
-
-		commenterHex, err = commenterNew(email, user["name"].(string), link, user["picture"].(string), "google", "")
+		commenterHex, err = commenterNew(email, name, link, photo, "google", "")
 		if err != nil {
 			fmt.Fprintf(w, "Error: %s", err.Error())
 			return
 		}
 	} else {
+		if err = commenterUpdate(c.CommenterHex, email, name, link, photo, "google"); err != nil {
+			logger.Warningf("cannot update commenter: %s", err)
+			// not a serious enough to exit with an error
+		}
+
 		commenterHex = c.CommenterHex
 	}
 

api/oauth_sso_callback.go

@@ -96,7 +96,6 @@ func ssoCallbackHandler(w http.ResponseWriter, r *http.Request) {
 
 	var commenterHex string
 
-	// TODO: in case of returning users, update the information we have on record?
 	if err == errorNoSuchCommenter {
 		commenterHex, err = commenterNew(payload.Email, payload.Name, payload.Link, payload.Photo, "sso:"+domain, "")
 		if err != nil {
@@ -104,6 +103,11 @@ func ssoCallbackHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	} else {
+		if err = commenterUpdate(c.CommenterHex, payload.Email, payload.Name, payload.Link, payload.Photo, "sso:"+domain); err != nil {
+			logger.Warningf("cannot update commenter: %s", err)
+			// not a serious enough to exit with an error
+		}
+
 		commenterHex = c.CommenterHex
 	}
 

api/oauth_twitter_callback.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -52,33 +53,20 @@ func twitterCallbackHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var res map[string]interface{}
+	var res twitterOAuthReponse
 	if err = json.NewDecoder(resp.Body).Decode(&res); err != nil {
 		fmt.Fprintf(w, "Error: %s\n", err.Error())
 		return
 	}
-
-	if res["email"] == nil {
-		fmt.Fprintf(w, "Error: no email address returned by Twitter")
+	if err := res.validate(); err != nil {
+		fmt.Fprintf(w, "Error: %s\n", err.Error())
 		return
 	}
 
-	email := res["email"].(string)
-
-	if res["name"] == nil {
-		fmt.Fprintf(w, "Error: no name returned by Twitter")
-		return
-	}
-
-	name := res["name"].(string)
-
-	link := "undefined"
-	photo := "undefined"
-	if res["handle"] != nil {
-		handle := res["screen_name"].(string)
-		link = "https://twitter.com/" + handle
-		photo = "https://twitter.com/" + handle + "/profile_image"
-	}
+	email := res.Email
+	name := res.Name
+	link := res.getLinkURL()
+	photo := res.getImageURL()
 
 	c, err := commenterGetByEmail("twitter", email)
 	if err != nil && err != errorNoSuchCommenter {
@@ -88,7 +76,6 @@ func twitterCallbackHandler(w http.ResponseWriter, r *http.Request) {
 
 	var commenterHex string
 
-	// TODO: in case of returning users, update the information we have on record?
 	if err == errorNoSuchCommenter {
 		commenterHex, err = commenterNew(email, name, link, photo, "twitter", "")
 		if err != nil {
@@ -96,6 +83,11 @@ func twitterCallbackHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	} else {
+		if err = commenterUpdate(c.CommenterHex, email, name, link, photo, "twitter"); err != nil {
+			logger.Warningf("cannot update commenter: %s", err)
+			// not a serious enough to exit with an error
+		}
+
 		commenterHex = c.CommenterHex
 	}
 
@@ -106,3 +98,38 @@ func twitterCallbackHandler(w http.ResponseWriter, r *http.Request) {
 
 	fmt.Fprintf(w, "<html><script>window.parent.close()</script></html>")
 }
+
+// response from Twitter API.
+// ref: https://developer.twitter.com/en/docs/tweets/data-dictionary/overview/user-object
+type twitterOAuthReponse struct {
+	Email      string `json:"email"`
+	Name       string `json:"name"`
+	ScreenName string `json:"screen_name"`
+	// normal image size is 48x48.
+	// ref: https://developer.twitter.com/en/docs/accounts-and-users/user-profile-images-and-banners
+	ImageURL string `json:"profile_image_url_https"`
+}
+
+func (r twitterOAuthReponse) validate() error {
+	if r.Email == "" {
+		return errors.New("no email address returned by Twitter")
+	}
+	if r.Name == "" {
+		return errors.New("no name returned by Twitter")
+	}
+	return nil
+}
+
+func (r twitterOAuthReponse) getLinkURL() string {
+	if r.ScreenName == "" {
+		return "undefined"
+	}
+	return fmt.Sprintf("https://twitter.com/%s", r.ScreenName)
+}
+
+func (r twitterOAuthReponse) getImageURL() string {
+	if r.ImageURL == "" {
+		return "undefined"
+	}
+	return r.ImageURL
+}

api/owner_confirm_hex_test.go

@@ -11,9 +11,9 @@ func TestOwnerConfirmHexBasics(t *testing.T) {
 	ownerHex, _ := ownerNew("test@example.com", "Test", "hunter2")
 
 	statement := `
-    UPDATE owners
-    SET confirmedEmail=false;
-  `
+		UPDATE owners
+		SET confirmedEmail=false;
+	`
 	_, err := db.Exec(statement)
 	if err != nil {
 		t.Errorf("unexpected error when setting confirmedEmail=false: %v", err)
@@ -23,10 +23,10 @@ func TestOwnerConfirmHexBasics(t *testing.T) {
 	confirmHex, _ := randomHex(32)
 
 	statement = `
-    INSERT INTO
-    ownerConfirmHexes (confirmHex, ownerHex, sendDate)
-    VALUES            ($1,         $2,       $3      );
-  `
+		INSERT INTO
+		ownerConfirmHexes (confirmHex, ownerHex, sendDate)
+		VALUES            ($1,         $2,       $3      );
+	`
 	_, err = db.Exec(statement, confirmHex, ownerHex, time.Now().UTC())
 	if err != nil {
 		t.Errorf("unexpected error creating inserting confirmHex: %v\n", err)
@@ -39,10 +39,10 @@ func TestOwnerConfirmHexBasics(t *testing.T) {
 	}
 
 	statement = `
-    SELECT confirmedEmail
-    FROM owners
-    WHERE ownerHex=$1;
-  `
+		SELECT confirmedEmail
+		FROM owners
+		WHERE ownerHex=$1;
+	`
 	row := db.QueryRow(statement, ownerHex)
 
 	var confirmedHex bool

api/owner_delete.go

@@ -0,0 +1,79 @@
+package main
+
+import (
+	"net/http"
+)
+
+func ownerDelete(ownerHex string, deleteDomains bool) error {
+	domains, err := domainList(ownerHex)
+	if err != nil {
+		return err
+	}
+
+	if len(domains) > 0 {
+		if !deleteDomains {
+			return errorCannotDeleteOwnerWithActiveDomains
+		}
+		for _, d := range domains {
+			if err := domainDelete(d.Domain); err != nil {
+				return err
+			}
+		}
+	}
+
+	statement := `
+		DELETE FROM owners
+		WHERE ownerHex = $1;
+	`
+	_, err = db.Exec(statement, ownerHex)
+	if err != nil {
+		return errorNoSuchOwner
+	}
+
+	statement = `
+		DELETE FROM ownersessions
+		WHERE ownerHex = $1;
+	`
+	_, err = db.Exec(statement, ownerHex)
+	if err != nil {
+		logger.Errorf("cannot delete from ownersessions: %v", err)
+		return errorInternal
+	}
+
+	statement = `
+		DELETE FROM resethexes
+		WHERE hex = $1;
+	`
+	_, err = db.Exec(statement, ownerHex)
+	if err != nil {
+		logger.Errorf("cannot delete from resethexes: %v", err)
+		return errorInternal
+	}
+
+	return nil
+}
+
+func ownerDeleteHandler(w http.ResponseWriter, r *http.Request) {
+	type request struct {
+		OwnerToken *string `json:"ownerToken"`
+	}
+
+	var x request
+	if err := bodyUnmarshal(r, &x); err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	o, err := ownerGetByOwnerToken(*x.OwnerToken)
+	if err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	if err = ownerDelete(o.OwnerHex, false); err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	bodyMarshal(w, response{"success": true})
+}

api/owner_get.go

@@ -2,20 +2,38 @@ package main
 
 import ()
 
+var ownersRowColumns string = `
+	owners.ownerHex,
+	owners.email,
+	owners.name,
+	owners.confirmedEmail,
+	owners.joinDate
+`
+
+func ownersRowScan(s sqlScanner, o *owner) error {
+	return s.Scan(
+		&o.OwnerHex,
+		&o.Email,
+		&o.Name,
+		&o.ConfirmedEmail,
+		&o.JoinDate,
+	)
+}
+
 func ownerGetByEmail(email string) (owner, error) {
 	if email == "" {
 		return owner{}, errorMissingField
 	}
 
 	statement := `
-    SELECT ownerHex, email, name, confirmedEmail, joinDate
-    FROM owners
-    WHERE email=$1;
-  `
+		SELECT ` + ownersRowColumns + `
+		FROM owners
+		WHERE email=$1;
+	`
 	row := db.QueryRow(statement, email)
 
 	var o owner
-	if err := row.Scan(&o.OwnerHex, &o.Email, &o.Name, &o.ConfirmedEmail, &o.JoinDate); err != nil {
+	if err := ownersRowScan(row, &o); err != nil {
 		// TODO: Make sure this is actually no such email.
 		return owner{}, errorNoSuchEmail
 	}
@@ -29,17 +47,17 @@ func ownerGetByOwnerToken(ownerToken string) (owner, error) {
 	}
 
 	statement := `
-    SELECT ownerHex, email, name, confirmedEmail, joinDate
+		SELECT ` + ownersRowColumns + `
 		FROM owners
-		WHERE ownerHex IN (
-			SELECT ownerHex FROM ownerSessions
-			WHERE ownerToken = $1
+		WHERE owners.ownerHex IN (
+			SELECT ownerSessions.ownerHex FROM ownerSessions
+			WHERE ownerSessions.ownerToken = $1
 		);
 	`
 	row := db.QueryRow(statement, ownerToken)
 
 	var o owner
-	if err := row.Scan(&o.OwnerHex, &o.Email, &o.Name, &o.ConfirmedEmail, &o.JoinDate); err != nil {
+	if err := ownersRowScan(row, &o); err != nil {
 		logger.Errorf("cannot scan owner: %v\n", err)
 		return owner{}, errorInternal
 	}
@@ -53,14 +71,14 @@ func ownerGetByOwnerHex(ownerHex string) (owner, error) {
 	}
 
 	statement := `
-    SELECT ownerHex, email, name, confirmedEmail, joinDate
+		SELECT ` + ownersRowColumns + `
 		FROM owners
 		WHERE ownerHex = $1;
 	`
 	row := db.QueryRow(statement, ownerHex)
 
 	var o owner
-	if err := row.Scan(&o.OwnerHex, &o.Email, &o.Name, &o.ConfirmedEmail, &o.JoinDate); err != nil {
+	if err := ownersRowScan(row, &o); err != nil {
 		logger.Errorf("cannot scan owner: %v\n", err)
 		return owner{}, errorInternal
 	}

api/owner_new.go

@@ -56,10 +56,10 @@ func ownerNew(email string, name string, password string) (string, error) {
 		}
 
 		statement = `
-      INSERT INTO
-      ownerConfirmHexes (confirmHex, ownerHex, sendDate)
-      VALUES            ($1,         $2,       $3      );
-    `
+			INSERT INTO
+			ownerConfirmHexes (confirmHex, ownerHex, sendDate)
+			VALUES            ($1,         $2,       $3      );
+		`
 		_, err = db.Exec(statement, confirmHex, ownerHex, time.Now().UTC())
 		if err != nil {
 			logger.Errorf("cannot insert confirmHex: %v\n", err)
@@ -92,10 +92,8 @@ func ownerNewHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if _, err := commenterNew(*x.Email, *x.Name, "undefined", "undefined", "commento", *x.Password); err != nil {
-		bodyMarshal(w, response{"success": false, "message": err.Error()})
-		return
-	}
+	// Errors in creating a commenter account should not hold this up.
+	_, _ = commenterNew(*x.Email, *x.Name, "undefined", "undefined", "commento", *x.Password)
 
 	bodyMarshal(w, response{"success": true, "confirmEmail": smtpConfigured})
 }

api/owner_reset_hex.go

@@ -1,70 +0,0 @@
-package main
-
-import (
-	"net/http"
-	"time"
-)
-
-func ownerSendResetHex(email string) error {
-	if email == "" {
-		return errorMissingField
-	}
-
-	if !smtpConfigured {
-		return errorSmtpNotConfigured
-	}
-
-	o, err := ownerGetByEmail(email)
-	if err != nil {
-		if err == errorNoSuchEmail {
-			// TODO: use a more random time instead.
-			time.Sleep(1 * time.Second)
-			return nil
-		} else {
-			logger.Errorf("cannot get owner by email: %v", err)
-			return errorInternal
-		}
-	}
-
-	resetHex, err := randomHex(32)
-	if err != nil {
-		return err
-	}
-
-	statement := `
-		INSERT INTO
-		ownerResetHexes (resetHex, ownerHex, sendDate)
-		VALUES          ($1,       $2,    $3      );
-	`
-	_, err = db.Exec(statement, resetHex, o.OwnerHex, time.Now().UTC())
-	if err != nil {
-		logger.Errorf("cannot insert resetHex: %v", err)
-		return errorInternal
-	}
-
-	err = smtpOwnerResetHex(email, o.Name, resetHex)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func ownerSendResetHexHandler(w http.ResponseWriter, r *http.Request) {
-	type request struct {
-		Email *string `json:"email"`
-	}
-
-	var x request
-	if err := bodyUnmarshal(r, &x); err != nil {
-		bodyMarshal(w, response{"success": false, "message": err.Error()})
-		return
-	}
-
-	if err := ownerSendResetHex(*x.Email); err != nil {
-		bodyMarshal(w, response{"success": false, "message": err.Error()})
-		return
-	}
-
-	bodyMarshal(w, response{"success": true})
-}

api/owner_reset_password.go

@@ -1,73 +0,0 @@
-package main
-
-import (
-	"golang.org/x/crypto/bcrypt"
-	"net/http"
-)
-
-func ownerResetPassword(resetHex string, password string) error {
-	if resetHex == "" || password == "" {
-		return errorMissingField
-	}
-
-	passwordHash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
-	if err != nil {
-		logger.Errorf("cannot generate hash from password: %v\n", err)
-		return errorInternal
-	}
-
-	statement := `
-		UPDATE owners SET passwordHash=$1
-		WHERE ownerHex = (
-			SELECT ownerHex
-			FROM ownerResetHexes
-			WHERE resetHex=$2
-		);
-	`
-	res, err := db.Exec(statement, string(passwordHash), resetHex)
-	if err != nil {
-		logger.Errorf("cannot change user's password: %v\n", err)
-		return errorInternal
-	}
-
-	count, err := res.RowsAffected()
-	if err != nil {
-		logger.Errorf("cannot count rows affected: %v\n", err)
-		return errorInternal
-	}
-
-	if count == 0 {
-		return errorNoSuchResetToken
-	}
-
-	statement = `
-		DELETE FROM ownerResetHexes
-    WHERE resetHex=$1;
-	`
-	_, err = db.Exec(statement, resetHex)
-	if err != nil {
-		logger.Warningf("cannot remove reset token: %v\n", err)
-	}
-
-	return nil
-}
-
-func ownerResetPasswordHandler(w http.ResponseWriter, r *http.Request) {
-	type request struct {
-		ResetHex *string `json:"resetHex"`
-		Password *string `json:"password"`
-	}
-
-	var x request
-	if err := bodyUnmarshal(r, &x); err != nil {
-		bodyMarshal(w, response{"success": false, "message": err.Error()})
-		return
-	}
-
-	if err := ownerResetPassword(*x.ResetHex, *x.Password); err != nil {
-		bodyMarshal(w, response{"success": false, "message": err.Error()})
-		return
-	}
-
-	bodyMarshal(w, response{"success": true})
-}

api/owner_reset_password_test.go

@@ -1,40 +0,0 @@
-package main
-
-import (
-	"testing"
-	"time"
-)
-
-func TestOwnerResetPasswordBasics(t *testing.T) {
-	failTestOnError(t, setupTestEnv())
-
-	ownerHex, _ := ownerNew("test@example.com", "Test", "hunter2")
-
-	resetHex, _ := randomHex(32)
-
-	statement := `
-		INSERT INTO
-		ownerResetHexes (resetHex, ownerHex, sendDate)
-		VALUES          ($1,       $2,    $3         );
-	`
-	_, err := db.Exec(statement, resetHex, ownerHex, time.Now().UTC())
-	if err != nil {
-		t.Errorf("unexpected error inserting resetHex: %v", err)
-		return
-	}
-
-	if err = ownerResetPassword(resetHex, "hunter3"); err != nil {
-		t.Errorf("unexpected error resetting password: %v", err)
-		return
-	}
-
-	if _, err := ownerLogin("test@example.com", "hunter2"); err == nil {
-		t.Errorf("expected error not found when given old password")
-		return
-	}
-
-	if _, err := ownerLogin("test@example.com", "hunter3"); err != nil {
-		t.Errorf("unexpected error when logging in: %v", err)
-		return
-	}
-}

api/reset.go

@@ -0,0 +1,82 @@
+package main
+
+import (
+	"golang.org/x/crypto/bcrypt"
+	"net/http"
+)
+
+func reset(resetHex string, password string) (string, error) {
+	if resetHex == "" || password == "" {
+		return "", errorMissingField
+	}
+
+	statement := `
+		SELECT hex, entity
+		FROM resetHexes
+		WHERE resetHex = $1;
+	`
+	row := db.QueryRow(statement, resetHex)
+
+	var hex string
+	var entity string
+	if err := row.Scan(&hex, &entity); err != nil {
+		// TODO: is this the only error?
+		return "", errorNoSuchResetToken
+	}
+
+	passwordHash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
+	if err != nil {
+		logger.Errorf("cannot generate hash from password: %v\n", err)
+		return "", errorInternal
+	}
+
+	if entity == "owner" {
+		statement = `
+			UPDATE owners SET passwordHash = $1
+			WHERE ownerHex = $2;
+		`
+	} else {
+		statement = `
+			UPDATE commenters SET passwordHash = $1
+			WHERE commenterHex = $2;
+		`
+	}
+
+	_, err = db.Exec(statement, string(passwordHash), hex)
+	if err != nil {
+		logger.Errorf("cannot change %s's password: %v\n", entity, err)
+		return "", errorInternal
+	}
+
+	statement = `
+		DELETE FROM resetHexes
+		WHERE resetHex = $1;
+	`
+	_, err = db.Exec(statement, resetHex)
+	if err != nil {
+		logger.Warningf("cannot remove resetHex: %v\n", err)
+	}
+
+	return entity, nil
+}
+
+func resetHandler(w http.ResponseWriter, r *http.Request) {
+	type request struct {
+		ResetHex *string `json:"resetHex"`
+		Password *string `json:"password"`
+	}
+
+	var x request
+	if err := bodyUnmarshal(r, &x); err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	entity, err := reset(*x.ResetHex, *x.Password)
+	if err != nil {
+		bodyMarshal(w, response{"success": false, "message": err.Error()})
+		return
+	}
+
+	bodyMarshal(w, response{"success": true, "entity": entity})
+}

api/router_api.go

@@ -8,9 +8,8 @@ func apiRouterInit(router *mux.Router) error {
 	router.HandleFunc("/api/owner/new", ownerNewHandler).Methods("POST")
 	router.HandleFunc("/api/owner/confirm-hex", ownerConfirmHexHandler).Methods("GET")
 	router.HandleFunc("/api/owner/login", ownerLoginHandler).Methods("POST")
-	router.HandleFunc("/api/owner/send-reset-hex", ownerSendResetHexHandler).Methods("POST")
-	router.HandleFunc("/api/owner/reset-password", ownerResetPasswordHandler).Methods("POST")
 	router.HandleFunc("/api/owner/self", ownerSelfHandler).Methods("POST")
+	router.HandleFunc("/api/owner/delete", ownerDeleteHandler).Methods("POST")
 
 	router.HandleFunc("/api/domain/new", domainNewHandler).Methods("POST")
 	router.HandleFunc("/api/domain/delete", domainDeleteHandler).Methods("POST")
@@ -22,6 +21,7 @@ func apiRouterInit(router *mux.Router) error {
 	router.HandleFunc("/api/domain/moderator/delete", domainModeratorDeleteHandler).Methods("POST")
 	router.HandleFunc("/api/domain/statistics", domainStatisticsHandler).Methods("POST")
 	router.HandleFunc("/api/domain/import/disqus", domainImportDisqusHandler).Methods("POST")
+	router.HandleFunc("/api/domain/import/commento", domainImportCommentoHandler).Methods("POST")
 	router.HandleFunc("/api/domain/export/begin", domainExportBeginHandler).Methods("POST")
 	router.HandleFunc("/api/domain/export/download", domainExportDownloadHandler).Methods("GET")
 
@@ -29,8 +29,12 @@ func apiRouterInit(router *mux.Router) error {
 	router.HandleFunc("/api/commenter/new", commenterNewHandler).Methods("POST")
 	router.HandleFunc("/api/commenter/login", commenterLoginHandler).Methods("POST")
 	router.HandleFunc("/api/commenter/self", commenterSelfHandler).Methods("POST")
+	router.HandleFunc("/api/commenter/update", commenterUpdateHandler).Methods("POST")
 	router.HandleFunc("/api/commenter/photo", commenterPhotoHandler).Methods("GET")
 
+	router.HandleFunc("/api/forgot", forgotHandler).Methods("POST")
+	router.HandleFunc("/api/reset", resetHandler).Methods("POST")
+
 	router.HandleFunc("/api/email/get", emailGetHandler).Methods("POST")
 	router.HandleFunc("/api/email/update", emailUpdateHandler).Methods("POST")
 	router.HandleFunc("/api/email/moderate", emailModerateHandler).Methods("GET")
@@ -51,6 +55,7 @@ func apiRouterInit(router *mux.Router) error {
 	router.HandleFunc("/api/oauth/sso/callback", ssoCallbackHandler).Methods("GET")
 
 	router.HandleFunc("/api/comment/new", commentNewHandler).Methods("POST")
+	router.HandleFunc("/api/comment/edit", commentEditHandler).Methods("POST")
 	router.HandleFunc("/api/comment/list", commentListHandler).Methods("POST")
 	router.HandleFunc("/api/comment/count", commentCountHandler).Methods("POST")
 	router.HandleFunc("/api/comment/vote", commentVoteHandler).Methods("POST")

api/router_static.go

@@ -96,12 +96,14 @@ func staticRouterInit(router *mux.Router) error {
 	pages := []string{
 		"/login",
 		"/forgot",
-		"/reset-password",
+		"/reset",
 		"/signup",
 		"/confirm-email",
 		"/unsubscribe",
 		"/dashboard",
+		"/settings",
 		"/logout",
+		"/profile",
 	}
 
 	for _, page := range pages {

api/smtp_configure.go

@@ -19,10 +19,6 @@ func smtpConfigure() error {
 		return nil
 	}
 
-	if username == "" || password == "" {
-		logger.Warningf("no SMTP username/password set, Commento will assume they aren't required")
-	}
-
 	if os.Getenv("SMTP_FROM_ADDRESS") == "" {
 		logger.Errorf("COMMENTO_SMTP_FROM_ADDRESS not set")
 		smtpConfigured = false
@@ -30,7 +26,11 @@ func smtpConfigure() error {
 	}
 
 	logger.Infof("configuring smtp: %s", host)
-	smtpAuth = smtp.PlainAuth("", username, password, host)
+	if username == "" || password == "" {
+		logger.Warningf("no SMTP username/password set, Commento will assume they aren't required")
+	} else {
+		smtpAuth = smtp.PlainAuth("", username, password, host)
+	}
 	smtpConfigured = true
 	return nil
 }

api/smtp_email_notification.go

@@ -9,43 +9,19 @@ import (
 	tt "text/template"
 )
 
-type emailNotificationText struct {
-	emailNotification
-	Html ht.HTML
-}
-
 type emailNotificationPlugs struct {
 	Origin               string
 	Kind                 string
-	Subject              string
 	UnsubscribeSecretHex string
-	Notifications        []emailNotificationText
+	Domain               string
+	Path                 string
+	CommentHex           string
+	CommenterName        string
+	Title                string
+	Html                 ht.HTML
 }
 
-func smtpEmailNotification(to string, toName string, unsubscribeSecretHex string, notifications []emailNotificationText, kind string) error {
-	var subject string
-	if kind == "reply" {
-		var verb string
-		if len(notifications) > 1 {
-			verb = "replies"
-		} else {
-			verb = "reply"
-		}
-		subject = fmt.Sprintf("%d new comment %s", len(notifications), verb)
-	} else {
-		var verb string
-		if len(notifications) > 1 {
-			verb = "comments"
-		} else {
-			verb = "comment"
-		}
-		if kind == "pending-moderation" {
-			subject = fmt.Sprintf("%d new %s pending moderation", len(notifications), verb)
-		} else {
-			subject = fmt.Sprintf("%d new %s on your website", len(notifications), verb)
-		}
-	}
-
+func smtpEmailNotification(to string, toName string, kind string, domain string, path string, commentHex string, commenterName string, title string, html string, unsubscribeSecretHex string) error {
 	h, err := tt.New("header").Parse(`MIME-Version: 1.0
 From: Commento <{{.FromAddress}}>
 To: {{.ToName}} <{{.ToAddress}}>
@@ -53,9 +29,8 @@ Content-Type: text/html; charset=UTF-8
 Subject: {{.Subject}}
 
 `)
-
 	var header bytes.Buffer
-	h.Execute(&header, &headerPlugs{FromAddress: os.Getenv("SMTP_FROM_ADDRESS"), ToAddress: to, ToName: toName, Subject: "[Commento] " + subject})
+	h.Execute(&header, &headerPlugs{FromAddress: os.Getenv("SMTP_FROM_ADDRESS"), ToAddress: to, ToName: toName, Subject: "[Commento] " + title})
 
 	t, err := ht.ParseFiles(fmt.Sprintf("%s/templates/email-notification.txt", os.Getenv("STATIC")))
 	if err != nil {
@@ -67,9 +42,13 @@ Subject: {{.Subject}}
 	err = t.Execute(&body, &emailNotificationPlugs{
 		Origin:               os.Getenv("ORIGIN"),
 		Kind:                 kind,
-		Subject:              subject,
+		Domain:               domain,
+		Path:                 path,
+		CommentHex:           commentHex,
+		CommenterName:        commenterName,
+		Title:                title,
+		Html:                 ht.HTML(html),
 		UnsubscribeSecretHex: unsubscribeSecretHex,
-		Notifications:        notifications,
 	})
 	if err != nil {
 		logger.Errorf("error generating templated HTML for email notification: %v", err)

api/smtp_reset_hex.go

@@ -6,17 +6,17 @@ import (
 	"os"
 )
 
-type ownerResetHexPlugs struct {
+type resetHexPlugs struct {
 	Origin   string
 	ResetHex string
 }
 
-func smtpOwnerResetHex(to string, toName string, resetHex string) error {
+func smtpResetHex(to string, toName string, resetHex string) error {
 	var header bytes.Buffer
 	headerTemplate.Execute(&header, &headerPlugs{FromAddress: os.Getenv("SMTP_FROM_ADDRESS"), ToAddress: to, ToName: toName, Subject: "Reset your password"})
 
 	var body bytes.Buffer
-	templates["reset-hex"].Execute(&body, &ownerResetHexPlugs{Origin: os.Getenv("ORIGIN"), ResetHex: resetHex})
+	templates["reset-hex"].Execute(&body, &resetHexPlugs{Origin: os.Getenv("ORIGIN"), ResetHex: resetHex})
 
 	err := smtp.SendMail(os.Getenv("SMTP_HOST")+":"+os.Getenv("SMTP_PORT"), smtpAuth, os.Getenv("SMTP_FROM_ADDRESS"), []string{to}, concat(header, body))
 	if err != nil {

api/testing.go

@@ -2,9 +2,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/op/go-logging"
 	"os"
 	"testing"
+
+	"github.com/op/go-logging"
 )
 
 func failTestOnError(t *testing.T, err error) {
@@ -15,10 +16,10 @@ func failTestOnError(t *testing.T, err error) {
 
 func getPublicTables() ([]string, error) {
 	statement := `
-    SELECT tablename
-    FROM pg_tables
-    WHERE schemaname='public';
-  `
+		SELECT tablename
+		FROM pg_tables
+		WHERE schemaname='public';
+	`
 	rows, err := db.Query(statement)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "cannot query public tables: %v", err)

api/utils_misc.go

@@ -10,16 +10,6 @@ func concat(a bytes.Buffer, b bytes.Buffer) []byte {
 	return append(a.Bytes(), b.Bytes()...)
 }
 
-func nameFromEmail(email string) string {
-	for i, c := range email {
-		if c == '@' {
-			return email[:i]
-		}
-	}
-
-	return email
-}
-
 func exitIfError(err error) {
 	if err != nil {
 		fmt.Printf("fatal error: %v\n", err)

api/utils_sanitise.go

@@ -18,13 +18,13 @@ func emailStrip(email string) string {
 }
 
 var https = regexp.MustCompile(`(https?://)`)
-var trailingSlash = regexp.MustCompile(`(/*$)`)
+var domainTrail = regexp.MustCompile(`(/.*$)`)
 
 func domainStrip(domain string) string {
-	noSlash := trailingSlash.ReplaceAllString(domain, ``)
-	noProtocol := https.ReplaceAllString(noSlash, ``)
+	noProtocol := https.ReplaceAllString(domain, ``)
+	noTrail := domainTrail.ReplaceAllString(noProtocol, ``)
 
-	return noProtocol
+	return noTrail
 }
 
 var pathMatch = regexp.MustCompile(`(https?://[^/]*)`)

api/utils_sql.go

@@ -0,0 +1,11 @@
+package main
+
+import ()
+
+// scanner is a database/sql abstraction interface that can be used with both
+// *sql.Row and *sql.Rows.
+type sqlScanner interface {
+	// Scan copies columns from the underlying query row(s) to the values
+	// pointed to by dest.
+	Scan(dest ...interface{}) error
+}

db/20190505191006-comment-count-decrease.sql

@@ -0,0 +1,13 @@
+-- This trigger is called every time a comment is deleted, so the comment count for the page where the comment belong is updated
+CREATE OR REPLACE FUNCTION commentsDeleteTriggerFunction() RETURNS TRIGGER AS $trigger$
+BEGIN
+  UPDATE pages
+  SET commentCount = commentCount - 1
+  WHERE domain = old.domain AND path = old.path;
+
+  DELETE FROM comments
+  WHERE parentHex = old.commentHex;
+
+  RETURN NEW;
+END;
+$trigger$ LANGUAGE plpgsql;

db/20190508222848-reset-count.sql

@@ -0,0 +1,2 @@
+UPDATE pages
+SET commentCount = commentCount + 1;

db/20190606000842-reset-hex.sql

@@ -0,0 +1,8 @@
+-- Create the resetHexes table
+
+ALTER TABLE ownerResetHexes RENAME TO resetHexes;
+
+ALTER TABLE resetHexes RENAME ownerHex TO hex;
+
+ALTER TABLE resetHexes
+  ADD entity TEXT NOT NULL DEFAULT 'owner';

db/20190913175445-delete-comments.sql

@@ -0,0 +1,6 @@
+DROP TRIGGER IF EXISTS commentsDeleteTrigger ON comments;
+
+DROP FUNCTION IF EXISTS commentsDeleteTriggerFunction;
+
+ALTER TABLE comments
+  ADD deleted BOOLEAN NOT NULL DEFAULT false;

db/20191204173000-sort-method.sql

@@ -0,0 +1,10 @@
+-- Default sort policy for each domain
+
+CREATE TYPE sortPolicy AS ENUM (
+  'score-desc',
+  'creationdate-desc',
+  'creationdate-asc'
+);
+
+ALTER TABLE domains
+  ADD defaultSortPolicy sortPolicy NOT NULL DEFAULT 'score-desc';

frontend/dashboard.html

@@ -14,6 +14,7 @@
   <div id="navbar" class="navbar">
     <a href="[[[.Origin]]]/" class="navbar-item navbar-logo-text"><img src="[[[.CdnPrefix]]]/images/logo.svg" class="navbar-logo">Commento</a>
     <div class="navbar-item">
+      <a href="[[[.Origin]]]/settings" class="navbar-item">Settings</a>
       <a href="[[[.Origin]]]/logout" class="navbar-item">Logout</a>
       <div class="float-right"><b><div id="owner-name"></div></b></div>
     </div>
@@ -102,7 +103,7 @@
                   <br>
 
                   <div class="normal-text">
-                    Read the Commento documentation <a href="https://docs.commento.io/configuration/">on configuration</a>.
+                    Read the Commento documentation <a href="https://docs.commento.io/configuration/frontend/">on configuration</a>.
                   </div>
                 </div>
               </div>
@@ -204,6 +205,26 @@
                     </div>
                   </div>
 
+                  <div class="question">
+                    <div class="title">
+                      Comment Sorting
+                    </div>
+                    <div class="answer">
+                      <div class="row no-border commento-round-check">
+                        <input type="radio" id="defaultSortPolicy-score-desc" value="score-desc" v-model="domains[cd].defaultSortPolicy">
+                        <label for="defaultSortPolicy-score-desc">Most upvoted first</label>
+                      </div>
+                      <div class="row no-border commento-round-check">
+                        <input type="radio" id="defaultSortPolicy-creationdate-desc" value="creationdate-desc" v-model="domains[cd].defaultSortPolicy">
+                        <label for="defaultSortPolicy-creationdate-desc">Newest first</label>
+                      </div>
+                      <div class="row no-border commento-round-check">
+                        <input type="radio" id="defaultSortPolicy-creationdate-asc" value="creationdate-asc" v-model="domains[cd].defaultSortPolicy">
+                        <label for="defaultSortPolicy-creationdate-asc">Oldest first</label>
+                      </div>
+                    </div>
+                  </div>
+
                   <div class="center">
                     <button id="save-general-button" onclick="window.commento.generalSaveHandler()" class="button">Save Changes</button>
                   </div>
@@ -314,12 +335,32 @@
                         </div>
                       </div>
 
-                      <div class="warning" v-if="!domains[cd].allowAnonymous && !domains[cd].commentoProvider && !domains[cd].googleProvider && !domains[cd].twitterProvider && !domains[cd].githubProvider && !domains[cd].gitlabProvider">
+                      <div class="warning" v-if="!domains[cd].allowAnonymous && !domains[cd].commentoProvider && (!configuredOauths.google || !domains[cd].googleProvider) && (!configuredOauths.twitter || !domains[cd].twitterProvider) && (!configuredOauths.github || !domains[cd].githubProvider) && (!configuredOauths.gitlab || !domains[cd].gitlabProvider) && !domains[cd].ssoProvider">
                         You have disabled all authentication options. Your readers will not be able to login, create comments, or vote.
                       </div>
                     </div>
                   </div>
 
+                  <div class="question">
+                    <div class="title">
+                      Default Comment Sorting
+                    </div>
+                    <div class="answer">
+                      <div class="row no-border commento-round-check">
+                        <input type="radio" id="defaultSortPolicy-score-desc" value="score-desc" v-model="domains[cd].defaultSortPolicy">
+                        <label for="defaultSortPolicy-score-desc">Most upvoted first</label>
+                      </div>
+                      <div class="row no-border commento-round-check">
+                        <input type="radio" id="defaultSortPolicy-creationdate-desc" value="creationdate-desc" v-model="domains[cd].defaultSortPolicy">
+                        <label for="defaultSortPolicy-creationdate-desc">Newest first</label>
+                      </div>
+                      <div class="row no-border commento-round-check">
+                        <input type="radio" id="defaultSortPolicy-creationdate-asc" value="creationdate-asc" v-model="domains[cd].defaultSortPolicy">
+                        <label for="defaultSortPolicy-creationdate-asc">Oldest first</label>
+                      </div>
+                    </div>
+                  </div>
+
                   <div class="center">
                     <button id="save-general-button" onclick="window.commento.generalSaveHandler()" class="button">Save Changes</button>
                   </div>
@@ -349,10 +390,11 @@
             <div class="tabs-container">
               <div class="tab">
                 <ul class="tabs">
-                  <li class="tab-link original current" data-tab="install-tab-1">Disqus</li>
+                  <li class="tab-link original current" data-tab="import-tab-1">Disqus</li>
+                  <li class="tab-link" data-tab="import-tab-2">Commento</li>
                 </ul>
 
-                <div id="install-tab-1" class="content original current">
+                <div id="import-tab-1" class="content original current">
                   <div class="normal-text">
                     If you're currently using Disqus, you can import all comments into Commento:
                     <ul>
@@ -392,6 +434,41 @@
                     </ul>
                   </div>
                 </div>
+
+                <div id="import-tab-2" class="content">
+                  <div class="normal-text">
+                    If you've previously exported data from Commento you can restore it:
+                    <ul>
+                      <li>
+                        Upload your exported data file somewhere in the cloud and generate a direct link to it. Ensure that the export file is a GZIP archive of a JSON file.
+                      </li>
+
+                      <li>
+                        Copy and paste that link here to start the import process:
+
+                        <br><br>
+
+                        <div class="commento-email-container">
+                          <div class="commento-email">
+                            <input class="commento-input" type="text" id="commento-url" placeholder="https://example.com/commento.json.gz">
+                            <button id="commento-import-button" class="commento-email-button" onclick="window.commento.importCommento()">Import</button>
+                          </div>
+                        </div>
+
+                        <br>
+                      </li>
+
+                      <li>
+                        Commento will automatically download this file, extract it, parse it and import comments into Commento. URL information, comment authors, text formatting, and nested replies will be preserved.
+                      </li>
+                        
+                      <li>
+                        It is strongly recommended you do this only once. Importing multiple times may have unintended effects.
+                      </li>
+                    </ul>
+                  </div>
+                </div>
+
               </div>
             </div>
           </div>

frontend/gulpfile.js

@@ -70,6 +70,14 @@ const jsCompileMap = {
     "js/dashboard-danger.js",
     "js/dashboard-export.js",
   ],
+  "js/settings.js": [
+    "js/constants.js",
+    "js/utils.js",
+    "js/http.js",
+    "js/errors.js",
+    "js/self.js",
+    "js/settings.js"
+  ],
   "js/logout.js": [
     "js/constants.js",
     "js/utils.js",
@@ -83,50 +91,66 @@ const jsCompileMap = {
     "js/http.js",
     "js/unsubscribe.js",
   ],
+  "js/profile.js": [
+    "js/constants.js",
+    "js/utils.js",
+    "js/http.js",
+    "js/profile.js",
+  ],
 };
 
-gulp.task("scss-devel", function () {
-  return gulp.src(scssSrc)
+gulp.task("scss-devel", function (done) {
+  let res = gulp.src(scssSrc)
     .pipe(sourcemaps.init())
     .pipe(sass({outputStyle: "expanded"}).on("error", sass.logError))
     .pipe(sourcemaps.write())
     .pipe(gulp.dest(develPath + cssDir));
+  done();
+  return res;
 });
 
-gulp.task("scss-prod", function () {
-  return gulp.src(scssSrc)
+gulp.task("scss-prod", function (done) {
+  let res = gulp.src(scssSrc)
     .pipe(sass({outputStyle: "compressed"}).on("error", sass.logError))
     .pipe(cleanCss({compatibility: "ie8", level: 2}))
     .pipe(gulp.dest(prodPath + cssDir));
+  done();
+  return res;
 });
 
-gulp.task("html-devel", function () {
+gulp.task("html-devel", function (done) {
   gulp.src([htmlGlob]).pipe(gulp.dest(develPath));
+  done();
 });
 
-gulp.task("html-prod", function () {
+gulp.task("html-prod", function (done) {
   gulp.src(htmlGlob)
     .pipe(htmlMinifier({collapseWhitespace: true, removeComments: true}))
     .pipe(gulp.dest(prodPath))
+  done();
 });
 
-gulp.task("fonts-devel", function () {
+gulp.task("fonts-devel", function (done) {
   gulp.src([fontsGlob]).pipe(gulp.dest(develPath + fontsDir));
+  done();
 });
 
-gulp.task("fonts-prod", function () {
+gulp.task("fonts-prod", function (done) {
   gulp.src([fontsGlob]).pipe(gulp.dest(prodPath + fontsDir));
+  done();
 });
 
-gulp.task("images-devel", function () {
+gulp.task("images-devel", function (done) {
   gulp.src([imagesGlob]).pipe(gulp.dest(develPath + imagesDir));
+  done();
 });
 
-gulp.task("images-prod", function () {
+gulp.task("images-prod", function (done) {
   gulp.src([imagesGlob]).pipe(gulp.dest(prodPath + imagesDir));
+  done();
 });
 
-gulp.task("js-devel", function () {
+gulp.task("js-devel", function (done) {
   for (let outputFile in jsCompileMap) {
     gulp.src(jsCompileMap[outputFile])
       .pipe(sourcemaps.init())
@@ -135,9 +159,10 @@ gulp.task("js-devel", function () {
       .pipe(sourcemaps.write())
       .pipe(gulp.dest(develPath))
   }
+  done();
 });
 
-gulp.task("js-prod", function () {
+gulp.task("js-prod", function (done) {
   for (let outputFile in jsCompileMap) {
     gulp.src(jsCompileMap[outputFile])
       .pipe(concat(outputFile))
@@ -145,13 +170,16 @@ gulp.task("js-prod", function () {
       .pipe(uglify())
       .pipe(gulp.dest(prodPath))
   }
+  done();
 });
 
-gulp.task("lint", function () {
-  return gulp.src(jsGlob)
+gulp.task("lint", function (done) {
+  let res = gulp.src(jsGlob)
     .pipe(eslint())
-    .pipe(eslint.failAfterError())
+    .pipe(eslint.failAfterError());
+  done();
+  return res;
 });
 
-gulp.task("devel", ["scss-devel", "html-devel", "fonts-devel", "images-devel", "lint", "js-devel"]);
-gulp.task("prod", ["scss-prod", "html-prod", "fonts-prod", "images-prod", "lint", "js-prod"]);
+gulp.task("devel", gulp.parallel("scss-devel", "html-devel", "fonts-devel", "images-devel", "lint", "js-devel"));
+gulp.task("prod", gulp.parallel("scss-prod", "html-prod", "fonts-prod", "images-prod", "lint", "js-prod"));

frontend/js/commento.js

@@ -22,20 +22,25 @@
   var ID_LOGIN_BOX_NAME_INPUT = "commento-login-box-name-input";
   var ID_LOGIN_BOX_WEBSITE_INPUT = "commento-login-box-website-input";
   var ID_LOGIN_BOX_EMAIL_BUTTON = "commento-login-box-email-button";
+  var ID_LOGIN_BOX_FORGOT_LINK_CONTAINER = "commento-login-box-forgot-link-container";
   var ID_LOGIN_BOX_LOGIN_LINK_CONTAINER = "commento-login-box-login-link-container";
-  var ID_LOGIN_BOX_LOGIN_LINK = "commento-login-box-login-link";
-  var ID_LOGIN_BOX_HR = "commento-login-box-hr";
+  var ID_LOGIN_BOX_SSO_PRETEXT = "commento-login-box-sso-pretext";
+  var ID_LOGIN_BOX_SSO_BUTTON_CONTAINER = "commento-login-box-sso-buttton-container";
+  var ID_LOGIN_BOX_HR1 = "commento-login-box-hr1";
   var ID_LOGIN_BOX_OAUTH_PRETEXT = "commento-login-box-oauth-pretext";
   var ID_LOGIN_BOX_OAUTH_BUTTONS_CONTAINER = "commento-login-box-oauth-buttons-container";
+  var ID_LOGIN_BOX_HR2 = "commento-login-box-hr2";
   var ID_MOD_TOOLS = "commento-mod-tools";
   var ID_MOD_TOOLS_LOCK_BUTTON = "commento-mod-tools-lock-button";
   var ID_ERROR = "commento-error";
   var ID_LOGGED_CONTAINER = "commento-logged-container";
+  var ID_PRE_COMMENTS_AREA = "commento-pre-comments-area";
   var ID_COMMENTS_AREA = "commento-comments-area";
   var ID_SUPER_CONTAINER = "commento-textarea-super-container-";
   var ID_TEXTAREA_CONTAINER = "commento-textarea-container-";
   var ID_TEXTAREA = "commento-textarea-";
   var ID_ANONYMOUS_CHECKBOX = "commento-anonymous-checkbox-";
+  var ID_SORT_POLICY = "commento-sort-policy-";
   var ID_CARD = "commento-comment-card-";
   var ID_BODY = "commento-comment-body-";
   var ID_TEXT = "commento-comment-text-";
@@ -63,11 +68,14 @@
   var origin = "[[[.Origin]]]";
   var cdn = "[[[.CdnPrefix]]]";
   var root = null;
+  var pageId = parent.location.pathname;
   var cssOverride;
   var noFonts;
+  var hideDeleted;
   var autoInit;
   var isAuthenticated = false;
   var comments = [];
+  var commentsMap = {};
   var commenters = {};
   var requireIdentification = true;
   var isModerator = false;
@@ -76,9 +84,12 @@
   var isLocked = false;
   var stickyCommentHex = "none";
   var shownReply = {};
+  var shownEdit = {};
   var configuredOauths = {};
+  var anonymousOnly = false;
   var popupBoxType = "login";
   var oauthButtonsShown = false;
+  var sortPolicy = "score-desc";
   var selfHex = undefined;
   var mobileView = null;
 
@@ -163,6 +174,13 @@
   }
 
 
+  function onload(node, f, arg) {
+    node.addEventListener("load", function() {
+      f(arg);
+    });
+  }
+
+
   function attrSet(node, a, value) {
     node.setAttribute(a, value);
   }
@@ -231,10 +249,24 @@
 
   global.logout = function() {
     cookieSet("commentoCommenterToken", "anonymous");
+    isAuthenticated = false;
+    isModerator = false;
+    selfHex = undefined;
     refreshAll();
   }
 
-  function selfLoad(commenter) {
+
+  function profileEdit() {
+    window.open(origin + "/profile?commenterToken=" + commenterTokenGet(), "_blank");
+  }
+
+
+  function notificationSettings(unsubscribeSecretHex) {
+    window.open(origin + "/unsubscribe?unsubscribeSecretHex=" + unsubscribeSecretHex, "_blank");
+  }
+
+
+  function selfLoad(commenter, email) {
     commenters[commenter.commenterHex] = commenter;
     selfHex = commenter.commenterHex;
 
@@ -247,7 +279,9 @@
       name = create("div");
     }
     var avatar;
-    var logout = create("div");
+    var notificationSettingsButton = create("div");
+    var profileEditButton = create("div");
+    var logoutButton = create("div");
     var color = colorGet(commenter.commenterHex + "-" + commenter.name);
 
     loggedContainer.id = ID_LOGGED_CONTAINER;
@@ -255,12 +289,18 @@
     classAdd(loggedContainer, "logged-container");
     classAdd(loggedInAs, "logged-in-as");
     classAdd(name, "name");
-    classAdd(logout, "logout");
+    classAdd(notificationSettingsButton, "profile-button");
+    classAdd(profileEditButton, "profile-button");
+    classAdd(logoutButton, "profile-button");
 
     name.innerText = commenter.name;
-    logout.innerText = "Logout";
+    notificationSettingsButton.innerText = "Notification Settings";
+    profileEditButton.innerText = "Edit Profile";
+    logoutButton.innerText = "Logout";
 
-    onclick(logout, global.logout);
+    onclick(logoutButton, global.logout);
+    onclick(notificationSettingsButton, notificationSettings, email.unsubscribeSecretHex);
+    onclick(profileEditButton, profileEdit);
 
     attrSet(loggedContainer, "style", "display: none");
     if (commenter.link !== "undefined") {
@@ -280,7 +320,11 @@
     append(loggedInAs, avatar);
     append(loggedInAs, name);
     append(loggedContainer, loggedInAs);
-    append(loggedContainer, logout);
+    append(loggedContainer, logoutButton);
+    if (commenter.provider === "commento") {
+      append(loggedContainer, profileEditButton);
+    }
+    append(loggedContainer, notificationSettingsButton);
     prepend(root, loggedContainer);
 
     isAuthenticated = true;
@@ -306,22 +350,22 @@
         return;
       }
 
-      selfLoad(resp.commenter);
-      global.allShow();
+      selfLoad(resp.commenter, resp.email);
+      allShow();
 
       call(callback);
     });
   }
 
 
-  function cssLoad(file, onload) {
+  function cssLoad(file, f) {
     var link = create("link");
     var head = document.getElementsByTagName("head")[0];
 
     link.type = "text/css";
     attrSet(link, "href", file);
     attrSet(link, "rel", "stylesheet");
-    attrSet(link, "onload", onload);
+    onload(link, f);
 
     append(head, link);
   }
@@ -357,7 +401,7 @@
     var json = {
       "commenterToken": commenterTokenGet(),
       "domain": parent.location.host,
-      "path": parent.location.pathname,
+      "path": pageId,
     };
 
     post(origin + "/api/comment/list", json, function(resp) {
@@ -379,6 +423,8 @@
       commenters = Object.assign({}, commenters, resp.commenters)
       configuredOauths = resp.configuredOauths;
 
+      sortPolicy = resp.defaultSortPolicy;
+
       call(callback);
     });
   }
@@ -496,7 +542,7 @@
   }
 
 
-  function textareaCreate(id) {
+  function textareaCreate(id, edit) {
     var textareaSuperContainer = create("div");
     var textareaContainer = create("div");
     var textarea = create("textarea");
@@ -526,11 +572,24 @@
     attrSet(anonymousCheckboxLabel, "for", ID_ANONYMOUS_CHECKBOX + id);
 
     anonymousCheckboxLabel.innerText = "Comment anonymously";
-    submitButton.innerText = "Add Comment";
+    if (edit === true) {
+      submitButton.innerText = "Save Changes";
+    } else {
+      submitButton.innerText = "Add Comment";
+    }
     markdownButton.innerHTML = "<b>M &#8595;</b> &nbsp; Markdown";
 
+    if (anonymousOnly) {
+      anonymousCheckbox.checked = true;
+      anonymousCheckbox.setAttribute("disabled", true);
+    }
+
     textarea.oninput = autoExpander(textarea);
-    onclick(submitButton, submitAccountDecide, id);
+    if (edit === true) {
+      onclick(submitButton, commentEdit, id);
+    } else {
+      onclick(submitButton, submitAccountDecide, id);
+    }
     onclick(markdownButton, markdownHelpShow, id);
 
     append(textareaContainer, textarea);
@@ -538,7 +597,7 @@
     append(anonymousCheckboxContainer, anonymousCheckbox);
     append(anonymousCheckboxContainer, anonymousCheckboxLabel);
     append(textareaSuperContainer, submitButton);
-    if (!requireIdentification) {
+    if (!requireIdentification && edit !== true) {
       append(textareaSuperContainer, anonymousCheckboxContainer);
     }
     append(textareaSuperContainer, markdownButton);
@@ -547,13 +606,62 @@
   }
 
 
+  var sortPolicyNames = {
+    "score-desc": "Upvotes",
+    "creationdate-desc": "Newest",
+    "creationdate-asc": "Oldest",
+  };
+
+
+  function sortPolicyApply(policy) {
+    classRemove($(ID_SORT_POLICY + sortPolicy), "sort-policy-button-selected");
+
+    var commentsArea = $(ID_COMMENTS_AREA);
+    commentsArea.innerHTML = "";
+    sortPolicy = policy;
+    var cards = commentsRecurse(parentMap(comments), "root");
+    if (cards) {
+      append(commentsArea, cards);
+    }
+
+    classAdd($(ID_SORT_POLICY + policy), "sort-policy-button-selected");
+  }
+
+
+  function sortPolicyBox() {
+    var sortPolicyButtonsContainer = create("div");
+    var sortPolicyButtons = create("div");
+
+    classAdd(sortPolicyButtonsContainer, "sort-policy-buttons-container");
+    classAdd(sortPolicyButtons, "sort-policy-buttons");
+
+    for (var sp in sortPolicyNames) {
+      var sortPolicyButton = create("a");
+      sortPolicyButton.id = ID_SORT_POLICY + sp;
+      classAdd(sortPolicyButton, "sort-policy-button");
+      if (sp === sortPolicy) {
+        classAdd(sortPolicyButton, "sort-policy-button-selected");
+      }
+      sortPolicyButton.innerText = sortPolicyNames[sp];
+      onclick(sortPolicyButton, sortPolicyApply, sp);
+      append(sortPolicyButtons, sortPolicyButton)
+    }
+
+    append(sortPolicyButtonsContainer, sortPolicyButtons);
+
+    return sortPolicyButtonsContainer
+  }
+
+
   function rootCreate(callback) {
     var login = create("div");
     var loginText = create("div");
     var mainArea = $(ID_MAIN_AREA);
+    var preCommentsArea = create("div");
     var commentsArea = create("div");
 
     login.id = ID_LOGIN;
+    preCommentsArea.id = ID_PRE_COMMENTS_AREA;
     commentsArea.id = ID_COMMENTS_AREA;
 
     classAdd(login, "login");
@@ -565,7 +673,17 @@
 
     onclick(loginText, global.loginBoxShow, null);
 
-    append(login, loginText);
+    var numOauthConfigured = 0;
+    Object.keys(configuredOauths).forEach(function(key) {
+      if (configuredOauths[key]) {
+        numOauthConfigured++;
+      }
+    });
+    if (numOauthConfigured > 0) {
+      append(login, loginText);
+    } else if (!requireIdentification) {
+      anonymousOnly = true;
+    }
 
     if (isLocked || isFrozen) {
       if (isAuthenticated || chosenAnonymous) {
@@ -584,6 +702,12 @@
       append(mainArea, textareaCreate("root"));
     }
 
+    if (comments.length > 0) {
+      append(mainArea, sortPolicyBox());
+    }
+
+    append(mainArea, preCommentsArea);
+
     append(mainArea, commentsArea);
     append(root, mainArea);
 
@@ -619,7 +743,7 @@
     var json = {
       "commenterToken": commenterToken,
       "domain": parent.location.host,
-      "path": parent.location.pathname,
+      "path": pageId,
       "parentHex": id,
       "markdown": markdown,
     };
@@ -648,19 +772,23 @@
         commenterHex = "anonymous";
       }
 
+      var comment = {
+        "commentHex": resp.commentHex,
+        "commenterHex": commenterHex,
+        "markdown": markdown,
+        "html": resp.html,
+        "parentHex": "root",
+        "score": 0,
+        "state": "approved",
+        "direction": 0,
+        "creationDate": new Date(),
+      };
+
       var newCard = commentsRecurse({
-        "root": [{
-          "commentHex": resp.commentHex,
-          "commenterHex": commenterHex,
-          "markdown": markdown,
-          "html": resp.html,
-          "parentHex": "root",
-          "score": 0,
-          "state": "approved",
-          "direction": 0,
-          "creationDate": new Date(),
-        }],
-      }, "root")
+        "root": [comment]
+      }, "root");
+
+      commentsMap[resp.commentHex] = comment;
 
       if (id !== "root") {
         textareaSuperContainer.replaceWith(newCard);
@@ -675,7 +803,7 @@
         onclick(replyButton, global.replyShow, id)
       } else {
         textarea.value = "";
-        insertAfter(textareaSuperContainer, newCard);
+        insertAfter($(ID_PRE_COMMENTS_AREA), newCard);
       }
 
       call(callback);
@@ -705,26 +833,35 @@
 
 
   function timeDifference(current, previous) { // thanks stackoverflow
-    var msJustNow = 5000;
-    var msPerMinute = 60000;
-    var msPerHour = 3600000;
-    var msPerDay = 86400000;
-    var msPerMonth = 2592000000;
-    var msPerYear = 946080000000;
+    // Times are defined in milliseconds
+    var msPerSecond = 1000;
+    var msPerMinute = 60 * msPerSecond;
+    var msPerHour = 60 * msPerMinute;
+    var msPerDay = 24 * msPerHour;
+    var msPerMonth = 30 * msPerDay;
+    var msPerYear = 12 * msPerMonth;
+
+    // Time ago thresholds
+    var msJustNow = 5 * msPerSecond; // Up until 5 s
+    var msMinutesAgo = 2 * msPerMinute; // Up until 2 minutes
+    var msHoursAgo = 2 * msPerHour; // Up until 2 hours
+    var msDaysAgo = 2 * msPerDay; // Up until 2 days
+    var msMonthsAgo = 2 * msPerMonth; // Up until 2 months
+    var msYearsAgo = 2 * msPerYear; // Up until 2 years
 
     var elapsed = current - previous;
 
     if (elapsed < msJustNow) {
       return "just now";
-    } else if (elapsed < msPerMinute) {
-      return Math.round(elapsed / 1000) + " seconds ago";
-    } else if (elapsed < msPerHour) {
+    } else if (elapsed < msMinutesAgo) {
+      return Math.round(elapsed / msPerSecond) + " seconds ago";
+    } else if (elapsed < msHoursAgo) {
       return Math.round(elapsed / msPerMinute) + " minutes ago";
-    } else if (elapsed < msPerDay ) {
+    } else if (elapsed < msDaysAgo ) {
       return Math.round(elapsed / msPerHour ) + " hours ago";
-    } else if (elapsed < msPerMonth) {
+    } else if (elapsed < msMonthsAgo) {
       return Math.round(elapsed / msPerDay) + " days ago";
-    } else if (elapsed < msPerYear) {
+    } else if (elapsed < msYearsAgo) {
       return Math.round(elapsed / msPerMonth) + " months ago";
     } else {
       return Math.round(elapsed / msPerYear ) + " years ago";
@@ -741,6 +878,27 @@
   }
 
 
+  var sortPolicyFunctions = {
+    "score-desc": function(a, b) {
+      return b.score - a.score;
+    },
+    "creationdate-desc": function(a, b) {
+      if (a.creationDate < b.creationDate) {
+        return 1;
+      } else {
+        return -1;
+      }
+    },
+    "creationdate-asc": function(a, b) {
+      if (a.creationDate < b.creationDate) {
+        return -1;
+      } else {
+        return 1;
+      }
+    },
+  };
+
+
   function commentsRecurse(parentMap, parentHex) {
     var cur = parentMap[parentHex];
     if (!cur || !cur.length) {
@@ -748,21 +906,13 @@
     }
 
     cur.sort(function(a, b) {
-      if (a.commentHex === stickyCommentHex) {
+      if (!a.deleted && a.commentHex === stickyCommentHex) {
         return -Infinity;
-      } else if (b.commentHex === stickyCommentHex) {
+      } else if (!b.deleted && b.commentHex === stickyCommentHex) {
         return Infinity;
       }
 
-      if (a.score !== b.score) {
-        return b.score - a.score;
-      }
-
-      if (a.creationDate < b.creationDate) {
-        return -1;
-      } else {
-        return 1;
-      }
+      return sortPolicyFunctions[sortPolicy](a, b);
     });
 
     var curTime = (new Date()).getTime();
@@ -836,7 +986,11 @@
       timeago.title = comment.creationDate.toString();
 
       card.style["borderLeft"] = "2px solid " + color;
-      name.innerText = commenter.name;
+      if (comment.deleted) {
+        name.innerText = "[deleted]";
+      } else {
+        name.innerText = commenter.name;
+      }
       text.innerHTML = comment.html;
       timeago.innerHTML = timeDifference(curTime, comment.creationDate);
       score.innerText = scorify(comment.score);
@@ -908,6 +1062,7 @@
         }
       }
 
+      onclick(edit, global.editShow, comment.commentHex);
       onclick(collapse, global.commentCollapse, comment.commentHex);
       onclick(approve, global.commentApprove, comment.commentHex);
       onclick(remove, global.commentDelete, comment.commentHex);
@@ -930,24 +1085,31 @@
 
       append(options, collapse);
 
-      // append(options, edit); // uncomment when implemented
-      append(options, downvote);
-      append(options, upvote);
+      if (!comment.deleted) {
+        append(options, downvote);
+        append(options, upvote);
+      }
 
-      append(options, reply);
+      if (comment.commenterHex === selfHex) {
+        append(options, edit);
+      } else if (!comment.deleted) {
+        append(options, reply);
+      }
 
-      if (isModerator) {
-        if (parentHex === "root") {
-          append(options, sticky);
-        }
+      if (!comment.deleted && (isModerator && parentHex === "root")) {
+        append(options, sticky);
+      }
+
+      if (!comment.deleted && (isModerator || comment.commenterHex === selfHex)) {
         append(options, remove);
-        if (comment.state !== "approved") {
-          append(options, approve);
-        }
-      } else {
-        if (stickyCommentHex === comment.commentHex) {
-          append(options, sticky);
-        }
+      }
+
+      if (isModerator && comment.state !== "approved") {
+        append(options, approve);
+      }
+      
+      if (!comment.deleted && (!isModerator && stickyCommentHex === comment.commentHex)) {
+        append(options, sticky);
       }
 
       attrSet(options, "style", "width: " + ((options.childNodes.length+1)*32) + "px;");
@@ -980,9 +1142,18 @@
 
       append(card, header);
       append(card, contents);
+
+      if (comment.deleted && (hideDeleted === "true" || children === null)) {
+        return;
+      }
+
       append(cards, card);
     });
 
+    if (cards.childNodes.length === 0) {
+      return null;
+    }
+
     return cards;
   }
 
@@ -1013,6 +1184,10 @@
 
 
   global.commentDelete = function(commentHex) {
+    if (!confirm("Are you sure you want to delete this comment?")) {
+      return;
+    }
+
     var json = {
       "commenterToken": commenterTokenGet(),
       "commentHex": commentHex,
@@ -1026,8 +1201,8 @@
         errorHide();
       }
 
-      var card = $(ID_CARD + commentHex);
-      remove(card);
+      var text = $(ID_TEXT + commentHex);
+      text.innerText = "[deleted]";
     });
   }
 
@@ -1104,6 +1279,106 @@
   }
 
 
+  function commentEdit(id) {
+    var textarea = $(ID_TEXTAREA + id);
+
+    var markdown = textarea.value;
+
+    if (markdown === "") {
+      classAdd(textarea, "red-border");
+      return;
+    } else {
+      classRemove(textarea, "red-border");
+    }
+
+    var json = {
+      "commenterToken": commenterTokenGet(),
+      "commentHex": id,
+      "markdown": markdown,
+    };
+
+    post(origin + "/api/comment/edit", json, function(resp) {
+      if (!resp.success) {
+        errorShow(resp.message);
+        return;
+      } else {
+        errorHide();
+      }
+
+      commentsMap[id].markdown = markdown;
+      commentsMap[id].html = resp.html;
+
+      var editButton = $(ID_EDIT + id);
+      var textarea = $(ID_SUPER_CONTAINER + id);
+
+      textarea.innerHTML = commentsMap[id].html;
+      textarea.id = ID_TEXT + id;
+      delete shownEdit[id];
+
+      classAdd(editButton, "option-edit");
+      classRemove(editButton, "option-cancel");
+
+      editButton.title = "Edit comment";
+
+      editButton = removeAllEventListeners(editButton);
+      onclick(editButton, global.editShow, id)
+
+      var message = "";
+      if (resp.state === "unapproved") {
+        message = "Your comment is under moderation.";
+      } else if (resp.state === "flagged") {
+        message = "Your comment was flagged as spam and is under moderation.";
+      }
+
+      if (message !== "") {
+        prepend($(ID_SUPER_CONTAINER + id), messageCreate(message));
+      }
+    });
+  }
+
+
+  global.editShow = function(id) {
+    if (id in shownEdit && shownEdit[id]) {
+      return;
+    }
+
+    var text = $(ID_TEXT + id);
+    shownEdit[id] = true;
+    text.replaceWith(textareaCreate(id, true));
+
+    var textarea = $(ID_TEXTAREA + id);
+    textarea.value = commentsMap[id].markdown;
+
+    var editButton = $(ID_EDIT + id);
+
+    classRemove(editButton, "option-edit");
+    classAdd(editButton, "option-cancel");
+
+    editButton.title = "Cancel edit";
+
+    editButton = removeAllEventListeners(editButton);
+    onclick(editButton, global.editCollapse, id);
+  };
+
+
+  global.editCollapse = function(id) {
+    var editButton = $(ID_EDIT + id);
+    var textarea = $(ID_SUPER_CONTAINER + id);
+
+    textarea.innerHTML = commentsMap[id].html;
+    textarea.id = ID_TEXT + id;
+    delete shownEdit[id];
+
+    classAdd(editButton, "option-edit");
+    classRemove(editButton, "option-cancel");
+
+    editButton.title = "Edit comment";
+
+    editButton = removeAllEventListeners(editButton);
+    onclick(editButton, global.editShow, id)
+  }
+
+
   global.replyShow = function(id) {
     if (id in shownReply && shownReply[id]) {
       return;
@@ -1130,7 +1405,7 @@
     var el = $(ID_SUPER_CONTAINER + id);
 
     el.remove();
-    shownReply[id] = false;
+    delete shownReply[id];
 
     classAdd(replyButton, "option-reply");
     classRemove(replyButton, "option-cancel");
@@ -1178,24 +1453,32 @@
   }
 
 
-  function commentsRender() {
-    var parentMap = {};
-    var parentHex;
-
-    var commentsArea = $(ID_COMMENTS_AREA);
-
+  function parentMap(comments) {
+    var m = {};
     comments.forEach(function(comment) {
-      parentHex = comment.parentHex;
-      if (!(parentHex in parentMap)) {
-        parentMap[parentHex] = [];
+      var parentHex = comment.parentHex;
+      if (!(parentHex in m)) {
+        m[parentHex] = [];
       }
 
       comment.creationDate = new Date(comment.creationDate);
 
-      parentMap[parentHex].push(comment);
+      m[parentHex].push(comment);
+      commentsMap[comment.commentHex] = {
+        "html": comment.html,
+        "markdown": comment.markdown,
+      };
     });
 
-    var cards = commentsRecurse(parentMap, "root");
+    return m;
+  }
+
+
+  function commentsRender() {
+    var commentsArea = $(ID_COMMENTS_AREA);
+    commentsArea.innerHTML = ""
+
+    var cards = commentsRecurse(parentMap(comments), "root");
     if (cards) {
       append(commentsArea, cards);
     }
@@ -1246,6 +1529,7 @@
   }
 
 
+  // OAuth logic
   global.commentoAuth = function(data) {
     var provider = data.provider;
     var id = data.id;
@@ -1272,13 +1556,18 @@
               attrSet(loggedContainer, "style", "");
             }
 
-            remove($(ID_LOGIN));
+            if (commenterTokenGet() !== "anonymous") {
+              remove($(ID_LOGIN));
+            }
+
             if (id !== null) {
               global.commentNew(id, resp.commenterToken, function() {
                 global.loginBoxClose();
+                commentsGet(commentsRender);
               });
             } else {
               global.loginBoxClose();
+              commentsGet(commentsRender);
             }
           });
         }
@@ -1319,6 +1608,8 @@
     var email = create("div");
     var emailInput = create("input");
     var emailButton = create("button");
+    var forgotLinkContainer = create("div");
+    var forgotLink = create("a");
     var loginLinkContainer = create("div");
     var loginLink = create("a");
     var close = create("div");
@@ -1327,11 +1618,14 @@
     emailSubtitle.id = ID_LOGIN_BOX_EMAIL_SUBTITLE;
     emailInput.id = ID_LOGIN_BOX_EMAIL_INPUT;
     emailButton.id = ID_LOGIN_BOX_EMAIL_BUTTON;
-    loginLink.id = ID_LOGIN_BOX_LOGIN_LINK;
+    forgotLinkContainer.id = ID_LOGIN_BOX_FORGOT_LINK_CONTAINER
     loginLinkContainer.id = ID_LOGIN_BOX_LOGIN_LINK_CONTAINER;
-    hr2.id = ID_LOGIN_BOX_HR;
+    ssoButtonContainer.id = ID_LOGIN_BOX_SSO_BUTTON_CONTAINER;
+    ssoSubtitle.id = ID_LOGIN_BOX_SSO_PRETEXT;
+    hr1.id = ID_LOGIN_BOX_HR1;
     oauthSubtitle.id = ID_LOGIN_BOX_OAUTH_PRETEXT;
     oauthButtonsContainer.id = ID_LOGIN_BOX_OAUTH_BUTTONS_CONTAINER;
+    hr2.id = ID_LOGIN_BOX_HR2;
 
     classAdd(loginBoxContainer, "login-box-container");
     classAdd(loginBox, "login-box");
@@ -1340,6 +1634,8 @@
     classAdd(email, "email");
     classAdd(emailInput, "input");
     classAdd(emailButton, "email-button");
+    classAdd(forgotLinkContainer, "forgot-link-container");
+    classAdd(forgotLink, "forgot-link");
     classAdd(loginLinkContainer, "login-link-container");
     classAdd(loginLink, "login-link");
     classAdd(ssoSubtitle, "login-box-subtitle");
@@ -1351,6 +1647,7 @@
     classAdd(close, "login-box-close");
     classAdd(root, "root-min-height");
 
+    forgotLink.innerText = "Forgot your password?";
     loginLink.innerText = "Don't have an account? Sign up.";
     emailSubtitle.innerText = "Login with your email address";
     emailButton.innerText = "Continue";
@@ -1358,7 +1655,8 @@
     ssoSubtitle.innerText = "Proceed with " + parent.location.host + " authentication";
 
     onclick(emailButton, global.passwordAsk, id);
-    onclick(loginLink, global.popupSwitch);
+    onclick(forgotLink, global.forgotPassword, id);
+    onclick(loginLink, global.popupSwitch, id);
     onclick(close, global.loginBoxClose);
 
     attrSet(loginBoxContainer, "style", "display: none; opacity: 0;");
@@ -1390,7 +1688,7 @@
       classAdd(button, "button");
       classAdd(button, "sso-button");
 
-      button.innerText = "Login with Single Sign-On";
+      button.innerText = "Single Sign-On";
 
       onclick(button, global.commentoAuth, {"provider": "sso", "id": id});
 
@@ -1417,6 +1715,8 @@
     append(email, emailButton);
     append(emailContainer, email);
 
+    append(forgotLinkContainer, forgotLink);
+
     append(loginLinkContainer, loginLink);
 
     if (numOauthConfigured > 0 && configuredOauths["commento"]) {
@@ -1426,6 +1726,7 @@
     if (configuredOauths["commento"]) {
       append(loginBox, emailSubtitle);
       append(loginBox, emailContainer);
+      append(loginBox, forgotLinkContainer);
       append(loginBox, loginLinkContainer);
     }
 
@@ -1437,19 +1738,37 @@
   }
 
 
-  global.popupSwitch = function() {
-    var emailSubtitle = $(ID_LOGIN_BOX_EMAIL_SUBTITLE);
-    var loginLink = $(ID_LOGIN_BOX_LOGIN_LINK);
+  global.forgotPassword = function() {
+    var popup = window.open("", "_blank");
+    popup.location = origin + "/forgot?commenter=true";
+    global.loginBoxClose();
+  }
 
-    if (popupBoxType === "login") {
-      loginLink.innerText = "Already have an account? Log in.";
-      emailSubtitle.innerText = "Create an account";
-      popupBoxType = "signup";
-    } else {
-      loginLink.innerText = "Don't have an account? Sign up.";
-      emailSubtitle.innerText = "Login with your email address";
-      popupBoxType = "login";
+
+  global.popupSwitch = function(id) {
+    var emailSubtitle = $(ID_LOGIN_BOX_EMAIL_SUBTITLE);
+
+    if (oauthButtonsShown) {
+      remove($(ID_LOGIN_BOX_OAUTH_BUTTONS_CONTAINER));
+      remove($(ID_LOGIN_BOX_OAUTH_PRETEXT));
+      remove($(ID_LOGIN_BOX_HR1));
+      remove($(ID_LOGIN_BOX_HR2));
     }
+
+    if (configuredOauths["sso"]) {
+      remove($(ID_LOGIN_BOX_SSO_BUTTON_CONTAINER));
+      remove($(ID_LOGIN_BOX_SSO_PRETEXT));
+      remove($(ID_LOGIN_BOX_HR1));
+      remove($(ID_LOGIN_BOX_HR2));
+    }
+
+    remove($(ID_LOGIN_BOX_LOGIN_LINK_CONTAINER));
+    remove($(ID_LOGIN_BOX_FORGOT_LINK_CONTAINER));
+
+    emailSubtitle.innerText = "Create an account";
+    popupBoxType = "signup";
+    global.passwordAsk(id);
+    $(ID_LOGIN_BOX_EMAIL_INPUT).focus();
   }
 
 
@@ -1470,16 +1789,18 @@
 
       cookieSet("commentoCommenterToken", resp.commenterToken);
 
-      selfLoad(resp.commenter);
-      global.allShow();
+      selfLoad(resp.commenter, resp.email);
+      allShow();
 
       remove($(ID_LOGIN));
       if (id !== null) {
         global.commentNew(id, resp.commenterToken, function() {
           global.loginBoxClose();
+          commentsGet(commentsRender);
         });
       } else {
         global.loginBoxClose();
+        commentsGet(commentsRender);
       }
     });
   }
@@ -1523,19 +1844,16 @@
   global.passwordAsk = function(id) {
     var loginBox = $(ID_LOGIN_BOX);
     var subtitle = $(ID_LOGIN_BOX_EMAIL_SUBTITLE);
-    var emailButton = $(ID_LOGIN_BOX_EMAIL_BUTTON);
-    var loginLinkContainer = $(ID_LOGIN_BOX_LOGIN_LINK_CONTAINER);
-    var hr = $(ID_LOGIN_BOX_HR);
-    var oauthButtonsContainer = $(ID_LOGIN_BOX_OAUTH_BUTTONS_CONTAINER);
-    var oauthPretext = $(ID_LOGIN_BOX_OAUTH_PRETEXT);
     
-    remove(emailButton);
-    remove(loginLinkContainer);
+    remove($(ID_LOGIN_BOX_EMAIL_BUTTON));
+    remove($(ID_LOGIN_BOX_LOGIN_LINK_CONTAINER));
+    remove($(ID_LOGIN_BOX_FORGOT_LINK_CONTAINER));
     if (oauthButtonsShown) {
       if (configuredOauths.length > 0) {
-        remove(hr);
-        remove(oauthPretext);
-        remove(oauthButtonsContainer);
+        remove($(ID_LOGIN_BOX_HR1));
+        remove($(ID_LOGIN_BOX_HR2));
+        remove($(ID_LOGIN_BOX_OAUTH_PRETEXT));
+        remove($(ID_LOGIN_BOX_OAUTH_BUTTONS_CONTAINER));
       }
     }
 
@@ -1611,7 +1929,7 @@
     var json = {
       "commenterToken": commenterTokenGet(),
       "domain": parent.location.host,
-      "path": parent.location.pathname,
+      "path": pageId,
       "attributes": attributes,
     };
 
@@ -1704,16 +2022,16 @@
   }
 
 
-  global.loadCssOverride = function() {
+  function loadCssOverride() {
     if (cssOverride === undefined) {
-      global.allShow();
+      allShow();
     } else {
-      cssLoad(cssOverride, "window.commento.allShow()");
+      cssLoad(cssOverride, allShow);
     }
   }
 
 
-  global.allShow = function() {
+  function allShow() {
     var mainArea = $(ID_MAIN_AREA);
     var modTools = $(ID_MOD_TOOLS);
     var loggedContainer = $(ID_LOGGED_CONTAINER);
@@ -1761,6 +2079,11 @@
     var scripts = tags("script")
     for (var i = 0; i < scripts.length; i++) {
       if (scripts[i].src.match(/\/js\/commento\.js$/)) {
+        var pid = attrGet(scripts[i], "data-page-id");
+        if (pid !== undefined) {
+          pageId = pid;
+        }
+
         cssOverride = attrGet(scripts[i], "data-css-override");
 
         autoInit = attrGet(scripts[i], "data-auto-init");
@@ -1771,6 +2094,8 @@
         }
 
         noFonts = attrGet(scripts[i], "data-no-fonts");
+
+        hideDeleted = attrGet(scripts[i], "data-hide-deleted");
       }
     }
   }
@@ -1805,6 +2130,9 @@
     }
 
     classAdd(root, "root");
+    if (noFonts !== "true") {
+      classAdd(root, "root-font");
+    }
 
     loginBoxCreate();
 
@@ -1813,11 +2141,7 @@
     mainAreaCreate();
 
     var footer = footerLoad();
-    cssLoad(cdn + "/css/commento.css", "window.commento.loadCssOverride()");
-
-    if (noFonts !== "true") {
-      classAdd(root, "root-font");
-    }
+    cssLoad(cdn + "/css/commento.css", loadCssOverride);
 
     selfGet(function() {
       commentsGet(function() {
@@ -1826,7 +2150,7 @@
           commentsRender();
           append(root, footer);
           loadHash();
-          global.allShow();
+          allShow();
           nameWidthFix();
           call(callback);
         });

frontend/js/count.js

@@ -15,9 +15,42 @@
     xmlDoc.send(JSON.stringify(data));
   }
 
+  var commentsText = function(count) {
+    return count + " " + (count === 1 ? "comment" : "comments")
+  }
+
+  function tags(tag) {
+    return document.getElementsByTagName(tag);
+  }
+
+  function attrGet(node, a) {
+    var attr = node.attributes[a];
+
+    if (attr === undefined) {
+      return undefined;
+    }
+    
+    return attr.value;
+  }
+
+
+  function dataTagsLoad() {
+    var scripts = tags("script")
+    for (var i = 0; i < scripts.length; i++) {
+      if (scripts[i].src.match(/\/js\/count\.js$/)) {
+        var customCommentsText = attrGet(scripts[i], "data-custom-text");
+        if (customCommentsText !== undefined) {
+          commentsText = eval(customCommentsText);
+        }
+      }
+    }
+  }
+
   function main() {
     var paths = [];
     var doms = [];
+    dataTagsLoad();
+
     var as = document.getElementsByTagName("a");
     for (var i = 0; i < as.length; i++) {
       var href = as[i].href;
@@ -28,12 +61,15 @@
       href = href.replace(/^.*\/\/[^\/]+/, "");
 
       if (href.endsWith("#commento")) {
-        var path = href.substr(0, href.indexOf("#commento"));
-        if (path.startsWith(parent.location.host)) {
-          path = path.substr(parent.location.host.length);
+        var pageId = attrGet(as[i], "data-page-id");
+        if (pageId === undefined) {
+          pageId = href.substr(0, href.indexOf("#commento"));
+          if (pageId.startsWith(parent.location.host)) {
+            pageId = pageId.substr(parent.location.host.length);
+          }
         }
 
-        paths.push(path);
+        paths.push(pageId);
         doms.push(as[i]);
       }
     }
@@ -55,7 +91,7 @@
           count = resp.commentCounts[paths[i]];
         }
 
-        doms[i].innerText = count + " " + (count === 1 ? "comment" : "comments");
+        doms[i].innerText = commentsText(count);
       }
     });
   }

frontend/js/dashboard-import.js

@@ -34,4 +34,29 @@
     });
   }
 
+  global.importCommento = function() {
+    var url = $("#commento-url").val();
+    var data = global.dashboard.$data;
+
+    var json = {
+      "ownerToken": global.cookieGet("commentoOwnerToken"),
+      "domain": data.domains[data.cd].domain,
+      "url": url,
+    }
+
+    global.buttonDisable("#commento-import-button");
+    global.post(global.origin + "/api/domain/import/commento", json, function(resp) {
+      global.buttonEnable("#commento-import-button");
+
+      if (!resp.success) {
+        global.globalErrorShow(resp.message);
+        return;
+      }
+
+      $("#commento-import-button").hide();
+
+      global.globalOKShow("Imported " + resp.numImported + " comments!");
+    });
+  }
+
 } (window.commento, document));

frontend/js/dashboard-installation.js

@@ -6,8 +6,8 @@
   // Opens the installation view.
   global.installationOpen = function() {
     var html = "" +
+               "<script defer src=\"" + global.cdn + "/js/commento.js\"><\/script>\n" +
                "<div id=\"commento\"></div>\n" +
-               "<script src=\"" + global.cdn + "/js/commento.js\"><\/script>\n" +
                "";
 
     $("#code-div").text(html);

frontend/js/forgot.js

@@ -16,12 +16,18 @@
       return;
     }
 
+    var entity = "owner";
+    if (global.paramGet("commenter") === "true") {
+      entity = "commenter";
+    }
+
     var json = {
       "email": $("#email").val(),
+      "entity": entity,
     };
 
     global.buttonDisable("#reset-button");
-    global.post(global.origin + "/api/owner/send-reset-hex", json, function(resp) {
+    global.post(global.origin + "/api/forgot", json, function(resp) {
       global.buttonEnable("#reset-button");
 
       global.textSet("#err", "");

frontend/js/login.js

@@ -33,12 +33,22 @@
     }
   }
 
+  // Shows messages produced from account deletion.
+  function displayDeletedOwner() {
+    var deleted = global.paramGet("deleted");
+
+    if (deleted === "true") {
+      $("#msg").html("Your account has been deleted.")
+    }
+  }
+
 
   // Shows email confirmation and password reset messages, if any.
   global.displayMessages = function() {
     displayConfirmedEmail();
     displayChangedPassword();
     displaySignedUp();
+    displayDeletedOwner();
   };
 
 

frontend/js/profile.js

@@ -0,0 +1,76 @@
+(function (global, document) {
+  "use strict";
+
+  (document);
+
+  // Update the email records.
+  global.update = function(event) {
+    event.preventDefault();
+
+    $(".err").text("");
+    $(".msg").text("");
+
+    var allOk = global.unfilledMark(["#name", "#email"], function(el) {
+      el.css("border-bottom", "1px solid red");
+    });
+
+    if (!allOk) {
+      global.textSet("#err", "Please make sure all fields are filled");
+      return;
+    }
+
+    var json = {
+      "commenterToken": global.paramGet("commenterToken"),
+      "name": $("#name").val(),
+      "email": $("#email").val(),
+      "link": $("#link").val(),
+      "photo": $("#photo").val(),
+    };
+
+    global.buttonDisable("#save-button");
+    global.post(global.origin + "/api/commenter/update", json, function(resp) {
+      global.buttonEnable("#save-button");
+      if (!resp.success) {
+        $(".err").text(resp.message);
+        return;
+      }
+
+      $(".msg").text("Successfully updated!");
+    });
+  }
+
+  global.profilePrefill = function() {
+    $(".err").text("");
+    $(".msg").text("");
+    var json = {
+      "commenterToken": global.paramGet("commenterToken"),
+    };
+
+    global.post(global.origin + "/api/commenter/self", json, function(resp) {
+      $("#loading").hide();
+      $("#form").show();
+      if (!resp.success) {
+        $(".err").text(resp.message);
+        return;
+      }
+
+      $("#name").val(resp.commenter.name);
+      $("#email").val(resp.commenter.email);
+      $("#unsubscribe").attr("href", global.origin + "/unsubscribe?unsubscribeSecretHex=" + resp.email.unsubscribeSecretHex);
+
+      if (resp.commenter.provider === "commento") {
+        $("#link-row").attr("style", "")
+        if (resp.commenter.link !== "undefined") {
+          $("#link").val(resp.commenter.link);
+        }
+
+        $("#photo-row").attr("style", "")
+        $("#photo-subtitle").attr("style", "")
+        if (resp.commenter.photo !== "undefined") {
+          $("#photo").val(resp.commenter.photo);
+        }
+      }
+    });
+  };
+
+} (window.commento, document));

frontend/js/reset.js

@@ -24,7 +24,7 @@
     };
 
     global.buttonDisable("#reset-button");
-    global.post(global.origin + "/api/owner/reset-password", json, function(resp) {
+    global.post(global.origin + "/api/reset", json, function(resp) {
       global.buttonEnable("#reset-button");
 
       global.textSet("#err", "");
@@ -33,7 +33,11 @@
         return
       }
 
-      document.location = global.origin + "/login?changed=true";
+      if (resp.entity === "owner") {
+        document.location = global.origin + "/login?changed=true";
+      } else {
+        $("#msg").html("Your password has been reset. You may close this window and try logging in again.");
+      }
     });
   }
 

frontend/js/settings.js

@@ -0,0 +1,54 @@
+(function (global, document) {
+  "use strict";
+
+  (document);
+
+  global.vueConstruct = function(callback) {
+    var reactiveData = {
+      hasSource: global.owner.hasSource,
+      lastFour: global.owner.lastFour,
+    };
+
+    global.settings = new Vue({
+      el: "#settings",
+      data: reactiveData,
+    });
+
+    if (callback !== undefined) {
+      callback();
+    }
+  };
+
+  global.settingShow = function(setting) {
+    $(".pane-setting").removeClass("selected");
+    $(".view").hide();
+    $("#" + setting).addClass("selected");
+    $("#" + setting + "-view").show();
+  };
+
+  global.deleteOwnerHandler = function() {
+    if (!confirm("Are you absolutely sure you want to delete your account?")) {
+      return;
+    }
+
+    var json = {
+      "ownerToken": global.cookieGet("commentoOwnerToken"),
+    }
+
+    $("#delete-owner-button").prop("disabled", true);
+    $("#delete-owner-button").text("Deleting...");
+    global.post(global.origin + "/api/owner/delete", json, function(resp) {
+      if (!resp.success) {
+        $("#delete-owner-button").prop("disabled", false);
+        $("#delete-owner-button").text("Delete Account");
+        global.globalErrorShow(resp.message);
+        $("#error-message").text(resp.message);
+        return;
+      }
+
+      global.cookieDelete("commentoOwnerToken");
+      document.location = global.origin + "/login?deleted=true";
+    });
+  };
+
+} (window.commento, document));

frontend/package.json

@@ -9,7 +9,7 @@
   "devDependencies": {
     "chartist": "0.11.0",
     "fixmyjs": "2.0.0",
-    "gulp": "3.9.1",
+    "gulp": "4.0.2",
     "gulp-clean-css": "3.9.4",
     "gulp-concat": "2.6.1",
     "gulp-eslint": "5.0.0",
@@ -21,7 +21,6 @@
     "highlightjs": "9.10.0",
     "html-minifier": "3.5.7",
     "jquery": "3.2.1",
-    "natives": "^1.1.6",
     "normalize-scss": "7.0.1",
     "sass": "1.5.1",
     "uglify-js": "3.4.1",

frontend/profile.html

@@ -0,0 +1,66 @@
+<html>
+  <head>
+    <meta name="viewport" content="user-scalable=no, initial-scale=1.0">
+    <script src="[[[.CdnPrefix]]]/js/jquery.js"></script>
+    <script src="[[[.CdnPrefix]]]/js/profile.js"></script>
+    <link rel="icon" href="[[[.CdnPrefix]]]/images/120x120.png">
+    <link rel="stylesheet" href="[[[.CdnPrefix]]]/css/auth.css">
+    <title>Commento: Edit Profile</title>
+  </head>
+
+  <div class="navbar">
+    <a href="[[[.Origin]]]/" class="navbar-item navbar-logo-text"><img src="[[[.CdnPrefix]]]/images/logo.svg" class="navbar-logo">Commento</a>
+  </div>
+
+  <script>
+  window.onload = function() {
+    window.commento.profilePrefill();
+  };
+  </script>
+
+  <div class="auth-form-container">
+    <div class="auth-form">
+      <div id="loading">
+        Loading...
+      </div>
+      <form onsubmit="window.commento.update(event)" id="form" style="display: none">
+        <div class="form-title">
+          Edit Profile
+        </div>
+
+        <div class="row">
+          <div class="label">Name</div>
+          <input class="input" type="text" name="name" id="name" placeholder="Name">
+        </div>
+
+        <div class="row no-margin-bottom-row">
+          <div class="label">Email Address</div>
+          <input class="input" type="text" name="email" id="email" placeholder="example@example.com" disabled>
+        </div>
+        <div class="small-subtitle">
+          Since your identity is directly tied to your email address, changing your email address is not possible. <a href="" id="unsubscribe">Want to change your notification settings?</a>
+        </div>
+
+        <div id="link-row" class="row" style="display: none">
+          <div class="label">Website (Optional)</div>
+          <input class="input" type="text" name="link" id="link" placeholder="https://example.com">
+        </div>
+
+        <div id="photo-row" class="row no-margin-bottom-row" style="display: none">
+          <div class="label">Photo</div>
+          <input class="input" type="text" name="photo" id="photo" placeholder="https://i.imgur.com/BCKlYFQ.jpg">
+        </div>
+        <div class="small-subtitle" style="display: none" id="photo-subtitle">
+          Use an external image hosting service such as <a href="https://imgur.com" rel="nofollow">Imgur</a> and enter the direct link to the image here. Changes to your profile photo may take a few hours to reflect. Maximum file size allowed is 128 KiB.
+        </div>
+
+        <div class="err" id="err"></div>
+        <div class="msg" id="msg"></div>
+
+        <button id="button" class="button" type="submit">Update Profile</button>
+      </form>
+    </div>
+  </div>
+
+  [[[.Footer]]]
+</html>

frontend/sass/auth-main.scss

@@ -36,11 +36,17 @@ body {
       padding-bottom: 24px;
     }
 
-  .row {
-    padding-left: 8px;
-    padding-right: 8px;
-    margin-bottom: 20px;
-    border-bottom: 1px solid $gray-1;
+    .small-subtitle {
+      font-size: 12px;
+      color: $gray-6;
+      padding: 0px 12px 20px 12px;
+    }
+
+    .row {
+      padding-left: 8px;
+      padding-right: 8px;
+      margin-bottom: 20px;
+      border-bottom: 1px solid $gray-1;
 
       input[type=text],
       input[type=password] {
@@ -74,6 +80,10 @@ body {
       }
     }
 
+    .no-margin-bottom-row {
+      margin-bottom: 6px;
+    }
+
     .button {
       @extend .shadow;
       border: 1px solid $blue-6;

frontend/sass/commento-common.scss

@@ -3,6 +3,7 @@
 code {
   font-family: monospace;
   font-size: 13px;
+  white-space: pre;
 }
 
 a {

frontend/sass/commento-logged.scss

@@ -21,12 +21,12 @@
   position: relative;
   height: 38px;
 
-  .commento-logout {
+  .commento-profile-button {
+    float: right;
     cursor: pointer;
-    position: absolute;
-    top: 6px;
-    right: 16px;
-    color: $gray-5;
+    color: $gray-6;
+    margin: 6px 12px;
+    font-size: 13px;
   }
 
   .commento-logged-in-as {

frontend/sass/commento-login.scss

@@ -38,16 +38,24 @@
 
     @import "email-main.scss";
 
+    .commento-forgot-link-container,
     .commento-login-link-container {
       margin: 16px;
       width: calc(100% - 32px);
       text-align: center;
+    }
 
-      .commento-login-link {
-        font-size: 14px;
-        font-weight: bold;
-        border-bottom: none;
-      }
+    .commento-forgot-link,
+    .commento-login-link {
+      font-size: 14px;
+      font-weight: bold;
+      border-bottom: none;
+    }
+
+    .commento-forgot-link {
+      font-size: 13px;
+      color: $gray-6;
+      font-weight: normal;
     }
 
     .commento-login-box-close {

frontend/sass/commento-options.scss

@@ -67,10 +67,18 @@
   background: $indigo-6;
 }
 
+.commento-option-edit {
+  height: 14px;
+  width: 14px;
+  @include mask-image('data:image/svg+xml;utf8,<?xml version="1.0" encoding="UTF-8"?><svg enable-background="new 0 0 528.899 528.899" version="1.1" viewBox="0 0 528.899 528.899" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m328.88 89.125l107.59 107.59-272.34 272.34-107.53-107.59 272.28-272.34zm189.23-25.948l-47.981-47.981c-18.543-18.543-48.653-18.543-67.259 0l-45.961 45.961 107.59 107.59 53.611-53.611c14.382-14.383 14.382-37.577 0-51.959zm-517.81 449.51c-1.958 8.812 5.998 16.708 14.811 14.565l119.89-29.069-107.53-107.59-27.173 122.09z"/></svg>');
+  margin: 12px 6px 12px 6px;
+  background: $gray-5;
+}
+
 .commento-option-remove {
   height: 14px;
   width: 14px;
-  @include mask-image('data:image/svg+xml;utf8,<?xml version="1.0" encoding="UTF-8"?><svg enable-background="new 0 0 59 59" version="1.1" viewBox="0 0 59 59" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g fill="%231e2127">	<path d="m29.5 51c0.552 0 1-0.447 1-1v-33c0-0.553-0.448-1-1-1s-1 0.447-1 1v33c0 0.553 0.448 1 1 1z"/>	<path d="m19.5 51c0.552 0 1-0.447 1-1v-33c0-0.553-0.448-1-1-1s-1 0.447-1 1v33c0 0.553 0.448 1 1 1z"/>	<path d="m39.5 51c0.552 0 1-0.447 1-1v-33c0-0.553-0.448-1-1-1s-1 0.447-1 1v33c0 0.553 0.448 1 1 1z"/>	<path d="M52.5,6H38.456c-0.11-1.25-0.495-3.358-1.813-4.711C35.809,0.434,34.751,0,33.499,0H23.5c-1.252,0-2.31,0.434-3.144,1.289   C19.038,2.642,18.653,4.75,18.543,6H6.5c-0.552,0-1,0.447-1,1s0.448,1,1,1h2.041l1.915,46.021C10.493,55.743,11.565,59,15.364,59   h28.272c3.799,0,4.871-3.257,4.907-4.958L50.459,8H52.5c0.552,0,1-0.447,1-1S53.052,6,52.5,6z M21.792,2.681   C22.24,2.223,22.799,2,23.5,2h9.999c0.701,0,1.26,0.223,1.708,0.681c0.805,0.823,1.128,2.271,1.24,3.319H20.553   C20.665,4.952,20.988,3.504,21.792,2.681z M46.544,53.979C46.538,54.288,46.4,57,43.636,57H15.364   c-2.734,0-2.898-2.717-2.909-3.042L10.542,8h37.915L46.544,53.979z"/></g></svg>');
+  @include mask-image('data:image/svg+xml;utf8,<?xml version="1.0" encoding="UTF-8"?><svg enable-background="new 0 0 59 59" version="1.1" viewBox="0 0 59 59" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g fill="%231e2127"><path d="m29.5 51c0.552 0 1-0.447 1-1v-33c0-0.553-0.448-1-1-1s-1 0.447-1 1v33c0 0.553 0.448 1 1 1z"/><path d="m19.5 51c0.552 0 1-0.447 1-1v-33c0-0.553-0.448-1-1-1s-1 0.447-1 1v33c0 0.553 0.448 1 1 1z"/><path d="m39.5 51c0.552 0 1-0.447 1-1v-33c0-0.553-0.448-1-1-1s-1 0.447-1 1v33c0 0.553 0.448 1 1 1z"/><path d="M52.5,6H38.456c-0.11-1.25-0.495-3.358-1.813-4.711C35.809,0.434,34.751,0,33.499,0H23.5c-1.252,0-2.31,0.434-3.144,1.289 C19.038,2.642,18.653,4.75,18.543,6H6.5c-0.552,0-1,0.447-1,1s0.448,1,1,1h2.041l1.915,46.021C10.493,55.743,11.565,59,15.364,59 h28.272c3.799,0,4.871-3.257,4.907-4.958L50.459,8H52.5c0.552,0,1-0.447,1-1S53.052,6,52.5,6z M21.792,2.681 C22.24,2.223,22.799,2,23.5,2h9.999c0.701,0,1.26,0.223,1.708,0.681c0.805,0.823,1.128,2.271,1.24,3.319H20.553 C20.665,4.952,20.988,3.504,21.792,2.681z M46.544,53.979C46.538,54.288,46.4,57,43.636,57H15.364 c-2.734,0-2.898-2.717-2.909-3.042L10.542,8h37.915L46.544,53.979z"/></g></svg>');
   margin: 12px 6px 12px 6px;
   background: $red-8;
 }

frontend/sass/commento.scss

@@ -4,12 +4,6 @@
   min-height: 430px;
 }
 
-.commento-root-font {
-  * {
-    font-family: 'Source Sans Pro', sans-serif !important;
-  }
-}
-
 .commento-root {
   overflow-x: hidden;
   padding: 0px;
@@ -63,4 +57,34 @@
     font-weight: 700;
     margin-top: 16px;
   }
+
+  .commento-sort-policy-buttons-container {
+    padding: 12px 0px;
+    font-weight: 400;
+
+    .commento-sort-policy-buttons {
+      float: right;
+
+      .commento-sort-policy-button {
+        color: $gray-6;
+        font-size: 13px;
+        padding: 0px 7px;
+      }
+
+      .commento-sort-policy-button:hover {
+        cursor: pointer;
+      }
+
+      .commento-sort-policy-button-selected {
+        color: $blue-8;
+        font-weight: bold;
+      }
+    }
+  }
+}
+
+.commento-root-font {
+  * {
+    font-family: 'Source Sans Pro', sans-serif;
+  }
 }

frontend/sass/common-main.scss

@@ -3,6 +3,9 @@
 
 html, input, button, textarea {
   font-family: 'Source Sans Pro', sans-serif;
+}
+
+html {
   font-size: 14px;
   color: $gray-7;
   background: $gray-0;

frontend/sass/dashboard-main.scss

@@ -84,7 +84,7 @@ body {
       margin: 8px;
 
       .left {
-        padding: 8px;
+        padding: 8px 16px;
 
         .title {
           font-weight: bold;

frontend/settings.html

@@ -0,0 +1,89 @@
+<html>
+  <head>
+    <script src="[[[.CdnPrefix]]]/js/jquery.js"></script>
+    <script src="[[[.CdnPrefix]]]/js/vue.js"></script>
+    <script src="[[[.CdnPrefix]]]/js/highlight.js"></script>
+    <script src="[[[.CdnPrefix]]]/js/chartist.js"></script>
+    <script src="[[[.CdnPrefix]]]/js/settings.js"></script>
+    <link rel="icon" href="[[[.CdnPrefix]]]/images/120x120.png">
+    <link rel="stylesheet" href="[[[.CdnPrefix]]]/css/chartist.css">
+    <link rel="stylesheet" href="[[[.CdnPrefix]]]/css/dashboard.css">
+    <title>Commento: Settings</title>
+  </head>
+
+  <div id="navbar" class="navbar">
+    <a href="[[[.Origin]]]/" class="navbar-item navbar-logo-text"><img src="[[[.CdnPrefix]]]/images/logo.svg" class="navbar-logo">Commento</a>
+    <div class="navbar-item">
+      <a href="[[[.Origin]]]/dashboard" class="navbar-item">Dashboard</a>
+      <a href="[[[.Origin]]]/logout" class="navbar-item">Logout</a>
+      <div class="float-right"><b><div id="owner-name"></div></b></div>
+    </div>
+  </div>
+
+  <script>
+  window.onload = function() {
+    window.commento.selfGet(function() {
+      window.commento.vueConstruct(function() {
+        window.commento.settingShow("delete-owner");
+      });
+    });
+  };
+  </script>
+
+  <div class="global-error" id="global-error"></div>
+  <div class="global-ok" id="global-ok"></div>
+
+  <div id="settings" class="dashboard-container">
+    <div class="pane-left">
+      <div class="pane-setting" id="delete-owner" onclick="window.commento.settingShow('delete-owner')">
+        <div class="pane-setting-inside">
+          <div class="setting-title">Delete Account</div>
+        </div>
+      </div>
+    </div>
+
+    <div class="pane-right pane-right-lefter">
+      <div id="delete-owner-view" class="view hidden">
+        <div class="view-inside">
+          <div class="mid-view">
+            <div class="center center-title">
+              Delete Account
+            </div>
+
+            <div class="action-buttons-container">
+              <div class="action-buttons">
+                <div class="action-button">
+                  <div class="left">
+                    <div class="title">
+                      Delete Account
+                    </div>
+                    <div class="subtitle">
+                      This will permanently delete your account and any data associated with your account. You must first delete all domains in the dashboard before doing this.
+                    </div>
+                  </div>
+                  <div class="right">
+                    <button onclick="document.location.hash='#delete-owner-modal'" class="button big-red-button">Delete</button>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div id="delete-owner-modal" class="modal-window">
+    <div class="inside">
+      <a href="#modal-close" title="Close" class="modal-close"></a>
+      <div class="modal-title">Delete Accont</div>
+      <div class="modal-subtitle">
+        Are you absolutely sure you want to delete your account? This is a permanent change; there is no way to recover your account or any data associated with it.
+      </div>
+      <div class="modal-contents center">
+        <button id="delete-owner-button" class="button big-red-button" onclick="window.commento.deleteOwnerHandler()">Delete Account</button>
+      </div>
+    </div>
+  </div>
+
+</html>