Fix getRemoteUserFromURL description

Display fediverse:creator header tag on posts
This uses the fediverse actor a blog author has added in the Verification field on their blog, looking up the handle locally to display it in the `fediverse:creator` tag. If it doesn't exist locally, the tag is simply left out.
2025-02-18 15:33:57 -05:00 · 2025-02-15 17:15:56 -05:00
13 changed files with 96 additions and 303 deletions
--- a/10
+++ b/10
@ -41,12 +41,6 @@ build-darwin: deps
 	fi
 	xgo --targets=darwin/amd64, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.21.x -out writefreely -pkg ./cmd/writefreely .
 build-darwin-arm64: deps
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		$(GOCMD) install src.techknowlogick.com/xgo@latest; \
 	fi
 	xgo --targets=darwin/arm64, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.21.x -out writefreely -pkg ./cmd/writefreely .
 build-arm6: deps
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		$(GOCMD) install src.techknowlogick.com/xgo@latest; \
@ -115,10 +109,6 @@ release : clean ui
 	mv build/$(BINARY_NAME)-darwin-10.12-amd64 $(BUILDPATH)/$(BINARY_NAME)
 	tar -cvzf $(BINARY_NAME)_$(GITREV)_macos_amd64.tar.gz -C build $(BINARY_NAME)
 	rm $(BUILDPATH)/$(BINARY_NAME)
 	$(MAKE) build-darwin-arm64
 	mv build/$(BINARY_NAME)-darwin-arm64 $(BUILDPATH)/$(BINARY_NAME)
 	tar -cvzf $(BINARY_NAME)_$(GITREV)_macos_arm64.tar.gz -C build $(BINARY_NAME)
 	rm $(BUILDPATH)/$(BINARY_NAME)
 	$(MAKE) build-windows
 	mv build/$(BINARY_NAME)-windows-4.0-amd64.exe $(BUILDPATH)/$(BINARY_NAME).exe
 	cd build; zip -r ../$(BINARY_NAME)_$(GITREV)_windows_amd64.zip ./$(BINARY_NAME)
--- a/account.go
+++ b/account.go
@ -13,7 +13,7 @@ package writefreely
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/writefreely/writefreely/mailer"
+	"github.com/mailgun/mailgun-go"
 	"github.com/writefreely/writefreely/spam"
 	"html/template"
 	"net/http"
@ -1378,19 +1378,13 @@ func handleResetPasswordInit(app *App, w http.ResponseWriter, r *http.Request) e
 func emailPasswordReset(app *App, toEmail, token string) error {
 	// Send email
-	mlr, err := mailer.New(app.cfg.Email)
+	gun := mailgun.NewMailgun(app.cfg.Email.Domain, app.cfg.Email.MailgunPrivate)
 	if err != nil {
 		return err
 	}
 	footerPara := "Didn't request this password reset? Your account is still safe, and you can safely ignore this email."
 	plainMsg := fmt.Sprintf("We received a request to reset your password on %s. Please click the following link to continue (or copy and paste it into your browser): %s/reset?t=%s\n\n%s", app.cfg.App.SiteName, app.cfg.App.Host, token, footerPara)
-	m, err := mlr.NewMessage(app.cfg.App.SiteName+" <noreply-password@"+app.cfg.Email.Domain+">", "Reset Your "+app.cfg.App.SiteName+" Password", plainMsg, fmt.Sprintf("<%s>", toEmail))
+	m := mailgun.NewMessage(app.cfg.App.SiteName+" <noreply-password@"+app.cfg.Email.Domain+">", "Reset Your "+app.cfg.App.SiteName+" Password", plainMsg, fmt.Sprintf("<%s>", toEmail))
 	if err != nil {
 		return err
 	}
 	m.AddTag("Password Reset")
-	m.SetHTML(fmt.Sprintf(`<html>
+	m.SetHtml(fmt.Sprintf(`<html>
 	<body style="font-family:Lora, 'Palatino Linotype', Palatino, Baskerville, 'Book Antiqua', 'New York', 'DejaVu serif', serif; font-size: 100%%; margin:1em 2em;">
 		<div style="margin:0 auto; max-width: 40em; font-size: 1.2em;">
        <h1 style="font-size:1.75em"><a style="text-decoration:none;color:#000;" href="%s">%s</a></h1>
@ -1400,7 +1394,8 @@ func emailPasswordReset(app *App, toEmail, token string) error {
        </div>
 	</body>
 </html>`, app.cfg.App.Host, app.cfg.App.SiteName, app.cfg.App.SiteName, app.cfg.App.Host, token, footerPara))
-	return mlr.Send(m)
+	_, _, err := gun.Send(m)
 	return err
 }
 func loginViaEmail(app *App, alias, redirectTo string) error {
@ -1429,21 +1424,15 @@ func loginViaEmail(app *App, alias, redirectTo string) error {
 	}
 	// Send email
-	mlr, err := mailer.New(app.cfg.Email)
+	gun := mailgun.NewMailgun(app.cfg.Email.Domain, app.cfg.Email.MailgunPrivate)
 	if err != nil {
 		return err
 	}
 	toEmail := u.EmailClear(app.keys)
 	footerPara := "This link will only work once and expires in 15 minutes. Didn't ask us to log in? You can safely ignore this email."
 	plainMsg := fmt.Sprintf("Log in to %s here: %s/login?to=%s&with=%s\n\n%s", app.cfg.App.SiteName, app.cfg.App.Host, redirectTo, t, footerPara)
-	m, err := mlr.NewMessage(app.cfg.App.SiteName+" <noreply-login@"+app.cfg.Email.Domain+">", "Log in to "+app.cfg.App.SiteName, plainMsg, fmt.Sprintf("<%s>", toEmail))
+	m := mailgun.NewMessage(app.cfg.App.SiteName+" <noreply-login@"+app.cfg.Email.Domain+">", "Log in to "+app.cfg.App.SiteName, plainMsg, fmt.Sprintf("<%s>", toEmail))
 	if err != nil {
 		return err
 	}
 	m.AddTag("Email Login")
-	m.SetHTML(fmt.Sprintf(`<html>
+	m.SetHtml(fmt.Sprintf(`<html>
 	<body style="font-family:Lora, 'Palatino Linotype', Palatino, Baskerville, 'Book Antiqua', 'New York', 'DejaVu serif', serif; font-size: 100%%; margin:1em 2em;">
 		<div style="margin:0 auto; max-width: 40em; font-size: 1.2em;">
        <h1 style="font-size:1.75em"><a style="text-decoration:none;color:#000;" href="%s">%s</a></h1>
@ -1452,7 +1441,9 @@ func loginViaEmail(app *App, alias, redirectTo string) error {
        </div>
 	</body>
 </html>`, app.cfg.App.Host, app.cfg.App.SiteName, app.cfg.App.Host, redirectTo, t, app.cfg.App.SiteName, footerPara))
-	return mlr.Send(m)
+	_, _, err = gun.Send(m)
 	return err
 }
 func saveTempInfo(app *App, key, val string, r *http.Request, w http.ResponseWriter) error {
--- a/activitypub.go
+++ b/activitypub.go
@ -436,17 +436,6 @@ func handleFetchCollectionInbox(app *App, w http.ResponseWriter, r *http.Request
 			a.AppendObject(f.Raw())
 			_, to = f.GetActor(0)
 			obj := f.Raw().GetObjectIRI(0)
 			if obj == nil {
 				if debugging {
 					log.Error("GetObjectIRI on Follow for actor is empty; trying object")
 				}
 				ao := f.Raw().GetObject(0)
 				if ao == nil {
 					log.Error("Fell back to GetObject and none parsed, so no actor ID! Follow request probably FAILED!")
 				} else {
 					obj = ao.GetId()
 				}
 			}
 			a.AppendActor(obj)
 			// First get actor information
@ -982,6 +971,23 @@ func getRemoteUserFromHandle(app *App, handle string) (*RemoteUser, error) {
 	return &u, nil
 }
 // getRemoteUserFromURL retrieves a RemoteUser from their public profile URL.
 func getRemoteUserFromURL(app *App, urlStr string) (*RemoteUser, error) {
 	u := RemoteUser{URL: urlStr}
 	var urlVal, handle sql.NullString
 	err := app.db.QueryRow("SELECT id, actor_id, inbox, shared_inbox, url, handle FROM remoteusers WHERE url = ?", urlStr).Scan(&u.ID, &u.ActorID, &u.Inbox, &u.SharedInbox, &urlVal, &handle)
 	switch {
 	case err == sql.ErrNoRows:
 		return nil, ErrRemoteUserNotFound
 	case err != nil:
 		log.Error("Couldn't get remote user from URL %s: %v", urlStr, err)
 		return nil, err
 	}
 	u.URL = urlVal.String
 	u.Handle = handle.String
 	return &u, nil
 }
 func getActor(app *App, actorIRI string) (*activitystreams.Person, *RemoteUser, error) {
 	log.Info("Fetching actor %s locally", actorIRI)
 	actor := &activitystreams.Person{}
--- a/app.go
+++ b/app.go
@ -429,11 +429,15 @@ func Initialize(apper Apper, debug bool) (*App, error) {
 	initActivityPub(apper.App())
-	if apper.App().cfg.Email.Enabled() {
+	if apper.App().cfg.Email.Domain != "" || apper.App().cfg.Email.MailgunPrivate != "" {
-		log.Info("Starting publish jobs queue...")
+		if apper.App().cfg.Email.Domain == "" {
-		go startPublishJobsQueue(apper.App())
+			log.Error("[FAILED] Starting publish jobs queue: no [letters]domain config value set.")
-	} else {
+		} else if apper.App().cfg.Email.MailgunPrivate == "" {
-		log.Error("[FAILED] Starting publish jobs queue: no email provider is configured.")
+			log.Error("[FAILED] Starting publish jobs queue: no [letters]mailgun_private config value set.")
 		} else {
 			log.Info("Starting publish jobs queue...")
 			go startPublishJobsQueue(apper.App())
 		}
 	}
 	// Handle local timeline, if enabled
--- a/collections.go
+++ b/collections.go
@ -630,18 +630,19 @@ func fetchCollectionPosts(app *App, w http.ResponseWriter, r *http.Request) erro
 type CollectionPage struct {
 	page.StaticPage
 	*DisplayCollection
-	IsCustomDomain bool
+	IsCustomDomain  bool
-	IsWelcome      bool
+	IsWelcome       bool
-	IsOwner        bool
+	IsOwner         bool
-	IsCollLoggedIn bool
+	IsCollLoggedIn  bool
-	Honeypot       string
+	Honeypot        string
-	IsSubscriber   bool
+	IsSubscriber    bool
-	CanPin         bool
+	CanPin          bool
-	Username       string
+	Username        string
-	Monetization   string
+	Monetization    string
-	Flash          template.HTML
+	FediverseAuthor string
-	Collections    *[]Collection
+	Flash           template.HTML
-	PinnedPosts    *[]PublicPost
+	Collections     *[]Collection
 	PinnedPosts     *[]PublicPost
 	IsAdmin   bool
 	CanInvite bool
@ -884,6 +885,7 @@ func handleViewCollection(app *App, w http.ResponseWriter, r *http.Request) erro
 	// Serve ActivityStreams data now, if requested
 	if IsActivityPubRequest(r) {
 		ac := c.PersonObject()
 		ac.Context = []interface{}{activitystreams.Namespace}
 		setCacheControl(w, apCacheTime)
 		return impart.RenderActivityJSON(w, ac, http.StatusOK)
 	}
--- a/config/config.go
+++ b/config/config.go
@ -171,17 +171,8 @@ type (
 	}
 	EmailCfg struct {
 		// SMTP configuration values
 		Host           string `ini:"smtp_host"`
 		Port           int    `ini:"smtp_port"`
 		Username       string `ini:"smtp_username"`
 		Password       string `ini:"smtp_password"`
 		EnableStartTLS bool   `ini:"smtp_enable_start_tls"`
 		// Mailgun configuration values
 		Domain         string `ini:"domain"`
 		MailgunPrivate string `ini:"mailgun_private"`
 		MailgunEurope  bool   `ini:"mailgun_europe"`
 	}
 	// Config holds the complete configuration for running a writefreely instance
@ -251,8 +242,7 @@ func (ac *AppCfg) LandingPath() string {
 }
 func (lc EmailCfg) Enabled() bool {
-	return (lc.Domain != "" && lc.MailgunPrivate != "") ||
+	return lc.Domain != "" && lc.MailgunPrivate != ""
 		lc.Username != "" && lc.Password != "" && lc.Host != "" && lc.Port > 0
 }
 func (ac AppCfg) SignupPath() string {
--- a/email.go
+++ b/email.go
@ -14,7 +14,6 @@ import (
 	"database/sql"
 	"encoding/json"
 	"fmt"
 	"github.com/writefreely/writefreely/mailer"
 	"html/template"
 	"net/http"
 	"strings"
@ -22,6 +21,7 @@ import (
 	"github.com/aymerick/douceur/inliner"
 	"github.com/gorilla/mux"
 	"github.com/mailgun/mailgun-go"
 	stripmd "github.com/writeas/go-strip-markdown/v2"
 	"github.com/writeas/impart"
 	"github.com/writeas/web-core/data"
@ -307,14 +307,8 @@ Originally published on ` + p.Collection.DisplayTitle() + ` (` + p.Collection.Ca
 Sent to %recipient.to%. Unsubscribe: ` + p.Collection.CanonicalURL() + `email/unsubscribe/%recipient.id%?t=%recipient.token%`
-	mlr, err := mailer.New(app.cfg.Email)
+	gun := mailgun.NewMailgun(app.cfg.Email.Domain, app.cfg.Email.MailgunPrivate)
-	if err != nil {
+	m := mailgun.NewMessage(p.Collection.DisplayTitle()+" <"+p.Collection.Alias+"@"+app.cfg.Email.Domain+">", stripmd.Strip(p.DisplayTitle()), plainMsg)
 		return err
 	}
 	m, err := mlr.NewMessage(p.Collection.DisplayTitle()+" <"+p.Collection.Alias+"@"+app.cfg.Email.Domain+">", stripmd.Strip(p.DisplayTitle()), plainMsg)
 	if err != nil {
 		return err
 	}
 	replyTo := app.db.GetCollectionAttribute(collID, collAttrLetterReplyTo)
 	if replyTo != "" {
 		m.SetReplyTo(replyTo)
@ -411,13 +405,13 @@ Sent to %recipient.to%. Unsubscribe: ` + p.Collection.CanonicalURL() + `email/un
 		return err
 	}
-	m.SetHTML(html)
+	m.SetHtml(html)
 	log.Info("[email] Adding %d recipient(s)", len(subs))
 	for _, s := range subs {
 		e := s.FinalEmail(app.keys)
 		log.Info("[email] Adding %s", e)
-		err = m.AddRecipientAndVariables(e, map[string]string{
+		err = m.AddRecipientAndVariables(e, map[string]interface{}{
 			"id":    s.ID,
 			"to":    e,
 			"token": s.Token,
@ -427,8 +421,8 @@ Sent to %recipient.to%. Unsubscribe: ` + p.Collection.CanonicalURL() + `email/un
 		}
 	}
-	err = mlr.Send(m)
+	res, _, err := gun.Send(m)
-	log.Info("[email] Email sent")
+	log.Info("[email] Send result: %s", res)
 	if err != nil {
 		log.Error("Unable to send post email: %v", err)
 		return err
@ -443,23 +437,17 @@ func sendSubConfirmEmail(app *App, c *Collection, email, subID, token string) er
 	}
 	// Send email
-	mlr, err := mailer.New(app.cfg.Email)
+	gun := mailgun.NewMailgun(app.cfg.Email.Domain, app.cfg.Email.MailgunPrivate)
 	if err != nil {
 		return err
 	}
 	plainMsg := "Confirm your subscription to " + c.DisplayTitle() + ` (` + c.CanonicalURL() + `) to start receiving future posts. Simply click the following link (or copy and paste it into your browser):
 ` + c.CanonicalURL() + "email/confirm/" + subID + "?t=" + token + `
 If you didn't subscribe to this site or you're not sure why you're getting this email, you can delete it. You won't be subscribed or receive any future emails.`
-	m, err := mlr.NewMessage(c.DisplayTitle()+" <"+c.Alias+"@"+app.cfg.Email.Domain+">", "Confirm your subscription to "+c.DisplayTitle(), plainMsg, fmt.Sprintf("<%s>", email))
+	m := mailgun.NewMessage(c.DisplayTitle()+" <"+c.Alias+"@"+app.cfg.Email.Domain+">", "Confirm your subscription to "+c.DisplayTitle(), plainMsg, fmt.Sprintf("<%s>", email))
 	if err != nil {
 		return err
 	}
 	m.AddTag("Email Verification")
-	m.SetHTML(`<html>
+	m.SetHtml(`<html>
 	<body style="font-family:Lora, 'Palatino Linotype', Palatino, Baskerville, 'Book Antiqua', 'New York', 'DejaVu serif', serif; font-size: 100%%; margin:1em 2em;">
 		<div style="font-size: 1.2em;">
 			<p>Confirm your subscription to <a href="` + c.CanonicalURL() + `">` + c.DisplayTitle() + `</a> to start receiving future posts:</p>
@ -468,10 +456,7 @@ If you didn't subscribe to this site or you're not sure why you're getting this
        </div>
 	</body>
 </html>`)
-	err = mlr.Send(m)
+	gun.Send(m)
 	if err != nil {
 		return err
 	}
 	return nil
 }
--- a/go.mod
+++ b/go.mod
@ -27,7 +27,7 @@ require (
 	github.com/mailgun/mailgun-go v2.0.0+incompatible
 	github.com/manifoldco/promptui v0.9.0
 	github.com/mattn/go-sqlite3 v1.14.21
-	github.com/microcosm-cc/bluemonday v1.0.27
+	github.com/microcosm-cc/bluemonday v1.0.26
 	github.com/mitchellh/go-wordwrap v1.0.1
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
 	github.com/onsi/ginkgo v1.16.4 // indirect
@ -53,8 +53,6 @@ require (
 	golang.org/x/net v0.30.0
 )
 require github.com/xhit/go-simple-mail/v2 v2.16.0
 require (
 	code.as/core/socks v1.0.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
@ -69,7 +67,7 @@ require (
 	github.com/go-fed/httpsig v0.1.1-0.20200204213531-0ef28562fabe // indirect
 	github.com/gofrs/uuid v3.3.0+incompatible // indirect
 	github.com/gologme/log v1.2.0 // indirect
-	github.com/gorilla/css v1.0.1 // indirect
+	github.com/gorilla/css v1.0.0 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/gosimple/unidecode v1.0.1 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
@ -84,7 +82,6 @@ require (
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 // indirect
 	github.com/writeas/go-writeas/v2 v2.0.2 // indirect
 	github.com/writeas/openssl-go v1.0.0 // indirect
 	github.com/writeas/slug v1.2.0 // indirect
--- a/go.sum
+++ b/go.sum
@ -79,9 +79,8 @@ github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/csrf v1.7.2 h1:oTUjx0vyf2T+wkrx09Trsev1TE+/EbDAeHtSTbtC2eI=
 github.com/gorilla/csrf v1.7.2/go.mod h1:F1Fj3KG23WYHE6gozCmBAezKookxbIvUJT+121wTuLk=
 github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
 github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
 github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
 github.com/gorilla/feeds v1.1.2 h1:pxzZ5PD3RJdhFH2FsJJ4x6PqMqbgFk1+Vez4XWBW8Iw=
 github.com/gorilla/feeds v1.1.2/go.mod h1:WMib8uJP3BbY+X8Szd1rA5Pzhdfh+HCCAYT2z7Fza6Y=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
@ -133,8 +132,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
 github.com/mattn/go-sqlite3 v1.14.21 h1:IXocQLOykluc3xPE0Lvy8FtggMz1G+U3mEjg+0zGizc=
 github.com/mattn/go-sqlite3 v1.14.21/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4=
-github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
+github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
-github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
+github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
 github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
 github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
@ -178,8 +177,6 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 h1:PM5hJF7HVfNWmCjMdEfbuOBNXSVF2cMFGgQTPdKCbwM=
 github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208/go.mod h1:BzWtXXrXzZUvMacR0oF/fbDDgUPO8L36tDMmRAf14ns=
 github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8=
 github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ=
 github.com/writeas/activity v0.1.2 h1:Y12B5lIrabfqKE7e7HFCWiXrlfXljr9tlkFm2mp7DgY=
@ -215,8 +212,6 @@ github.com/writefreely/go-gopher v0.0.0-20220429181814-40127126f83b h1:h3NzB8OZ5
 github.com/writefreely/go-gopher v0.0.0-20220429181814-40127126f83b/go.mod h1:T2UVVzt+R5KSSZe2xRSytnwc2M9AoDegi7foeIsik+M=
 github.com/writefreely/go-nodeinfo v1.2.0 h1:La+YbTCvmpTwFhBSlebWDDL81N88Qf/SCAvRLR7F8ss=
 github.com/writefreely/go-nodeinfo v1.2.0/go.mod h1:UTvE78KpcjYOlRHupZIiSEFcXHioTXuacCbHU+CAcPg=
 github.com/xhit/go-simple-mail/v2 v2.16.0 h1:ouGy/Ww4kuaqu2E2UrDw7SvLaziWTB60ICLkIkNVccA=
 github.com/xhit/go-simple-mail/v2 v2.16.0/go.mod h1:b7P5ygho6SYE+VIqpxA6QkYfv4teeyG4MKqB3utRu98=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
--- a/mailer/mailer.go
+++ b/mailer/mailer.go
@ -1,181 +0,0 @@
 /*
 * Copyright © 2024 Musing Studio LLC.
 *
 * This file is part of WriteFreely.
 *
 * WriteFreely is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License, included
 * in the LICENSE file in this source code package.
 */
 package mailer
 import (
 	"fmt"
 	"github.com/mailgun/mailgun-go"
 	"github.com/writeas/web-core/log"
 	"github.com/writefreely/writefreely/config"
 	mail "github.com/xhit/go-simple-mail/v2"
 	"strings"
 )
 type (
 	// Mailer holds configurations for the preferred mailing provider.
 	Mailer struct {
 		smtp    *mail.SMTPServer
 		mailGun *mailgun.MailgunImpl
 	}
 	// Message holds the email contents and metadata for the preferred mailing provider.
 	Message struct {
 		mgMsg   *mailgun.Message
 		smtpMsg *SmtpMessage
 	}
 	SmtpMessage struct {
 		from       string
 		replyTo    string
 		subject    string
 		recipients []Recipient
 		html       string
 		text       string
 	}
 	Recipient struct {
 		email string
 		vars  map[string]string
 	}
 )
 // New creates a new Mailer from the instance's config.EmailCfg, returning an error if not properly configured.
 func New(eCfg config.EmailCfg) (*Mailer, error) {
 	m := &Mailer{}
 	if eCfg.Domain != "" && eCfg.MailgunPrivate != "" {
 		m.mailGun = mailgun.NewMailgun(eCfg.Domain, eCfg.MailgunPrivate)
 		if eCfg.MailgunEurope {
 			m.mailGun.SetAPIBase("https://api.eu.mailgun.net/v3")
 		}
 	} else if eCfg.Username != "" && eCfg.Password != "" && eCfg.Host != "" && eCfg.Port > 0 {
 		m.smtp = mail.NewSMTPClient()
 		m.smtp.Host = eCfg.Host
 		m.smtp.Port = eCfg.Port
 		m.smtp.Username = eCfg.Username
 		m.smtp.Password = eCfg.Password
 		if eCfg.EnableStartTLS {
 			m.smtp.Encryption = mail.EncryptionSTARTTLS
 		}
 		// To allow sending multiple email
 		m.smtp.KeepAlive = true
 	} else {
 		return nil, fmt.Errorf("no email provider is configured")
 	}
 	return m, nil
 }
 // NewMessage creates a new Message from the given parameters.
 func (m *Mailer) NewMessage(from, subject, text string, to ...string) (*Message, error) {
 	msg := &Message{}
 	if m.mailGun != nil {
 		msg.mgMsg = m.mailGun.NewMessage(from, subject, text, to...)
 	} else if m.smtp != nil {
 		msg.smtpMsg = &SmtpMessage{
 			from:       from,
 			replyTo:    "",
 			subject:    subject,
 			recipients: make([]Recipient, len(to)),
 			html:       "",
 			text:       text,
 		}
 		for _, r := range to {
 			msg.smtpMsg.recipients = append(msg.smtpMsg.recipients, Recipient{r, make(map[string]string)})
 		}
 	}
 	return msg, nil
 }
 // SetHTML sets the body of the message.
 func (m *Message) SetHTML(html string) {
 	if m.smtpMsg != nil {
 		m.smtpMsg.html = html
 	} else if m.mgMsg != nil {
 		m.mgMsg.SetHtml(html)
 	}
 }
 func (m *Message) SetReplyTo(replyTo string) {
 	if m.smtpMsg != nil {
 		m.smtpMsg.replyTo = replyTo
 	} else {
 		m.mgMsg.SetReplyTo(replyTo)
 	}
 }
 // AddTag attaches a tag to the Message for providers that support it.
 func (m *Message) AddTag(tag string) {
 	if m.mgMsg != nil {
 		m.mgMsg.AddTag(tag)
 	}
 }
 func (m *Message) AddRecipientAndVariables(r string, vars map[string]string) error {
 	if m.smtpMsg != nil {
 		m.smtpMsg.recipients = append(m.smtpMsg.recipients, Recipient{r, vars})
 		return nil
 	} else {
 		varsInterfaces := make(map[string]interface{}, len(vars))
 		for k, v := range vars {
 			varsInterfaces[k] = v
 		}
 		return m.mgMsg.AddRecipientAndVariables(r, varsInterfaces)
 	}
 }
 // Send sends the given message via the preferred provider.
 func (m *Mailer) Send(msg *Message) error {
 	if m.smtp != nil {
 		client, err := m.smtp.Connect()
 		if err != nil {
 			return err
 		}
 		emailSent := false
 		for _, r := range msg.smtpMsg.recipients {
 			customMsg := mail.NewMSG()
 			customMsg.SetFrom(msg.smtpMsg.from)
 			if msg.smtpMsg.replyTo != "" {
 				customMsg.SetReplyTo(msg.smtpMsg.replyTo)
 			}
 			customMsg.SetSubject(msg.smtpMsg.subject)
 			customMsg.AddTo(r.email)
 			cText := msg.smtpMsg.text
 			cHtml := msg.smtpMsg.html
 			for v, value := range r.vars {
 				placeHolder := fmt.Sprintf("%%recipient.%s%%", v)
 				cText = strings.ReplaceAll(cText, placeHolder, value)
 				cHtml = strings.ReplaceAll(cHtml, placeHolder, value)
 			}
 			customMsg.SetBody(mail.TextHTML, cHtml)
 			customMsg.AddAlternative(mail.TextPlain, cText)
 			e := customMsg.Error
 			if e == nil {
 				e = customMsg.Send(client)
 			}
 			if e == nil {
 				emailSent = true
 			} else {
 				log.Error("Unable to send email to %s: %v", r.email, e)
 				err = e
 			}
 		}
 		if !emailSent {
 			// only send an error if no email could be sent (to avoid retry of successfully sent emails)
 			return err
 		}
 	} else if m.mailGun != nil {
 		_, _, err := m.mailGun.Send(msg.mgMsg)
 		if err != nil {
 			return err
 		}
 	}
 	return nil
 }
--- a/posts.go
+++ b/posts.go
@ -144,16 +144,17 @@ type (
 	CollectionPostPage struct {
 		*PublicPost
 		page.StaticPage
-		IsOwner        bool
+		IsOwner         bool
-		IsPinned       bool
+		IsPinned        bool
-		IsCustomDomain bool
+		IsCustomDomain  bool
-		Monetization   string
+		Monetization    string
-		Verification   string
+		Verification    string
-		PinnedPosts    *[]PublicPost
+		FediverseAuthor string
-		IsFound        bool
+		PinnedPosts     *[]PublicPost
-		IsAdmin        bool
+		IsFound         bool
-		CanInvite      bool
+		IsAdmin         bool
-		Silenced       bool
+		CanInvite       bool
 		Silenced        bool
 		// Helper field for Chorus mode
 		CollAlias string
@ -1614,6 +1615,18 @@ Are you sure it was ever here?`,
 		tp.IsPinned = len(*tp.PinnedPosts) > 0 && PostsContains(tp.PinnedPosts, p)
 		tp.Monetization = coll.Monetization
 		tp.Verification = coll.Verification
 		if tp.Verification != "" {
 			// Fetch info for fediverse:creator tag
 			ru, err := getRemoteUserFromURL(app, coll.Verification)
 			if err != nil {
 				if debugging {
 					log.Info("showing rel=me tag, but no local handle for %s", coll.Verification)
 				}
 			} else {
 				// Though we don't store handles with leading @, strip it here just in case
 				tp.FediverseAuthor = "@" + strings.TrimLeft(ru.Handle, "@")
 			}
 		}
 		if !postFound {
 			w.WriteHeader(http.StatusNotFound)
--- a/templates/collection-post.tmpl
+++ b/templates/collection-post.tmpl
@ -56,7 +56,7 @@
 				{{end}}
 				{{ if and .IsOwner .IsFound }}<span class="views" dir="ltr"><strong>{{largeNumFmt .Views}}</strong> {{pluralize "view" "views" .Views}}</span>
                {{if .Likes}}<span class="views" dir="ltr"><strong>{{largeNumFmt .Likes}}</strong> {{pluralize "like" "likes" .Likes}}</span>{{end}}
-				<a href="/{{if not .SingleUser}}{{.Collection.Alias}}/{{end}}{{.Slug.String}}/edit" dir="{{.Direction}}">Edit</a>
+				<a class="xtra-feature" href="/{{if not .SingleUser}}{{.Collection.Alias}}/{{end}}{{.Slug.String}}/edit" dir="{{.Direction}}">Edit</a>
 				{{if .IsPinned}}<a class="xtra-feature unpin" href="/{{.Collection.Alias}}/{{.Slug.String}}/unpin" dir="{{.Direction}}" onclick="unpinPost(event, '{{.ID}}')">Unpin</a>{{end}}
 				{{ end }}
 			</nav>
--- a/templates/include/post-render.tmpl
+++ b/templates/include/post-render.tmpl
@ -4,6 +4,7 @@
 		<meta name="monetization" content="{{.DisplayMonetization}}" />
 	{{- end}}
 	{{if .Verification -}}
 		{{if .FediverseAuthor}}<meta name="fediverse:creator" content="{{.FediverseAuthor}}">{{end}}
 		<link rel="me" href="{{.Verification}}" />
 	{{- end}}
 {{end}}