Don't return pointer from NewImageAttachment()

Add (forceful) Reset function to memo

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)
 [![#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,10 @@ type Object struct {
 	Content      string            `json:"content"`
 	ContentMap   map[string]string `json:"contentMap,omitempty"`
 	Tag          []Tag             `json:"tag"`
+	Attachment   []Attachment      `json:"attachment,omitempty"`
+
+	// Extensions
+	// NOTE: add extensions here
 }
 
 // NewNoteObject creates a basic Note object that includes the public

activitystreams/attachment.go

@@ -0,0 +1,33 @@
+package activitystreams
+
+import (
+	"mime"
+	"strings"
+)
+
+type Attachment struct {
+	Type      AttachmentType `json:"type"`
+	URL       string         `json:"url"`
+	MediaType string         `json:"mediaType"`
+	Name      string         `json:"name"`
+}
+
+type AttachmentType string
+
+const AttachImage AttachmentType = "Image"
+
+// NewImageAttachment creates a new Attachment from the given URL, setting the
+// correct type and automatically detecting the MediaType based on the file
+// extension.
+func NewImageAttachment(url string) Attachment {
+	var imgType string
+	extIdx := strings.LastIndexByte(url, '.')
+	if extIdx > -1 {
+		imgType = mime.TypeByExtension(url[extIdx:])
+	}
+	return Attachment{
+		Type:      AttachImage,
+		URL:       url,
+		MediaType: imgType,
+	}
+}

activitystreams/attachment_test.go

@@ -0,0 +1,40 @@
+package activitystreams
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestNewImageAttachment(t *testing.T) {
+	type args struct {
+		url string
+	}
+	tests := []struct {
+		name string
+		args args
+		want *Attachment
+	}{
+		{name: "good svg", args: args{"https://writefreely.org/img/writefreely.svg"}, want: &Attachment{
+			Type:      "Image",
+			URL:       "https://writefreely.org/img/writefreely.svg",
+			MediaType: "image/svg+xml",
+		}},
+		{name: "good png", args: args{"https://i.snap.as/12345678.png"}, want: &Attachment{
+			Type:      "Image",
+			URL:       "https://i.snap.as/12345678.png",
+			MediaType: "image/png",
+		}},
+		{name: "no extension", args: args{"https://i.snap.as/12345678"}, want: &Attachment{
+			Type:      "Image",
+			URL:       "https://i.snap.as/12345678",
+			MediaType: "",
+		}},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := NewImageAttachment(tt.args.url); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("NewImageAttachment() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

activitystreams/tag.go

@@ -10,5 +10,5 @@ type TagType string
 
 const (
 	TagHashtag TagType = "Hashtag"
-	TagMention         = "Mention"
+	TagMention TagType = "Mention"
 )

auth/auth.go

@@ -1,7 +1,7 @@
 package auth
 
 import (
-	uuid "github.com/nu7hatch/gouuid"
+	uuid "github.com/gofrs/uuid"
 	"github.com/writeas/web-core/log"
 	"strings"
 )
@@ -16,7 +16,7 @@ func GetToken(header string) []byte {
 			token = f[1]
 		}
 	}
-	t, err := uuid.ParseHex(token)
+	t, err := uuid.FromString(token)
 	if err != nil {
 		log.Error("Couldn't parseHex on '%s': %v", accessToken, err)
 	} else {
@@ -31,7 +31,7 @@ func GetHeaderToken(header string) []byte {
 	if len(header) > 0 {
 		f := strings.Fields(header)
 		if len(f) == 2 && f[0] == "Token" {
-			t, err := uuid.ParseHex(f[1])
+			t, err := uuid.FromString(f[1])
 			if err != nil {
 				log.Error("Couldn't parseHex on '%s': %v", accessToken, err)
 			} else {

go.mod

@@ -0,0 +1,17 @@
+module github.com/writeas/web-core
+
+go 1.10
+
+require (
+	github.com/gofrs/uuid v3.3.0+incompatible
+	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/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/writeas/impart v1.1.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,28 @@
+github.com/gofrs/uuid v1.2.0 h1:coDhrjgyJaglxSjxuJdqQSSdUpG3w6p1OwN2od6frBU=
+github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84=
+github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+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/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/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=

id/random.go

@@ -2,11 +2,25 @@ package id
 
 import (
 	"fmt"
-	"github.com/writeas/nerds/store"
+	"crypto/rand"
 )
 
+// GenerateRandomString creates a random string of characters of the given
+// length from the given dictionary of possible characters.
+//
+// This example generates a hexadecimal string 6 characters long:
+//     GenerateRandomString("0123456789abcdef", 6)
+func GenerateRandomString(dictionary string, l int) string {
+	var bytes = make([]byte, l)
+	rand.Read(bytes)
+	for k, v := range bytes {
+		bytes[k] = dictionary[v%byte(len(dictionary))]
+	}
+	return string(bytes)
+}
+
 // GenSafeUniqueSlug generatees a reasonably unique random slug from the given
 // original slug. It's "safe" because it uses 0-9 b-z excluding vowels.
 func GenSafeUniqueSlug(slug string) string {
-	return fmt.Sprintf("%s-%s", slug, store.GenerateRandomString("0123456789bcdfghjklmnpqrstvwxyz", 4))
+	return fmt.Sprintf("%s-%s", slug, GenerateRandomString("0123456789bcdfghjklmnpqrstvwxyz", 4))
 }

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/phrases_zh.go

@@ -3,24 +3,24 @@ package l10n
 var phrasesZH = map[string]string{
 	"Anonymous post":                 "匿名文章",
 	"Blogs":                          "博客",
-	"Enter":                          "按下Enter按钮",
-	"Newer":                          "最近的博客",
-	"Older":                          "之前的博客",
+	"Enter":                          "按下回车",
+	"Newer":                          "更新",
+	"Older":                          "较旧",
 	"Posts":                          "文章",
 	"Publish to...":                  "发布到...",
 	"Publish":                        "发布",
 	"Read more...":                   "阅读更多",
-	"This blog requires a password.": "这篇博客需要密码",
+	"This blog requires a password.": "这篇文章需要密码",
 	"Toggle theme":                   "更换主题",
 	"View posts":                     "查看文章",
 	"delete":                         "删除",
 	"edit":                           "编辑",
 	"move to...":                     "移动到",
 	"pin":                            "固定文章",
-	"published with write.as":  "用write.as来发布",
-	"share modal ending":       "发送给朋友，或者线上分享，如果可能的话，分享到推特上。了解更多。",
-	"share modal introduction": "发布的每篇文章都有一个唯一的私有URL，你可以把它分享给任何人。这是URL：",
-	"share modal title":        "分享这篇文章",
+	"published with write.as":  "通过 write.as 发布",
+	"share modal ending":       "发送给朋友、与世界分享或者发条推。了解更多。",
+	"share modal introduction": "发布的每篇文章都有一个唯一的私有网址，你可以把它分享给任何人：",
+	"share modal title":        "分享文章",
 	"share":                    "分享",
 	"unpin":                    "取消固定",
 }

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...)
 }

memo/memo.go

@@ -67,3 +67,13 @@ func (memo *Memo) Get() (value interface{}, err error) {
 	}
 	return memo.cache.res.value, memo.cache.res.err
 }
+
+// Reset forcibly resets the cache to nil without checking if the cache
+// duration has elapsed.
+func (memo *Memo) Reset() {
+	defer memo.mu.Unlock()
+	memo.mu.Lock()
+
+	memo.cache = nil
+	memo.lastCache = time.Now()
+}

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')

silobridge/silobridge.go

@@ -0,0 +1,29 @@
+package silobridge
+
+// fakeAPInstances contains a list of sites that we allow writers to mention
+// with the @handle@instance.tld syntax, plus the corresponding prefix to
+// insert between `https://instance.tld/` and `handle` (e.g.
+// https://medium.com/@handle)
+var fakeAPInstances = map[string]string{
+	"deviantart.com": "",
+	"facebook.com":   "",
+	"flickr.com":     "photos/",
+	"github.com":     "",
+	"instagram.com":  "",
+	"medium.com":     "@",
+	"reddit.com":     "user/",
+	"twitter.com":    "",
+	"wattpad.com":    "user/",
+	"youtube.com":    "user/",
+}
+
+// Profile returns the full profile URL for a fake ActivityPub instance, based
+// on the given handle and domain. If the domain isn't recognized, an empty
+// string is returned.
+func Profile(handle, domain string) string {
+	prefix, ok := fakeAPInstances[domain]
+	if !ok {
+		return ""
+	}
+	return "https://" + domain + "/" + prefix + handle
+}