Remove commentsEnabled AP extension

This isn't used.

README.md

@@ -1,8 +1,8 @@
-Write.as web core
+WriteFreely web core
-=================
+====================
 [![GoDoc](https://godoc.org/github.com/writeas/web-core?status.svg)](https://godoc.org/github.com/writeas/web-core)
 [![Build Status](https://travis-ci.org/writeas/web-core.svg)](https://travis-ci.org/writeas/web-core)
-[![Public Slack discussion](http://slack.write.as/badge.svg)](http://slack.write.as/)
+[![#writefreely on freenode](https://img.shields.io/badge/freenode-%23writefreely-blue.svg)](http://webchat.freenode.net/?channels=writefreely)
 [![Discuss on our forum](https://img.shields.io/discourse/https/discuss.write.as/users.svg?label=forum)](https://discuss.write.as/c/development)
 
-web-core holds components of the [Write.as](https://write.as) web application.
+web-core holds components of the [WriteFreely](https://writefreely.org) web application, and is shared with other [Write.as](https://write.as) products, like [Snap.as](https://snap.as).

activitystreams/activity.go

@@ -11,6 +11,8 @@ const (
 	toPublic  = "https://www.w3.org/ns/activitystreams#Public"
 )
 
+var Extensions = map[string]string{}
+
 // Activity describes actions that have either already occurred, are in the
 // process of occurring, or may occur in the future.
 type Activity struct {
@@ -38,6 +40,7 @@ func NewCreateActivity(o *Object) *Activity {
 		BaseObject: BaseObject{
 			Context: []interface{}{
 				Namespace,
+				Extensions,
 			},
 			ID:   o.ID,
 			Type: "Create",
@@ -56,6 +59,7 @@ func NewUpdateActivity(o *Object) *Activity {
 		BaseObject: BaseObject{
 			Context: []interface{}{
 				Namespace,
+				Extensions,
 			},
 			ID:   o.ID,
 			Type: "Update",
@@ -113,6 +117,9 @@ type Object struct {
 	Content      string            `json:"content"`
 	ContentMap   map[string]string `json:"contentMap,omitempty"`
 	Tag          []Tag             `json:"tag"`
+
+	// Extensions
+	// NOTE: add extensions here
 }
 
 // NewNoteObject creates a basic Note object that includes the public

go.mod

@@ -0,0 +1,18 @@
+module github.com/writeas/web-core
+
+go 1.10
+
+require (
+	github.com/kr/pretty v0.1.0 // indirect
+	github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec
+	github.com/microcosm-cc/bluemonday v1.0.2
+	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/writeas/impart v1.1.0
+	github.com/writeas/nerds v1.0.0
+	github.com/writeas/openssl-go v1.0.0
+	github.com/writeas/saturday v1.6.0
+	golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect
+)

go.sum

@@ -0,0 +1,29 @@
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec h1:ZXWuspqypleMuJy4bzYEqlMhJnGAYpLrWe5p7W3CdvI=
+github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec/go.mod h1:voECJzdraJmolzPBgL9Z7ANwXf4oMXaTCsIkdiPpR/g=
+github.com/microcosm-cc/bluemonday v1.0.2 h1:5lPfLTTAvAbtS0VqT+94yOtFnGfUWYyx0+iToC3Os3s=
+github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
+github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
+github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/writeas/impart v1.1.0 h1:nPnoO211VscNkp/gnzir5UwCDEvdHThL5uELU60NFSE=
+github.com/writeas/impart v1.1.0/go.mod h1:g0MpxdnTOHHrl+Ca/2oMXUHJ0PcRAEWtkCzYCJUXC9Y=
+github.com/writeas/nerds v1.0.0 h1:ZzRcCN+Sr3MWID7o/x1cr1ZbLvdpej9Y1/Ho+JKlqxo=
+github.com/writeas/nerds v1.0.0/go.mod h1:Gn2bHy1EwRcpXeB7ZhVmuUwiweK0e+JllNf66gvNLdU=
+github.com/writeas/openssl-go v1.0.0 h1:YXM1tDXeYOlTyJjoMlYLQH1xOloUimSR1WMF8kjFc5o=
+github.com/writeas/openssl-go v1.0.0/go.mod h1:WsKeK5jYl0B5y8ggOmtVjbmb+3rEGqSD25TppjJnETA=
+github.com/writeas/saturday v1.6.0 h1:HNUtX8TVJJnSdxE8vaAgtHiAJVt+Of5AJYlm62pmVlI=
+github.com/writeas/saturday v1.6.0/go.mod h1:ETE1EK6ogxptJpAgUbcJD0prAtX48bSloie80+tvnzQ=
+golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 h1:MQ/ZZiDsUapFFiMS+vzwXkCTeEKaum+Do5rINYJDmxc=
+golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+pGZeX22Ufu6fibxDVjU=
+gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=

l10n/phrases_lt.go

@@ -0,0 +1,27 @@
+package l10n
+
+var phrasesLT = map[string]string{
+	"Anonymous post":                 "Anoniminis įrašas",
+	"Blogs":                          "Tinklaraščiai",
+	"Enter":                          "Įvesti",
+	"Newer":                          "Naujesni",
+	"Older":                          "Senesni",
+	"Posts":                          "Įrašai",
+	"Publish to...":                  "Publikuoti į...",
+	"Publish":                        "Publikuoti",
+	"Read more...":                   "Skaityti daugiau...",
+	"This blog requires a password.": "Šis tinklaraštis reikalauja slaptažodžio.",
+	"Toggle theme":                   "Keisti temą",
+	"View posts":                     "Peržiūrėti įrašus",
+	"delete":                         "ištrinti",
+	"edit":                           "koreguoti",
+	"move to...":                     "perkelti į...",
+	"pin":                            "prisegti",
+	"published with write.as":  "publikuojama su write.as",
+	"share modal ending":       "Siųskite draugui, dalinkitės internete ar per Twitter. Sužinokite daugiau.",
+	"share modal introduction": "Kiekvienas publikuotas įrašas turi slaptą, unikalų URL kuriuo galite pasidalinti su bet kuo. Šis URL yra:",
+	"share modal title":        "Dalintis šiuo įrašu",
+	"share":                    "dalintis",
+	"unpin":                    "atsegti",
+	"title dash":               "–",
+}

l10n/strings.go

@@ -24,6 +24,8 @@ func Strings(lang string) map[string]string {
 		return phrasesIT
 	case "ja":
 		return phrasesJA
+	case "lt":
+		return phrasesLT
 	case "mk":
 		return phrasesMK
 	case "pl":

log/log.go

@@ -2,8 +2,10 @@
 package log
 
 import (
+	"fmt"
 	"log"
 	"os"
+	"runtime"
 )
 
 var (
@@ -13,7 +15,7 @@ var (
 
 func init() {
 	InfoLog = log.New(os.Stdout, "", log.Ldate|log.Ltime)
-	ErrorLog = log.New(os.Stderr, "ERROR: ", log.Ldate|log.Ltime|log.Lshortfile)
+	ErrorLog = log.New(os.Stderr, "ERROR: ", log.Ldate|log.Ltime)
 }
 
 // Info logs an informational message to Stdout.
@@ -23,5 +25,18 @@ func Info(s string, v ...interface{}) {
 
 // Error logs an error to Stderr.
 func Error(s string, v ...interface{}) {
-	ErrorLog.Printf(s, v...)
+	// Include original caller information
+	_, file, line, _ := runtime.Caller(1)
+
+	// Determine short filename (from standard log package)
+	short := file
+	for i := len(file) - 1; i > 0; i-- {
+		if file[i] == '/' {
+			short = file[i+1:]
+			break
+		}
+	}
+	file = short
+
+	ErrorLog.Printf(fmt.Sprintf("%s:%d: ", short, line)+s, v...)
 }

passgen/passgen.go

@@ -1,4 +1,4 @@
-// Package passgen generates random, unmemorable passwords.
+// Package passgen generates random passwords.
 //
 // Example usage:
 //
@@ -19,20 +19,20 @@ const DefLen = 20
 // DefChars is the default set of characters used in the password.
 var DefChars = []byte("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()- _=+,.?/:;{}[]`~")
 
-// New returns a random password of the default length with the default set of
+// New returns a random, unmemorable password of the default length with the
-// characters.
+// default set of characters.
 func New() string {
 	return NewLenChars(DefLen, DefChars)
 }
 
-// NewLen returns a random password of the given length with the default set
+// NewLen returns a random, unmemorable password of the given length with the
-// of characters.
+// default set of characters.
 func NewLen(length int) string {
 	return NewLenChars(length, DefChars)
 }
 
-// NewLenChars returns a random password of the given length with the given
+// NewLenChars returns a random, unmemorable password of the given length with
-// set of characters.
+// the given set of characters.
 func NewLenChars(length int, chars []byte) string {
 	if length == 0 {
 		return ""

passgen/wordish.go

@@ -0,0 +1,64 @@
+package passgen
+
+import (
+	"crypto/rand"
+	"math/big"
+)
+
+var (
+	ar   = []rune("aA4")
+	cr   = []rune("cC")
+	er   = []rune("eE3")
+	fr   = []rune("fF")
+	gr   = []rune("gG")
+	hr   = []rune("hH")
+	ir   = []rune("iI1")
+	lr   = []rune("lL")
+	nr   = []rune("nN")
+	or   = []rune("oO0")
+	rr   = []rune("rR")
+	sr   = []rune("sS5")
+	tr   = []rune("tT7")
+	remr = []rune("bcdfghjklmnpqrstvwxyzBCDFGHJKLMNPQRSTVWXYZ0123456789")
+)
+
+// NewWordish generates a password made of word-like words.
+func NewWordish() string {
+	b := []rune{}
+	b = append(b, randLetter(cr))
+	b = append(b, randLetter(hr))
+	b = append(b, randLetter(ar))
+	b = append(b, randLetter(nr))
+	b = append(b, randLetter(gr))
+	b = append(b, randLetter(er))
+	b = append(b, randLetter(tr))
+	b = append(b, randLetter(hr))
+	b = append(b, randLetter(ir))
+	b = append(b, randLetter(sr))
+	b = append(b, randLetter(ar))
+	b = append(b, randLetter(fr))
+	b = append(b, randLetter(tr))
+	b = append(b, randLetter(er))
+	b = append(b, randLetter(rr))
+	b = append(b, randLetter(lr))
+	b = append(b, randLetter(or))
+	b = append(b, randLetter(gr))
+	b = append(b, randLetter(gr))
+	b = append(b, randLetter(ir))
+	b = append(b, randLetter(nr))
+	b = append(b, randLetter(gr))
+	b = append(b, randLetter(ir))
+	b = append(b, randLetter(nr))
+	for i := 0; i <= 7; i++ {
+		b = append(b, randLetter(remr))
+	}
+	return string(b)
+}
+
+func randLetter(l []rune) rune {
+	li, err := rand.Int(rand.Reader, big.NewInt(int64(len(l))))
+	if err != nil {
+		return rune(-1)
+	}
+	return l[li.Int64()]
+}

posts/parse.go

@@ -4,6 +4,8 @@ import (
 	"strings"
 )
 
+// ExtractTitle takes the given raw post text and returns a title, if explicitly
+// provided, and a body.
 func ExtractTitle(content string) (title string, body string) {
 	if hashIndex := strings.Index(content, "# "); hashIndex == 0 {
 		eol := strings.IndexRune(content, '\n')