dimkr · dimkr · Apr 8, 2024 · Apr 8, 2024 · Apr 9, 2024 · Apr 9, 2024
diff --git a/README.md b/README.md
@@ -35,9 +35,7 @@ Welcome, fedinaut! localhost.localdomain:8443 is an instance of tootik, a federa
 🔥 Hashtags
 🔭 Find user
 🔎 Search posts
-💌 Post to mentioned users
-🔔 Post to followers
-📣 Post to public
+📣 New post
 ⚙️ Settings
 📊 Statistics
 🛟 Help
@@ -102,7 +100,7 @@ tootik is lightweight, private and accessible social network:
   * With support for [Mastodon's follower synchronization mechanism](https://docs.joinmastodon.org/spec/activitypub/#follower-synchronization-mechanism), aka [FEP-8fcf](https://codeberg.org/fediverse/fep/src/branch/main/fep/8fcf/fep-8fcf.md)
 * Multi-choice polls
 * Full-text search within posts
-* Upload of user avatars, over [Titan](gemini://transjovian.org/titan)
+* Upload of posts and user avatars, over [Titan](gemini://transjovian.org/titan)
 * Account migration, in both directions
 
 ## Using tootik

diff --git a/front/bio.go b/front/bio.go
@@ -20,13 +20,12 @@ import (
 	"github.com/dimkr/tootik/front/text"
 	"github.com/dimkr/tootik/front/text/plain"
 	"github.com/dimkr/tootik/outbox"
-	"net/url"
 	"strings"
 	"time"
 	"unicode/utf8"
 )
 
-func (h *Handler) bio(w text.Writer, r *request, args ...string) {
+func (h *Handler) doBio(w text.Writer, r *request, readInput func(text.Writer, *request) (string, bool)) {
 	if r.User == nil {
 		w.Redirect("/users")
 		return
@@ -40,14 +39,8 @@ func (h *Handler) bio(w text.Writer, r *request, args ...string) {
 		return
 	}
 
-	if r.URL.RawQuery == "" {
-		w.Status(10, "Summary")
-		return
-	}
-
-	summary, err := url.QueryUnescape(r.URL.RawQuery)
-	if err != nil {
-		w.Status(40, "Bad input")
+	summary, ok := readInput(w, r)
+	if !ok {
 		return
 	}
 
@@ -90,3 +83,23 @@ func (h *Handler) bio(w text.Writer, r *request, args ...string) {
 
 	w.Redirect("/users/outbox/" + strings.TrimPrefix(r.User.ID, "https://"))
 }
+
+func (h *Handler) bio(w text.Writer, r *request, args ...string) {
+	h.doBio(
+		w,
+		r,
+		func(w text.Writer, r *request) (string, bool) {
+			return readQuery(w, r, "Bio")
+		},
+	)
+}
+
+func (h *Handler) uploadBio(w text.Writer, r *request, args ...string) {
+	h.doBio(
+		w,
+		r,
+		func(w text.Writer, r *request) (string, bool) {
+			return readBody(w, r, args)
+		},
+	)
+}
diff --git a/front/dm.go b/front/dm.go
@@ -25,5 +25,16 @@ func (h *Handler) dm(w text.Writer, r *request, args ...string) {
 	to := ap.Audience{}
 	cc := ap.Audience{}
 
-	h.post(w, r, nil, nil, to, cc, "", "Post content")
+	h.post(w, r, nil, nil, to, cc, "", func() (string, bool) {
+		return readQuery(w, r, "Post content")
+	})
+}
+
+func (h *Handler) uploadDM(w text.Writer, r *request, args ...string) {
+	to := ap.Audience{}
+	cc := ap.Audience{}
+
+	h.post(w, r, nil, nil, to, cc, "", func() (string, bool) {
+		return readBody(w, r, args)
+	})
 }
diff --git a/front/edit.go b/front/edit.go
@@ -22,33 +22,15 @@ import (
 	"github.com/dimkr/tootik/ap"
 	"github.com/dimkr/tootik/front/text"
 	"math"
-	"net/url"
 	"time"
-	"unicode/utf8"
 )
 
-func (h *Handler) edit(w text.Writer, r *request, args ...string) {
+func (h *Handler) doEdit(w text.Writer, r *request, args []string, readInput inputFunc) {
 	if r.User == nil {
 		w.Redirect("/users")
 		return
 	}
 
-	if r.URL.RawQuery == "" {
-		w.Status(10, "Post content")
-		return
-	}
-
-	content, err := url.QueryUnescape(r.URL.RawQuery)
-	if err != nil {
-		w.Status(40, "Bad input")
-		return
-	}
-
-	if utf8.RuneCountInString(content) > h.Config.MaxPostsLength {
-		w.Status(40, "Post is too long")
-		return
-	}
-
 	postID := "https://" + args[1]
 
 	var note ap.Object
@@ -88,7 +70,7 @@ func (h *Handler) edit(w text.Writer, r *request, args ...string) {
 	}
 
 	if note.InReplyTo == "" {
-		h.post(w, r, &note, nil, note.To, note.CC, note.Audience, "Post content")
+		h.post(w, r, &note, nil, note.To, note.CC, note.Audience, readInput)
 		return
 	}
 
@@ -102,5 +84,17 @@ func (h *Handler) edit(w text.Writer, r *request, args ...string) {
 	}
 
 	// the starting point is the original value of to and cc: recipients can be added but not removed when editing
-	h.post(w, r, &note, &parent, note.To, note.CC, note.Audience, "Post content")
+	h.post(w, r, &note, &parent, note.To, note.CC, note.Audience, readInput)
+}
+
+func (h *Handler) edit(w text.Writer, r *request, args ...string) {
+	h.doEdit(w, r, args, func() (string, bool) {
+		return readQuery(w, r, "Post content")
+	})
+}
+
+func (h *Handler) editUpload(w text.Writer, r *request, args ...string) {
+	h.doEdit(w, r, args, func() (string, bool) {
+		return readBody(w, r, args[1:])
+	})
 }
diff --git a/front/handler.go b/front/handler.go
@@ -85,6 +85,7 @@ func NewHandler(domain string, closed bool, cfg *cfg.Config) (Handler, error) {
 
 	h.handlers[regexp.MustCompile(`^/users/upload/avatar;([a-z]+)=([^;]+);([a-z]+)=([^;]+)`)] = h.uploadAvatar
 	h.handlers[regexp.MustCompile(`^/users/bio$`)] = h.bio
+	h.handlers[regexp.MustCompile(`^/users/upload/bio;([a-z]+)=([^;]+);([a-z]+)=([^;]+)`)] = h.uploadBio
 	h.handlers[regexp.MustCompile(`^/users/name$`)] = h.name
 	h.handlers[regexp.MustCompile(`^/users/alias$`)] = h.alias
 	h.handlers[regexp.MustCompile(`^/users/move$`)] = h.move
@@ -107,6 +108,12 @@ func NewHandler(domain string, closed bool, cfg *cfg.Config) (Handler, error) {
 	h.handlers[regexp.MustCompile(`^/users/edit/(\S+)`)] = h.edit
 	h.handlers[regexp.MustCompile(`^/users/delete/(\S+)`)] = delete
 
+	h.handlers[regexp.MustCompile(`^/users/upload/dm;([a-z]+)=([^;]+);([a-z]+)=([^;]+)`)] = h.uploadDM
+	h.handlers[regexp.MustCompile(`^/users/upload/whisper;([a-z]+)=([^;]+);([a-z]+)=([^;]+)`)] = h.uploadWhisper
+	h.handlers[regexp.MustCompile(`^/users/upload/say;([a-z]+)=([^;]+);([a-z]+)=([^;]+)`)] = h.uploadSay
+	h.handlers[regexp.MustCompile(`^/users/upload/edit/([^;]+);([a-z]+)=([^;]+);([a-z]+)=([^;]+)`)] = h.editUpload
+	h.handlers[regexp.MustCompile(`^/users/upload/reply/([^;]+);([a-z]+)=([^;]+);([a-z]+)=([^;]+)`)] = h.replyUpload
+
 	h.handlers[regexp.MustCompile(`^/users/resolve$`)] = withUserMenu(h.resolve)
 
 	h.handlers[regexp.MustCompile(`^/users/follow/(\S+)$`)] = withUserMenu(h.follow)

diff --git a/front/input.go b/front/input.go
@@ -0,0 +1,103 @@
+/*
+Copyright 2024 Dima Krasner
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package front
+
+import (
+	"github.com/dimkr/tootik/front/text"
+	"io"
+	"net/url"
+	"strconv"
+)
+
+// inputFunc is a callback that returns user-provided text or false
+type inputFunc func() (string, bool)
+
+func readQuery(w text.Writer, r *request, prompt string) (string, bool) {
+	if r.URL.RawQuery == "" {
+		w.Status(10, prompt)
+		return "", false
+	}
+
+	content, err := url.QueryUnescape(r.URL.RawQuery)
+	if err != nil {
+		w.Status(40, "Bad input")
+		return "", false
+	}
+
+	return content, true
+}
+
+func readBody(w text.Writer, r *request, args []string) (string, bool) {
+	if r.Body == nil {
+		w.Redirect("/users/oops")
+		return "", false
+	}
+
+	var sizeStr, mimeType string
+	if args[1] == "size" && args[3] == "mime" {
+		sizeStr = args[2]
+		mimeType = args[4]
+	} else if args[1] == "mime" && args[3] == "size" {
+		sizeStr = args[4]
+		mimeType = args[2]
+	} else {
+		r.Log.Warn("Invalid parameters")
+		w.Status(40, "Invalid parameters")
+		return "", false
+	}
+
+	if mimeType != "text/plain" {
+		r.Log.Warn("Content type is unsupported", "type", mimeType)
+		w.Status(40, "Only text/plain is supported")
+		return "", false
+	}
+
+	size, err := strconv.ParseInt(sizeStr, 10, 64)
+	if err != nil {
+		r.Log.Warn("Failed to parse content size", "error", err)
+		w.Status(40, "Invalid size")
+		return "", false
+	}
+
+	if size == 0 {
+		r.Log.Warn("Content is empty")
+		w.Status(40, "Content is empty")
+		return "", false
+	}
+
+	if size > int64(r.Handler.Config.MaxPostsLength)*4 {
+		r.Log.Warn("Content is too big", "size", size)
+		w.Status(40, "Content is too big")
+		return "", false
+	}
+
+	buf := make([]byte, size)
+	n, err := io.ReadFull(r.Body, buf)
+	if err != nil {
+		r.Log.Warn("Failed to read content", "error", err)
+		w.Error()
+		return "", false
+	}
+
+	if int64(n) != size {
+		r.Log.Warn("Content is truncated")
+		w.Error()
+		return "", false
+	}
+
+	return string(buf), true
+}
diff --git a/front/menu.go b/front/menu.go
@@ -52,9 +52,7 @@ func writeUserMenu(w text.Writer, user *ap.Actor) {
 	if user == nil {
 		w.Link("/users", "🔑 Sign in")
 	} else {
-		w.Link("/users/dm", "💌 Post to mentioned users")
-		w.Link("/users/whisper", "🔔 Post to followers")
-		w.Link("/users/say", "📣 Post to public")
+		w.Link("/users/post", "📣 New post")
 		w.Link("/users/settings", "⚙️ Settings")
 	}
 

diff --git a/front/post.go b/front/post.go
@@ -25,7 +25,6 @@ import (
 	"github.com/dimkr/tootik/front/text"
 	"github.com/dimkr/tootik/front/text/plain"
 	"github.com/dimkr/tootik/outbox"
-	"net/url"
 	"regexp"
 	"strings"
 	"time"
@@ -43,7 +42,7 @@ var (
 	pollRegex    = regexp.MustCompile(`^\[(?:(?i)POLL)\s+(.+)\s*\]\s*(.+)`)
 )
 
-func (h *Handler) post(w text.Writer, r *request, oldNote *ap.Object, inReplyTo *ap.Object, to ap.Audience, cc ap.Audience, audience, prompt string) {
+func (h *Handler) post(w text.Writer, r *request, oldNote *ap.Object, inReplyTo *ap.Object, to ap.Audience, cc ap.Audience, audience string, readInput inputFunc) {
 	if r.User == nil {
 		w.Redirect("/users")
 		return
@@ -76,14 +75,8 @@ func (h *Handler) post(w text.Writer, r *request, oldNote *ap.Object, inReplyTo
 		}
 	}
 
-	if r.URL.RawQuery == "" {
-		w.Status(10, prompt)
-		return
-	}
-
-	content, err := url.QueryUnescape(r.URL.RawQuery)
-	if err != nil {
-		w.Error()
+	content, ok := readInput()
+	if !ok {
 		return
 	}
 
@@ -228,6 +221,7 @@ func (h *Handler) post(w text.Writer, r *request, oldNote *ap.Object, inReplyTo
 		note.Content = plain.ToHTML(note.Content, note.Tag)
 	}
 
+	var err error
 	if oldNote != nil {
 		note.Published = oldNote.Published
 		note.Updated = &now
@@ -245,5 +239,9 @@ func (h *Handler) post(w text.Writer, r *request, oldNote *ap.Object, inReplyTo
 		return
 	}
 
-	w.Redirectf("/users/view/%s", strings.TrimPrefix(postID, "https://"))
+	if r.URL.Scheme == "titan" {
+		w.Redirectf("gemini://%s/users/view/%s", h.Domain, strings.TrimPrefix(postID, "https://"))
+	} else {
+		w.Redirectf("/users/view/%s", strings.TrimPrefix(postID, "https://"))
+	}
 }
diff --git a/front/print.go b/front/print.go
@@ -411,6 +411,7 @@ func (r *request) PrintNote(w text.Writer, note *ap.Object, author *ap.Actor, sh
 
 		if r.User != nil && note.AttributedTo == r.User.ID && note.Type != ap.Question && note.Name == "" { // polls and votes cannot be edited
 			w.Link("/users/edit/"+strings.TrimPrefix(note.ID, "https://"), "🩹 Edit")
+			w.Link(fmt.Sprintf("titan://%s/users/upload/edit/%s", r.Handler.Domain, strings.TrimPrefix(note.ID, "https://")), "Upload edited post")
 		}
 		if r.User != nil && note.AttributedTo == r.User.ID {
 			w.Link("/users/delete/"+strings.TrimPrefix(note.ID, "https://"), "💣 Delete")
@@ -438,6 +439,7 @@ func (r *request) PrintNote(w text.Writer, note *ap.Object, author *ap.Actor, sh
 
 		if r.User != nil {
 			w.Link("/users/reply/"+strings.TrimPrefix(note.ID, "https://"), "💬 Reply")
+			w.Link(fmt.Sprintf("titan://%s/users/upload/reply/%s", r.Handler.Domain, strings.TrimPrefix(note.ID, "https://")), "Upload reply")
 		}
 	}
 }

diff --git a/front/reply.go b/front/reply.go
@@ -23,7 +23,7 @@ import (
 	"github.com/dimkr/tootik/front/text"
 )
 
-func (h *Handler) reply(w text.Writer, r *request, args ...string) {
+func (h *Handler) doReply(w text.Writer, r *request, args []string, readInput inputFunc) {
 	postID := "https://" + args[1]
 
 	var note ap.Object
@@ -6
6CA5
5,5 +65,17 @@ func (h *Handler) reply(w text.Writer, r *request, args ...string) {
 		})
 	}
 
-	h.post(w, r, nil, &note, to, cc, note.Audience, "Reply content")
+	h.post(w, r, nil, &note, to, cc, note.Audience, readInput)
+}
+
+func (h *Handler) reply(w text.Writer, r *request, args ...string) {
+	h.doReply(w, r, args, func() (string, bool) {
+		return readQuery(w, r, "Reply content")
+	})
+}
+
+func (h *Handler) replyUpload(w text.Writer, r *request, args ...string) {
+	h.doReply(w, r, args, func() (string, bool) {
+		return readBody(w, r, args[1:])
+	})
 }