From cbd939f35bf9ee3ddec0016fde7e1be600ae3b72 Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 25 Nov 2022 14:23:15 +0000 Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/fix/strip_html_db' into feature/satspay-server-custom-css" This reverts commit f98278fabaffef1ffacf0b8c84e8c1ca166e8ae8. --- lnbits/db.py | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/lnbits/db.py b/lnbits/db.py index bd42272d..8ae10f72 100644 --- a/lnbits/db.py +++ b/lnbits/db.py @@ -1,7 +1,6 @@ import asyncio import datetime import os -import re import time from contextlib import asynccontextmanager from typing import Optional @@ -74,39 +73,18 @@ class Connection(Compat): query = query.replace("?", "%s") return query - def rewrite_values(self, values): - # strip html - CLEANR = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});") - - def cleanhtml(raw_html): - if isinstance(raw_html, str): - cleantext = re.sub(CLEANR, "", raw_html) - return cleantext - else: - return raw_html - - # tuple to list and back to tuple - values = tuple([cleanhtml(l) for l in list(values)]) - return values - async def fetchall(self, query: str, values: tuple = ()) -> list: - result = await self.conn.execute( - self.rewrite_query(query), self.rewrite_values(values) - ) + result = await self.conn.execute(self.rewrite_query(query), values) return await result.fetchall() async def fetchone(self, query: str, values: tuple = ()): - result = await self.conn.execute( - self.rewrite_query(query), self.rewrite_values(values) - ) + result = await self.conn.execute(self.rewrite_query(query), values) row = await result.fetchone() await result.close() return row async def execute(self, query: str, values: tuple = ()): - return await self.conn.execute( - self.rewrite_query(query), self.rewrite_values(values) - ) + return await self.conn.execute(self.rewrite_query(query), values) class Database(Compat):