From 90f9e9b15ce267f7017468774fb7841bb5a9af65 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Feb 2024 19:41:22 +0000
Subject: [PATCH] nopaste: Don't store content with the pastes any more

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/backend/nopaste.py          | 7 -------
 src/templates/nopaste/view.html | 4 ++--
 src/web/nopaste.py              | 8 +-------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/backend/nopaste.py b/src/backend/nopaste.py
index 499aff36..9a508828 100644
--- a/src/backend/nopaste.py
+++ b/src/backend/nopaste.py
@@ -128,13 +128,6 @@ class Nopaste(Object):
 
 		return paste
 
-	def get_content(self, uuid):
-		res = self.db.get("SELECT content FROM nopaste \
-			WHERE uuid = %s", uuid)
-
-		if res:
-			return bytes(res.content)
-
 	def cleanup(self):
 		"""
 			Removes all expired pastes and removes any unneeded blobs
diff --git a/src/templates/nopaste/view.html b/src/templates/nopaste/view.html
index 13b4b73b..3ea1496c 100644
--- a/src/templates/nopaste/view.html
+++ b/src/templates/nopaste/view.html
@@ -30,9 +30,9 @@
 
 	<section class="section">
 		<div class="container">
-			{% if content %}
+			{% if entry.mimetype.startswith("text/") %}
 				<div class="block">
-					{% module Code(content) %}
+					{% module Code(entry.blob) %}
 				</div>
 			{% elif entry.mimetype.startswith("image/") %}
 				<div class="block">
diff --git a/src/web/nopaste.py b/src/web/nopaste.py
index 33d50905..04e6a8a8 100644
--- a/src/web/nopaste.py
+++ b/src/web/nopaste.py
@@ -102,13 +102,7 @@ class ViewHandler(base.AnalyticsMixin, base.BaseHandler):
 			# This has received a view
 			entry.viewed()
 
-		# Fetch the content if the output should be displayed
-		if entry.mimetype.startswith("text/"):
-			content = self.backend.nopaste.get_content(entry.uuid)
-		else:
-			content = None
-
-		self.render("nopaste/view.html", entry=entry, content=content)
+		self.render("nopaste/view.html", entry=entry)
 
 
 class CodeModule(ui_modules.UIModule):
-- 
2.47.2