Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost

files/assets/emojis.json

@@ -783,6 +783,7 @@
 	{"name":"tracemad","class":"Sets"},
 	{"name":"tracesad","class":"Sets"},
 
+	{"name":"grillcastyes", "tags":["podcast", "chad"],"class":"Misc"},
     {"name":"ivoted", "tags":["democracy", "spider"],"class":"Misc"},
     {"name":"hapyday", "tags":["happyday", "wholesome", "smile"],"class":"Misc"},
     {"name":"froth", "tags":["froth", "seethe", "angry", "ugh", "frothing", "sneed"],"class":"Misc"},

files/helpers/const.py

@@ -1010,8 +1010,7 @@ approved_embed_hosts = {
 	'substackcdn.com',
 	'9gag.com',
 	'ifunny.co',
-	'wixmp.com',
-	'marsey.cat'
+	'wixmp.com'
 	}
 
 

files/helpers/sanitize.py

@@ -446,8 +446,7 @@ def normalize_url(url):
 			 .replace("https://streamable.com/", "https://streamable.com/e/") \
 			 .replace("https://streamable.com/e/e/", "https://streamable.com/e/") \
 			 .replace("https://search.marsey.cat/#", "https://camas.unddit.com/#") \
-			 .replace("https://imgur.com/", "https://i.imgur.com/") \
-			 .replace("https://kiwifarms.net/", "https://kiwifarms.ru/")
+			 .replace("https://imgur.com/", "https://i.imgur.com/")
 
 	url = imgur_regex.sub(r'\1_d.webp?maxwidth=9999&fidelity=high', url)
 	url = giphy_regex.sub(r'\1.webp', url)