Merge pull request #893 from writefreely/consistent-reader-nav

Fix Admin and Invite links never showing on Reader nav
Merge pull request #930 from tkngaejcpi/develop
2024-04-17 12:44:28 -04:00 · 2024-04-17 12:43:50 -04:00 · 2024-03-04 22:48:51 +08:00 · 2024-02-20 10:02:14 -05:00
2 changed files with 4 additions and 6 deletions
--- a/posts.go
+++ b/posts.go
@ -1669,7 +1669,7 @@ func (rp *RawPost) Updated8601() string {
 	return rp.Updated.Format("2006-01-02T15:04:05Z")
 }

-var imageURLRegex = regexp.MustCompile(`(?i)[^ ]+\.(gif|png|jpg|jpeg|image)$`)
+var imageURLRegex = regexp.MustCompile(`(?i)[^ ]+\.(gif|png|jpg|jpeg|avif|avifs|webp|jxl|image)$`)

 func (p *Post) extractImages() {
 	p.Images = extractImages(p.Content)
--- a/read.go
+++ b/read.go
@ -229,11 +229,9 @@ func showLocalTimeline(app *App, w http.ResponseWriter, r *http.Request, page in
 		TotalPages:  ttlPages,
 		SelTopic:    tag,
 	}
-	if app.cfg.App.Chorus {
-		u := getUserSession(app, r)
-		d.IsAdmin = u != nil && u.IsAdmin()
-		d.CanInvite = canUserInvite(app.cfg, d.IsAdmin)
-	}
+	u := getUserSession(app, r)
+	d.IsAdmin = u != nil && u.IsAdmin()
+	d.CanInvite = canUserInvite(app.cfg, d.IsAdmin)
 	c, err := getReaderSection(app)
 	if err != nil {
 		return err
Author	SHA1	Message	Date
Matt Baer	038a80c25e	Merge pull request #893 from writefreely/consistent-reader-nav Fix Admin and Invite links never showing on Reader nav	2024-04-17 12:44:28 -04:00
Matt Baer	9ece6682ef	Merge pull request #930 from tkngaejcpi/develop support more image formats	2024-04-17 12:43:50 -04:00
Riley Chang	83ffea7fa0	support more image formats	2024-03-04 22:48:51 +08:00
Matt Baer	e34a58d0ef	Fix Admin and Invite links never showing on Reader nav	2024-02-20 10:02:14 -05:00