iou1name/Titivillus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

image posting is better

Browse Source
This commit is contained in:
iou1name 2018-10-11 12:37:29 -04:00
parent af482c7449
commit bf9b928620
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quest/events.py
View File

@ -166,6 +166,7 @@ def text_post(socket, data):
post_text = post_text.replace("\n", "<br>") post_text = post_text.replace("\n", "<br>")
# handle image # handle image
post_text = handle_img(post_text)
p = Post( p = Post(
quest=quest, quest=quest,
@ -367,6 +368,7 @@ def edit_post(socket, data):
post_text = post_text.replace("\n", "<br>") post_text = post_text.replace("\n", "<br>")
# handle image # handle image
post_text = handle_img(post_text)
p.post_text = post_text p.post_text = post_text
p.save() p.save()

4
quest/static/questQM.js
View File

@ -98,6 +98,10 @@ function edit_post(post_id) {
let post = document.getElementById('questPostData-' + post_id); let post = document.getElementById('questPostData-' + post_id);
let post_text = post.innerHTML.trim(); let post_text = post.innerHTML.trim();
post_text = post_text.replace(/<br>/g, '\n'); post_text = post_text.replace(/<br>/g, '\n');
post_text.split('\n').forEach(function(line) {
new_line = line.replace(/<img src="(.*)" title="(.*)">/, '[img title="$2"]$1[/img]');
post_text = post_text.replace(line, new_line);
});
post.innerHTML = '<textarea class="editPostText">' + post_text + '</textarea>'; post.innerHTML = '<textarea class="editPostText">' + post_text + '</textarea>';
post.firstElementChild.style.height = post.firstElementChild.scrollHeight + 'px'; post.firstElementChild.style.height = post.firstElementChild.scrollHeight + 'px';
document.getElementById('savePost-' + post_id).style.display = 'initial'; document.getElementById('savePost-' + post_id).style.display = 'initial';

22
quest/tools.py
View File

@ -30,6 +30,10 @@ def download_img(url):
# TODO: file size limits # TODO: file size limits
# https://stackoverflow.com/questions/22346158/ # https://stackoverflow.com/questions/22346158/
# TODO: prevent overwriting # TODO: prevent overwriting
url = url.replace('..', '')
if url.startswith(settings.IMG_SVR_URL):
if '/' not in url.replace(settings.IMG_SVR_URL, ''):
return url
try: try:
res = requests.get(url) res = requests.get(url)
res.raise_for_status() res.raise_for_status()
@ -60,16 +64,22 @@ def handle_img(text, limit=5):
(unlinked) url will be inserted. (unlinked) url will be inserted.
""" """
# TODO: handle webms # TODO: handle webms
urls = re.findall(r"\[img\](.*?)\[/img\]", text) urls = re.findall(
r"""\[img(?: title=['"](.*)['"])?\](.*)\[\/img\]""",
text.replace('<br', '\n')
)
urls = urls[:limit]
for ext_url in urls: for match_pair in urls:
title, ext_url = match_pair
int_url = download_img(ext_url) int_url = download_img(ext_url)
if int_url in ["INVALID_URL", "INVALID_MIME_TYPE", "UNKNOWN_ERROR"]: if int_url in ["INVALID_URL", "INVALID_MIME_TYPE", "UNKNOWN_ERROR"]:
text = text.replace("[img]" + ext_url + "[/img]", ext_url, 1) text = re.sub(r"\[img.*?\[\/img\]", ext_url, text, 1)
alt_text = os.path.basename(ext_url) if not title:
img_tag = f'<img src="{int_url}" title="{alt_text}">' title = os.path.basename(ext_url)
img_tag = f'<img src="{int_url}" title="{title}">'
text = text.replace("[img]" + ext_url + "[/img]", img_tag, 1) text = re.sub(r"\[img.*?\[\/img\]", img_tag, text, 1)
return text return text