dsMerge branch 'frost' of https://github.com/Aevann1/Drama into frost

files/classes/mod_logs.py

@@ -60,6 +60,10 @@ class ModAction(Base):
 			years = int(months / 12)
 			return f"{years}yr ago"
 
+	@property
+	@lazy
+	def created_string(self):
+		return time.strftime('%d %b %Y %H:%M:%S UTC', time.gmtime(self.created_utc))
 
 	@property
 	def note(self):

files/helpers/sanitize.py

@@ -14,7 +14,7 @@ import requests
 
 TLDS = ('ac','ad','ae','aero','af','ag','ai','al','am','an','ao','aq','ar','arpa','as','asia','at','au','aw','ax','az','ba','bb','bd','be','bf','bg','bh','bi','biz','bj','bm','bn','bo','br','bs','bt','bv','bw','by','bz','ca','cafe','cat','cc','cd','cf','cg','ch','ci','ck','cl','club','cm','cn','co','com','coop','cr','cu','cv','cx','cy','cz','de','dj','dk','dm','do','dz','ec','edu','ee','eg','er','es','et','eu','fi','fj','fk','fm','fo','fr','ga','gb','gd','ge','gf','gg','gh','gi','gl','gm','gn','gov','gp','gq','gr','gs','gt','gu','gw','gy','hk','hm','hn','hr','ht','hu','id','ie','il','im','in','info','int','io','iq','ir','is','it','je','jm','jo','jobs','jp','ke','kg','kh','ki','km','kn','kp','kr','kw','ky','kz','la','lb','lc','li','lk','lr','ls','lt','lu','lv','ly','ma','mc','md','me','mg','mh','mil','mk','ml','mm','mn','mo','mobi','mp','mq','mr','ms','mt','mu','museum','mv','mw','mx','my','mz','na','name','nc','ne','net','nf','ng','ni','nl','no','np','nr','nu','nz','om','org','pa','pe','pf','pg','ph','pk','pl','pm','pn','post','pr','pro','ps','pt','pw','py','qa','re','ro','rs','ru','rw','sa','sb','sc','sd','se','sg','sh','si','sj','sk','sl','sm','sn','so','social','sr','ss','st','su','sv','sx','sy','sz','tc','td','tel','tf','tg','th','tj','tk','tl','tm','tn','to','tp','tr','travel','tt','tv','tw','tz','ua','ug','uk','us','uy','uz','va','vc','ve','vg','vi','vn','vu','wf','win','ws','xn','xxx','xyz','ye','yt','yu','za','zm','zw')
 
-allowed_tags = ('b','blockquote','br','code','del','em','h1','h2','h3','h4','h5','h6','hr','i','li','ol','p','pre','strong','sub','sup','table','tbody','th','thead','td','tr','ul','marquee','a','span','ruby','rp','rt','spoiler','img','lite-youtube','video','source')
+allowed_tags = ('b','blockquote','br','code','del','em','h1','h2','h3','h4','h5','h6','hr','i','li','ol','p','pre','strong','sub','sup','table','tbody','th','thead','td','tr','ul','marquee','a','span','ruby','rp','rt','spoiler','img','lite-youtube','video','source','audio')
 
 def allowed_attributes(tag, name, value):
 
@@ -60,6 +60,12 @@ def allowed_attributes(tag, name, value):
 		if name == 'src' and embed_fullmatch_regex.fullmatch(value): return True
 		return False
 
+	if tag == 'audio':
+		if name == 'controls' and value == '': return True
+		if name == 'preload' and value == 'none': return True
+		if name == 'src' and embed_fullmatch_regex.fullmatch(value): return True
+		return False
+
 	if tag == 'p':
 		if name == 'class' and value == 'mb-0': return True
 		return False
@@ -252,7 +258,8 @@ def sanitize(sanitized, alert=False, comment=False, edit=False):
 	if '#factcheck' in sanitized:
 		sanitized = sanitized.replace('#factcheck', '')
 		sanitized += '\n\n<p>' + choice(FACTCHECK_REPLIES) + '</p>'
-		
+
+	sanitized = sanitized.replace('<p></p>', '')
 	sanitized = sanitized.replace('&amp;','&')
 	sanitized = utm_regex.sub('', sanitized)
 	sanitized = utm_regex2.sub('', sanitized)

files/templates/log.html

@@ -106,7 +106,9 @@
 							<span>{{ma.string | safe}}</span>
 						</div>
 
-						<div class="text-gray-500">{{ma.age_string}} <a href="{{ma.permalink}}"><i class="far fa-link ml-1 text-muted"></i></a>
+						<div class="text-gray-500">
+							<span class="log--item-age" title="{{ ma.created_string }}">{{ma.age_string}}</span>
+							<a href="{{ma.permalink}}"><i class="far fa-link ml-1 text-muted"></i></a>
 							<a role="button" class="copy-link" role="button" data-clipboard-text="{{ma.permalink}}"><i class="far fa-copy ml-1 text-muted"></i></a>
 						</div>