skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into mistletoe

Browse source
This commit is contained in:
kek7198 2021-12-04 14:49:46 -06:00
commit ae3b5809b0
6 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
files/assets/js/comments.js
View file

@ -1,6 +1,6 @@
function timestamp(str, ti) { function timestamp(str, ti) {
date = new Date(ti*1000); date = new Date(ti*1000);
document.getElementById(str).title = date.toString(); document.getElementById(str).setAttribute("data-bs-original-title", date.toString());
}; };
function collapse_comment(comment_id) { function collapse_comment(comment_id) {

2
files/assets/js/emoji_modal.js
View file

File diff suppressed because one or more lines are too long

2
files/assets/js/submission_listing.js
View file

@ -1,6 +1,6 @@
function timestamp(str, ti) { function timestamp(str, ti) {
date = new Date(ti*1000); date = new Date(ti*1000);
document.getElementById(str).title = date.toString(); document.getElementById(str).setAttribute("data-bs-original-title", date.toString());
}; };
function expandText(id) { function expandText(id) {

2
files/routes/admin.py
View file

File diff suppressed because one or more lines are too long

4
files/routes/users.py
View file

@ -346,6 +346,8 @@ def message2(v, username):
message = request.values.get("message", "").strip()[:1000].strip() message = request.values.get("message", "").strip()[:1000].strip()
if 'linkedin.com' in message: return {"error": "this domain 'linkedin.com' is banned"}
message = re.sub('!\[\]\((.*?)\)', r'\1', message) message = re.sub('!\[\]\((.*?)\)', r'\1', message)
text_html = Renderer().render(mistletoe.Document(message)) text_html = Renderer().render(mistletoe.Document(message))
@ -402,6 +404,8 @@ def messagereply(v):
message = request.values.get("body", "").strip()[:1000].strip() message = request.values.get("body", "").strip()[:1000].strip()
if 'linkedin.com' in message: return {"error": "this domain 'linkedin.com' is banned"}
message = re.sub('!\[\]\((.*?)\)', r'\1', message) message = re.sub('!\[\]\((.*?)\)', r'\1', message)
id = int(request.values.get("parent_id")) id = int(request.values.get("parent_id"))

2
files/templates/emoji_modal.html
View file

@ -84,7 +84,7 @@
</div> </div>
</div> </div>
<script defer src="/assets/js/emoji_modal.js?v=126"></script> <script defer src="/assets/js/emoji_modal.js?v=128"></script>
<style> <style>
a.emojitab { a.emojitab {