michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-02-02 16:21:32 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

tables in markdown

Browse source
This commit is contained in:
rimu 2024-02-27 04:35:03 +13:00
parent 75c4ece82f
commit 7b8ad6647e
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/main/routes.py
View file

@ -4,6 +4,7 @@ from math import log
from random import randint
import flask
import markdown2
from sqlalchemy.sql.operators import or_, and_
from app import db, cache
@ -21,7 +22,7 @@ from sqlalchemy import select, desc, text
from sqlalchemy_searchable import search
from app.utils import render_template, get_setting, gibberish, request_etag_matches, return_304, blocked_domains, \
ap_datetime, ip_address, retrieve_block_list, shorten_string, markdown_to_text, user_filters_home, \
joined_communities, moderating_communities, parse_page, theme_list, get_request
joined_communities, moderating_communities, parse_page, theme_list, get_request, markdown_to_html, allowlist_html
from app.models import Community, CommunityMember, Post, Site, User, utcnow, Domain, Topic, File, Instance, \
InstanceRole, Notification
from PIL import Image
@ -259,10 +260,18 @@ def list_files(directory):
@bp.route('/test')
def test():
u = User.query.get(1)
send_welcome_email(u, False)
md = '''>dear god the markdown on this site is fucked
| | Q1 | Q2 | Q3 | Q4 |
| --- | --- | --- | --- | --- |
| 2022 | 0.8m | 0.7m | 1.0m | 1.1m |
| 2023 | 0.9m | 0.8m | 1.1m | 1.2m |
| 2024 | 1.0m | | | |
Better?'''
return allowlist_html(markdown2.markdown(md, safe_mode=True, extras={'middle-word-em': False, 'tables': True}))
return ''
users_to_notify = User.query.join(Notification, User.id == Notification.user_id).filter(
User.ap_id == None,
Notification.created_at > User.last_seen,

6
app/utils.py
View file

@ -162,7 +162,7 @@ def allowlist_html(html: str) -> str:
if html is None or html == '':
return ''
allowed_tags = ['p', 'strong', 'a', 'ul', 'ol', 'li', 'em', 'blockquote', 'cite', 'br', 'h3', 'h4', 'h5', 'pre',
'code', 'img', 'details', 'summary']
'code', 'img', 'details', 'summary', 'table', 'tr', 'td', 'th', 'tbody', 'thead']
# Parse the HTML using BeautifulSoup
soup = BeautifulSoup(html, 'html.parser')
@ -201,6 +201,8 @@ def allowlist_html(html: str) -> str:
# Add loading=lazy to images
if tag.name == 'img':
tag.attrs['loading'] = 'lazy'
if tag.name == 'table':
tag.attrs['class'] = 'table'
return str(soup)
@ -242,7 +244,7 @@ def html_to_markdown_worker(element, indent_level=0):
def markdown_to_html(markdown_text) -> str:
if markdown_text:
return allowlist_html(markdown2.markdown(markdown_text, safe_mode=True, extras={'middle-word-em': False}))
return allowlist_html(markdown2.markdown(markdown_text, safe_mode=True, extras={'middle-word-em': False, 'tables': True}))
else:
return ''