From 460e0ac02251a9078c70f06fa0e48fc3d8adf629 Mon Sep 17 00:00:00 2001
From: Leonora Tindall <nora@nora.codes>
Date: Mon, 31 Jan 2022 20:49:05 -0600
Subject: [PATCH] Redirect on invalid UTF-8 in /p/

Previously, uploading a paste with invalid UTF-8 and then viewing it
with the pretty URL would cause a panic.
With this change, it simply redirects to the raw URL.
---
 src/models/maybe_redirect.rs | 20 ++++++++++++++++++++
 src/models/mod.rs            |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 src/models/maybe_redirect.rs

diff --git a/src/models/maybe_redirect.rs b/src/models/maybe_redirect.rs
new file mode 100644
index 0000000..91ff7f9
--- /dev/null
+++ b/src/models/maybe_redirect.rs
@@ -0,0 +1,20 @@
+use rocket::{response::Redirect, Responder};
+use rocket_dyn_templates::Template;
+
+#[derive(Responder)]
+pub enum MaybeRedirect {
+    Redirect(Redirect),
+    Template(Template),
+}
+
+impl From<Redirect> for MaybeRedirect {
+    fn from(other: Redirect) -> Self {
+        Self::Redirect(other)
+    }
+}
+
+impl From<Template> for MaybeRedirect {
+    fn from(other: Template) -> Self {
+        Self::Template(other)
+    }
+}
diff --git a/src/models/mod.rs b/src/models/mod.rs
index 20dae4b..eb7780a 100644
--- a/src/models/mod.rs
+++ b/src/models/mod.rs
@@ -1,3 +1,4 @@
+pub mod maybe_redirect;
 pub mod paste_id;
 pub mod pretty;
 pub mod pretty_syntax;