Merge branch 'main' into fedtest2

dimkr · Feb 9, 2025 · 04813d9 · 04813d9
2 parents 583db1f + 267dc42
commit 04813d9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/front/handler.go b/front/handler.go
@@ -178,7 +178,11 @@ func (h *Handler) Handle(r *Request, w text.Writer) {
 
 	r.Log.Warn("Received an invalid request")
 
-	if r.User == nil {
+	if r.URL.Scheme == "titan" && r.User == nil {
+		w.Redirectf("gemini://%s/oops", h.Domain)
+	} else if r.URL.Scheme == "titan" && r.User != nil {
+		w.Redirectf("gemini://%s/users/oops", h.Domain)
+	} else if r.User == nil {
 		w.Redirect("/oops")
 	} else {
 		w.Redirect("/users/oops")

diff --git a/front/text/line.go b/front/text/line.go
@@ -52,6 +52,16 @@ func LineBuffered(inner io.Writer) *LineWriter {
 		t := time.NewTicker(flushInterval)
 		defer t.Stop()
 
+		drain := func() {
+			for {
+				select {
+				case <-t.C:
+				default:
+					return
+				}
+			}
+		}
+
 	loop:
 		for {
 			select {
@@ -73,6 +83,7 @@ func LineBuffered(inner io.Writer) *LineWriter {
 					if i == -1 {
 						w.buffer.Write(buf)
 						t.Stop()
+						drain()
 						break
 					}
 
@@ -81,15 +92,16 @@ func LineBuffered(inner io.Writer) *LineWriter {
 
 					// flush if we have $bufferSize lines in the buffer
 					if lines == bufferSize {
+						t.Stop()
+						drain()
+
 						if _, err := w.inner.Write(w.buffer.Bytes()); err != nil {
 							w.stop(err)
 							return
 						}
 
 						w.buffer.Reset()
 						lines = 0
-
-						t.Stop()
 					} else if lines > 0 {
 						t.Reset(flushInterval)
 					}
@@ -105,15 +117,16 @@ func LineBuffered(inner io.Writer) *LineWriter {
 					continue
 				}
 
+				t.Stop()
+				drain()
+
 				if _, err := w.inner.Write(buf); err != nil {
 					w.stop(err)
 					return
 				}
 
 				w.buffer.Reset()
 				lines = 0
-
-				t.Stop()
 			}
 		}