From a53f2d70c880812e9a6e40dcee236d9099d10018 Mon Sep 17 00:00:00 2001 From: ubq323 Date: Sun, 25 Jul 2021 22:49:15 +0000 Subject: add page numbers on forum pages, limit threads displayed to ones on that page --- apioforum/forum.py | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/apioforum/forum.py b/apioforum/forum.py index e03ca01..69a05c5 100644 --- a/apioforum/forum.py +++ b/apioforum/forum.py @@ -3,7 +3,7 @@ from flask import ( Blueprint, render_template, request, - g, redirect, url_for, flash + g, redirect, url_for, flash, abort ) from .db import get_db @@ -11,6 +11,9 @@ from .mdrender import render from sqlite3 import OperationalError import datetime +import math + +THREADS_PER_PAGE = 20 bp = Blueprint("forum", __name__, url_prefix="/") @@ -44,7 +47,10 @@ def forum_path(forum_id): return ancestors @bp.route("/") -def view_forum(forum_id): +@bp.route("//page/") +def view_forum(forum_id,page=1): + if page < 1: + abort(400) db = get_db() forum = db.execute("SELECT * FROM forums WHERE id = ?",(forum_id,)).fetchone() threads = db.execute( @@ -59,8 +65,19 @@ def view_forum(forum_id): INNER JOIN most_recent_posts ON most_recent_posts.thread = threads.id INNER JOIN number_of_posts ON number_of_posts.thread = threads.id WHERE threads.forum = ? - ORDER BY threads.updated DESC; - """,(forum_id,)).fetchall() + ORDER BY threads.updated DESC + LIMIT ? OFFSET ?; + """,( + forum_id, + THREADS_PER_PAGE, + (page-1)*THREADS_PER_PAGE, + )).fetchall() + + # XXX: update this when thread filtering happens + num_threads = db.execute("SELECT count(*) AS count FROM threads WHERE threads.forum = ?",(forum_id,)).fetchone()['count'] + num_pages = math.ceil(num_threads/THREADS_PER_PAGE) + + thread_tags = {} thread_polls = {} -- cgit v1.2.3 From a69e0cc27e41d9b71d23b94cf8bc1421dbba14df Mon Sep 17 00:00:00 2001 From: ubq323 Date: Sun, 25 Jul 2021 22:58:20 +0000 Subject: add page links nav thing --- apioforum/forum.py | 5 +++-- apioforum/templates/view_forum.html | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/apioforum/forum.py b/apioforum/forum.py index 69a05c5..3a5dbe3 100644 --- a/apioforum/forum.py +++ b/apioforum/forum.py @@ -75,8 +75,7 @@ def view_forum(forum_id,page=1): # XXX: update this when thread filtering happens num_threads = db.execute("SELECT count(*) AS count FROM threads WHERE threads.forum = ?",(forum_id,)).fetchone()['count'] - num_pages = math.ceil(num_threads/THREADS_PER_PAGE) - + max_pageno = math.ceil(num_threads/THREADS_PER_PAGE) thread_tags = {} thread_polls = {} @@ -137,6 +136,8 @@ def view_forum(forum_id,page=1): thread_tags=thread_tags, thread_polls=thread_polls, avail_tags=avail_tags, + max_pageno=max_pageno, + page=page, ) @bp.route("//create_thread",methods=("GET","POST")) diff --git a/apioforum/templates/view_forum.html b/apioforum/templates/view_forum.html index 475fdc2..9c3c2c5 100644 --- a/apioforum/templates/view_forum.html +++ b/apioforum/templates/view_forum.html @@ -92,5 +92,19 @@ please log in to create a new thread {%endfor%} + + + + {%endblock%} -- cgit v1.2.3 From 40c337c3133410857b707689eec6d6eaf41951bc Mon Sep 17 00:00:00 2001 From: ubq323 Date: Sun, 25 Jul 2021 23:01:11 +0000 Subject: aria label --- apioforum/templates/base.html | 2 +- apioforum/templates/view_forum.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apioforum/templates/base.html b/apioforum/templates/base.html index ca1dd87..b97117f 100644 --- a/apioforum/templates/base.html +++ b/apioforum/templates/base.html @@ -10,7 +10,7 @@ -

apioforum™

diff --git a/apioforum/templates/view_forum.html b/apioforum/templates/view_forum.html index 9c3c2c5..473753d 100644 --- a/apioforum/templates/view_forum.html +++ b/apioforum/templates/view_forum.html @@ -92,7 +92,7 @@ please log in to create a new thread {%endfor%} -

{% if page > 1 %} << < -- cgit v1.2.3 From c51c87b6d012c2a250054b47e330e1c504aebb4a Mon Sep 17 00:00:00 2001 From: ubq323 Date: Wed, 4 Aug 2021 00:04:15 +0000 Subject: pagination (navbar will be done later) --- apioforum/thread.py | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/apioforum/thread.py b/apioforum/thread.py index 991dc0b..415a45c 100644 --- a/apioforum/thread.py +++ b/apioforum/thread.py @@ -1,6 +1,6 @@ # view posts in thread -import itertools +import itertools, math from flask import ( Blueprint, render_template, abort, request, g, redirect, @@ -11,11 +11,33 @@ from .forum import get_avail_tags bp = Blueprint("thread", __name__, url_prefix="/thread") +POSTS_PER_PAGE = 20 + +def which_page(post_id): + # on which page lieth the post in question? + # forget not that page numbers employeth a system that has a base of 1. + # the + # we need impart the knowledgf e into ourselves pertaining to the + # number of things + # before the thing + # yes + + db = get_db() + # ASSUMES THAT post ids are consecutive and things + # this is probably a reasonable assumption + number_of_things_before_the_thing = db.execute('select count(*) as c from posts where thread = (select thread from posts where id = ?) and id < ?;',(post_id,post_id)).fetchone()['c'] + + return 1+math.floor(number_of_things_before_the_thing/POSTS_PER_PAGE) + + def post_jump(thread_id, post_id): return url_for("thread.view_thread",thread_id=thread_id)+"#post_"+str(post_id) @bp.route("/") -def view_thread(thread_id): +@bp.route("//page/") +def view_thread(thread_id,page=1): + if page < 1: + abort(400) db = get_db() thread = db.execute("SELECT * FROM threads WHERE id = ?;",(thread_id,)).fetchone() if thread is None: @@ -24,8 +46,13 @@ def view_thread(thread_id): posts = db.execute(""" SELECT * FROM posts WHERE posts.thread = ? - ORDER BY created ASC; - """,(thread_id,)).fetchall() + ORDER BY created ASC + LIMIT ? OFFSET ?; + """,( + thread_id, + POSTS_PER_PAGE, + (page-1)*POSTS_PER_PAGE, + )).fetchall() tags = db.execute( """SELECT tags.* FROM tags INNER JOIN thread_tags ON thread_tags.tag = tags.id -- cgit v1.2.3 From af27d6578a0dd75229f89b9c64992aec0cd19b4c Mon Sep 17 00:00:00 2001 From: ubq323 Date: Thu, 19 Aug 2021 02:13:36 +0000 Subject: navbar --- apioforum/templates/view_thread.html | 11 +++++++++++ apioforum/thread.py | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/apioforum/templates/view_thread.html b/apioforum/templates/view_thread.html index 132fd44..11d21e4 100644 --- a/apioforum/templates/view_thread.html +++ b/apioforum/templates/view_thread.html @@ -69,6 +69,17 @@ {% endif %} {% endfor %} + {% if g.user and has_permission(thread.forum, g.user, "p_reply_threads") %} diff --git a/apioforum/thread.py b/apioforum/thread.py index b281d0a..0b12141 100644 --- a/apioforum/thread.py +++ b/apioforum/thread.py @@ -55,6 +55,10 @@ def view_thread(thread_id,page=1): POSTS_PER_PAGE, (page-1)*POSTS_PER_PAGE, )).fetchall() + + num_posts = db.execute("SELECT count(*) as count FROM posts WHERE posts.thread = ?",(thread_id,)).fetchone()['count'] + max_pageno = math.ceil(num_posts/POSTS_PER_PAGE) + tags = db.execute( """SELECT tags.* FROM tags INNER JOIN thread_tags ON thread_tags.tag = tags.id @@ -99,6 +103,8 @@ def view_thread(thread_id,page=1): poll=poll, votes=votes, has_voted=has_voted, + page=page, + max_pageno=max_pageno, ) def register_vote(thread,pollval): -- cgit v1.2.3 From 04419408ad669f9093149697bf9abb7591d29b23 Mon Sep 17 00:00:00 2001 From: ubq323 Date: Thu, 19 Aug 2021 23:38:06 +0000 Subject: database for webhooks --- apioforum/db.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apioforum/db.py b/apioforum/db.py index c0c8c7e..e0d9056 100644 --- a/apioforum/db.py +++ b/apioforum/db.py @@ -206,9 +206,18 @@ ALTER TABLE forums ADD COLUMN unlisted NOT NULL DEFAULT 0; """, """ ALTER TABLE role_config ADD COLUMN p_view_forum INT NOT NULL DEFAULT 1; +""", """ +CREATE TABLE webhooks ( + id INTEGER PRIMARY KEY, + type TEXT NOT NULL, + url TEXT NOT NULL, + forum INTEGER NOT NULL REFERENCES forums(id), + inherits INTEGER NOT NULL DEFAULT 0 +);""", ] + def init_db(): db = get_db() version = db.execute("PRAGMA user_version;").fetchone()[0] -- cgit v1.2.3 From d7db0af8f7ce9e608180047bbbdc4fe9dd624f50 Mon Sep 17 00:00:00 2001 From: ubq323 Date: Fri, 20 Aug 2021 01:48:50 +0000 Subject: pagination and links and things (probably not complete) --- apioforum/__init__.py | 1 + apioforum/templates/view_forum.html | 4 ++-- apioforum/templates/view_post.html | 2 +- apioforum/thread.py | 24 ++++++++++++++++-------- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/apioforum/__init__.py b/apioforum/__init__.py index 087df81..60777fb 100644 --- a/apioforum/__init__.py +++ b/apioforum/__init__.py @@ -54,6 +54,7 @@ def create_app(): return dict(path_for_next=p) app.jinja_env.globals.update(forum_path=forum.forum_path) + app.jinja_env.globals.update(post_jump=thread.post_jump) from .roles import has_permission, is_bureaucrat, get_user_role app.jinja_env.globals.update( has_permission=has_permission, diff --git a/apioforum/templates/view_forum.html b/apioforum/templates/view_forum.html index dec9234..a5e444e 100644 --- a/apioforum/templates/view_forum.html +++ b/apioforum/templates/view_forum.html @@ -112,7 +112,7 @@ you do not have permission to create threads in this forum {{ ts(thread.mrp_created) }} - + {{ thread.mrp_content[:500]|e }} @@ -120,7 +120,7 @@ you do not have permission to create threads in this forum {% else %}

+ href="{{post_jump(thread.mrp_id)}}"> latest post

diff --git a/apioforum/templates/view_post.html b/apioforum/templates/view_post.html index 993c005..fcaf29b 100644 --- a/apioforum/templates/view_post.html +++ b/apioforum/templates/view_post.html @@ -8,5 +8,5 @@ {{disp_post(post,False)}}

post source:

{{post.content}}

-i am satisfied +i am satisfied {% endblock %} diff --git a/apioforum/thread.py b/apioforum/thread.py index 0b12141..f3bcc59 100644 --- a/apioforum/thread.py +++ b/apioforum/thread.py @@ -14,7 +14,7 @@ bp = Blueprint("thread", __name__, url_prefix="/thread") POSTS_PER_PAGE = 20 -def which_page(post_id): +def which_page(post_id,return_thread_id=False): # on which page lieth the post in question? # forget not that page numbers employeth a system that has a base of 1. # the @@ -25,14 +25,22 @@ def which_page(post_id): db = get_db() # ASSUMES THAT post ids are consecutive and things - # this is probably a reasonable assumption - number_of_things_before_the_thing = db.execute('select count(*) as c from posts where thread = (select thread from posts where id = ?) and id < ?;',(post_id,post_id)).fetchone()['c'] + # this is probably a reasonable assumption + + thread_id = db.execute('select thread from posts where id = ?',(post_id,)).fetchone()['thread'] - return 1+math.floor(number_of_things_before_the_thing/POSTS_PER_PAGE) + number_of_things_before_the_thing = db.execute('select count(*) as c, thread as t from posts where thread = ? and id < ?;',(thread_id,post_id)).fetchone()['c'] + + page = 1+math.floor(number_of_things_before_the_thing/POSTS_PER_PAGE) + if return_thread_id: + return page, thread_id + else: + return page -def post_jump(thread_id, post_id): - return url_for("thread.view_thread",thread_id=thread_id)+"#post_"+str(post_id) +def post_jump(post_id): + page,thread_id=which_page(post_id,True) + return url_for("thread.view_thread",thread_id=thread_id,page=page)+"#post_"+str(post_id) @bp.route("/") @bp.route("//page/") @@ -248,7 +256,7 @@ def create_post(thread_id): ) db.commit() flash("post posted postfully") - return redirect(post_jump(thread_id, post_id)) + return redirect(post_jump(post_id)) return redirect(url_for('thread.view_thread',thread_id=thread_id)) @bp.route("/delete_post/", methods=["GET","POST"]) @@ -320,7 +328,7 @@ def edit_post(post_id): "UPDATE posts SET content = ?, edited = 1, updated = current_timestamp WHERE id = ?",(newcontent,post_id)) db.commit() flash("post edited editiously") - return redirect(post_jump(post['thread'],post_id)) + return redirect(post_jump(post_id)) else: flash(err) return render_template("edit_post.html",post=post) -- cgit v1.2.3 From 510ecff54b74ab98bd8d8efcd0a3c1a99e979fb0 Mon Sep 17 00:00:00 2001 From: ubq323 Date: Sun, 22 Aug 2021 15:52:23 +0000 Subject: move navbar to common macro, post_jump function --- apioforum/templates/common.html | 20 +++++++++++++++----- apioforum/templates/view_forum.html | 16 +++------------- apioforum/templates/view_thread.html | 14 ++------------ 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/apioforum/templates/common.html b/apioforum/templates/common.html index f6b6f29..8eeef70 100644 --- a/apioforum/templates/common.html +++ b/apioforum/templates/common.html @@ -2,10 +2,6 @@ {{username}} {%- endmacro %} -{% macro post_url(post) -%} - {{url_for('thread.view_thread', thread_id=post.thread)}}#post_{{post.id}} -{%- endmacro %} - {% macro disp_post(post, buttons=False, forum=None, footer=None) %}

@@ -49,7 +45,7 @@ href="{{url_for('thread.view_post',post_id=post.id)}}">src {% endif %} - #{{post.id}} + #{{post.id}}

@@ -142,3 +138,17 @@ {% endmacro %} + +{% macro pagination_nav(page,max_pageno,view) %} + +{% endmacro %} diff --git a/apioforum/templates/view_forum.html b/apioforum/templates/view_forum.html index a5e444e..75144c8 100644 --- a/apioforum/templates/view_forum.html +++ b/apioforum/templates/view_forum.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% from 'common.html' import ts, tag, disp_user, post_url, forum_breadcrumb, ab, vote_meter %} +{% from 'common.html' import ts, tag, disp_user, post_url, forum_breadcrumb, ab, vote_meter, pagination_nav %} {% block header %}

{% block title %}{{forum.name}}{% endblock %} #{{forum.id}}

{% if forum.id != 1 %} @@ -133,18 +133,8 @@ you do not have permission to create threads in this forum

{%endfor%}

- - +{{ pagination_nav(page,max_pageno,'forum.view_forum',forum_id=forum.id) }} + {% else %}

you do not have permission to view threads in this forum

diff --git a/apioforum/templates/view_thread.html b/apioforum/templates/view_thread.html index 11d21e4..fe22cfc 100644 --- a/apioforum/templates/view_thread.html +++ b/apioforum/templates/view_thread.html @@ -1,4 +1,4 @@ -{% from 'common.html' import disp_post,tag,thread_breadcrumb,vote_meter %} +{% from 'common.html' import disp_post,tag,thread_breadcrumb,vote_meter,pagination_nav %} {% extends 'base.html' %} {% block header %}

{%block title %}{{thread.title}}{% endblock %} #{{thread.id}}

@@ -69,17 +69,7 @@ {% endif %} {% endfor %} - +{{ pagination_nav(page,max_pageno,'thread.view_thread',thread_id=thread.id) }} {% if g.user and has_permission(thread.forum, g.user, "p_reply_threads") %} -- cgit v1.2.3 From 23c5ed30f115c8ee8cb9bf16441c30e0a0e61403 Mon Sep 17 00:00:00 2001 From: ubq323 Date: Thu, 26 Aug 2021 01:01:15 +0000 Subject: web hook code, and things --- apioforum/forum.py | 4 ++ apioforum/thread.py | 7 ++- apioforum/webhooks.py | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 apioforum/webhooks.py diff --git a/apioforum/forum.py b/apioforum/forum.py index 87d4022..3d7611b 100644 --- a/apioforum/forum.py +++ b/apioforum/forum.py @@ -225,6 +225,10 @@ def create_thread(forum): (thread_id,g.user,content) ) db.commit() + + from . import webhooks + thread = db.execute("select * from threads where id = ?",(thread_id,)).fetchone() + webhooks.do_webhooks_thread(forum['id'],thread) return redirect(url_for('thread.view_thread',thread_id=thread_id)) flash(err) diff --git a/apioforum/thread.py b/apioforum/thread.py index f3bcc59..05abce2 100644 --- a/apioforum/thread.py +++ b/apioforum/thread.py @@ -8,6 +8,7 @@ from flask import ( ) from .db import get_db from .roles import has_permission +from . import webhooks from .forum import get_avail_tags bp = Blueprint("thread", __name__, url_prefix="/thread") @@ -38,9 +39,9 @@ def which_page(post_id,return_thread_id=False): else: return page -def post_jump(post_id): +def post_jump(post_id,*,external=False): page,thread_id=which_page(post_id,True) - return url_for("thread.view_thread",thread_id=thread_id,page=page)+"#post_"+str(post_id) + return url_for("thread.view_thread",thread_id=thread_id,page=page,_external=external)+"#post_"+str(post_id) @bp.route("/") @bp.route("//page/") @@ -255,6 +256,8 @@ def create_post(thread_id): (thread_id,) ) db.commit() + post = db.execute("select * from posts where id = ?",(post_id,)).fetchone() + webhooks.do_webhooks_post(thread['forum'],post) flash("post posted postfully") return redirect(post_jump(post_id)) return redirect(url_for('thread.view_thread',thread_id=thread_id)) diff --git a/apioforum/webhooks.py b/apioforum/webhooks.py new file mode 100644 index 0000000..671100c --- /dev/null +++ b/apioforum/webhooks.py @@ -0,0 +1,123 @@ +import urllib +import json +from .db import get_db +from flask import url_for, flash + +def abridge_post(text): + MAXLEN = 20 + if len(text) > MAXLEN+3: + return text[:MAXLEN]+"..." + else: + return text + +def send_discord_webhook(url,payload): + headers = { + "User-Agent":"apioforum (https://f.gh0.pw/apioforum/, v0.0)", + "Content-Type":"application/json", + } + req = urllib.request.Request( + url, + json.dumps(payload).encode("utf-8"), + headers + ) + # todo: read response and things + urllib.request.urlopen(req) + #try: + # res = urllib.request.urlopen(req) + #except urllib.error.HTTPError as e: + # print(f"error {e.code} {e.read()}") + #else: + # print(f"succ {res.read()}") + +# todo: object oriented thing for different kinds of webhook (not just discord) + +def f(name,value): + # discord embed field + return {"name":name,"value":value,"inline":True} + +def discord_on_new_thread(wh_url, thread): + db = get_db() + forum = db.execute("select * from forums where id = ?",(thread['forum'],)).fetchone() + username = thread['creator'] + userpage = url_for('user.view_user',username=username,_external=True) + + forumpage = url_for('forum.view_forum',forum_id=forum['id'],_external=True) + + post = db.execute("select * from posts where thread = ? order by id asc limit 1",(thread['id'],)).fetchone() + + + payload = { + "username":"apioforum", + "avatar_url":"https://d.gh0.pw/lib/exe/fetch.php?media=wiki:logo.png", + "embeds":[ + { + "title":thread['title'], + "description":abridge_post(post['content']), + "url": url_for('thread.view_thread',thread_id=thread['id'],_external=True), + "color": 0xff00ff, + "fields":[ + f('author',f"[{username}]({userpage})"), + f('forum',f"[{forum['name']}]({forumpage})"), + ], + "footer":{ + "text":thread['created'].isoformat(' '), + }, + }, + ], + } + send_discord_webhook(wh_url,payload) + +def discord_on_new_post(wh_url, post): + from .thread import post_jump + db = get_db() + + thread = db.execute("select * from threads where id = ?",(post['thread'],)).fetchone() + threadpage = url_for('thread.view_thread',thread_id=thread['id'],_external=True) + + forum = db.execute("select * from forums where id = ?",(thread['forum'],)).fetchone() + forumpage = url_for('forum.view_forum',forum_id=forum['id'],_external=True) + + username = post['author'] + userpage = url_for('user.view_user',username=username,_external=True) + + payload = { + "username":"apioforum", + "avatar_url":"https://d.gh0.pw/lib/exe/fetch.php?media=wiki:logo.png", + "embeds":[ + { + "title":"re: "+thread['title'], + "description":abridge_post(post['content']), + "url": post_jump(post['id'],external=True), + "color": 0x00ffff, + "fields":[ + f('author',f"[{username}]({userpage})"), + f('thread',f"[{thread['title']}]({threadpage})"), + f('forum',f"[{forum['name']}]({forumpage})"), + ], + "footer":{ + "text":post['created'].isoformat(' '), + }, + }, + ], + } + send_discord_webhook(wh_url,payload) + +def _do_webhooks(forum_id,thing,fn): + db = get_db() + # todo inheritance + webhooks = db.execute("select * from webhooks where forum = ? and type = 'discord'",(forum_id,)).fetchall() + for wh in webhooks: + wh_url = wh['url'] + try: + fn(wh_url,thing) + except: + pass # handle probably + flash(f"wh {wh['id']}") + +def do_webhooks_thread(forum_id,thread): + _do_webhooks(forum_id,thread,discord_on_new_thread) + +def do_webhooks_post(forum_id,post): + _do_webhooks(forum_id,post,discord_on_new_post) + + -- cgit v1.2.3 From 4e2fadd8866f61a22fac3f862789f22b705035c6 Mon Sep 17 00:00:00 2001 From: ubq323 Date: Thu, 26 Aug 2021 01:17:55 +0000 Subject: webhook inheritance --- apioforum/webhooks.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/apioforum/webhooks.py b/apioforum/webhooks.py index 671100c..2407039 100644 --- a/apioforum/webhooks.py +++ b/apioforum/webhooks.py @@ -105,7 +105,18 @@ def discord_on_new_post(wh_url, post): def _do_webhooks(forum_id,thing,fn): db = get_db() # todo inheritance - webhooks = db.execute("select * from webhooks where forum = ? and type = 'discord'",(forum_id,)).fetchall() + webhooks = db.execute(""" + WITH RECURSIVE fs AS + (SELECT * FROM forums WHERE id = ? + UNION ALL + SELECT forums.* FROM forums, fs WHERE fs.parent=forums.id) + SELECT * from webhooks + WHERE + webhooks.forum = ? + OR + webhooks.inherits AND webhooks.forum IN (SELECT id FROM fS); + + """,(forum_id,forum_id)).fetchall() for wh in webhooks: wh_url = wh['url'] try: -- cgit v1.2.3 From b08eb8d07f57cd5606e4b4867ad0e86c75a7311f Mon Sep 17 00:00:00 2001 From: aouwt <74026992+aouwt@users.noreply.github.com> Date: Mon, 10 Jan 2022 19:36:06 -0500 Subject: tidy up pagination bar --- apioforum/static/style.css | 4 ++++ apioforum/templates/common.html | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apioforum/static/style.css b/apioforum/static/style.css index 280749b..342db6c 100644 --- a/apioforum/static/style.css +++ b/apioforum/static/style.css @@ -116,6 +116,10 @@ nav#navbar p:first-of-type { margin-left:0.5em } nav#navbar a { color: blue; text-decoration: none } nav#navbar .links { display: flex; } +nav#pages { text-align: center; margin-top: 2vh; margin-bottom: 2vh; } +nav#pages a { margin-left: 2vw; margin-right: 2vw; } +nav#pages .mid { margin-left: 5vw; margin-right: 5vw; } + /* todo: make the navbar less bad */ .flashmsg { border: 1px solid black; background-color: yellow; max-width: max-content; padding: 5px; clear: both;} diff --git a/apioforum/templates/common.html b/apioforum/templates/common.html index 8eeef70..638c423 100644 --- a/apioforum/templates/common.html +++ b/apioforum/templates/common.html @@ -142,13 +142,13 @@ {% macro pagination_nav(page,max_pageno,view) %} {% endmacro %} -- cgit v1.2.3 From 53361d4c4880e76a6f1d1b3ebe009422dd5438fc Mon Sep 17 00:00:00 2001 From: ubq323 Date: Tue, 11 Jan 2022 21:05:23 +0000 Subject: refactor webhooks code --- apioforum/db.py | 3 +- apioforum/webhooks.py | 241 +++++++++++++++++++++++++++----------------------- 2 files changed, 131 insertions(+), 113 deletions(-) diff --git a/apioforum/db.py b/apioforum/db.py index e0d9056..269bd77 100644 --- a/apioforum/db.py +++ b/apioforum/db.py @@ -212,8 +212,7 @@ CREATE TABLE webhooks ( id INTEGER PRIMARY KEY, type TEXT NOT NULL, url TEXT NOT NULL, - forum INTEGER NOT NULL REFERENCES forums(id), - inherits INTEGER NOT NULL DEFAULT 0 + forum INTEGER NOT NULL REFERENCES forums(id) );""", ] diff --git a/apioforum/webhooks.py b/apioforum/webhooks.py index 2407039..01f539e 100644 --- a/apioforum/webhooks.py +++ b/apioforum/webhooks.py @@ -1,4 +1,5 @@ import urllib +import abc import json from .db import get_db from flask import url_for, flash @@ -10,125 +11,143 @@ def abridge_post(text): else: return text -def send_discord_webhook(url,payload): - headers = { - "User-Agent":"apioforum (https://f.gh0.pw/apioforum/, v0.0)", - "Content-Type":"application/json", - } - req = urllib.request.Request( - url, - json.dumps(payload).encode("utf-8"), - headers - ) - # todo: read response and things - urllib.request.urlopen(req) - #try: - # res = urllib.request.urlopen(req) - #except urllib.error.HTTPError as e: - # print(f"error {e.code} {e.read()}") - #else: - # print(f"succ {res.read()}") - -# todo: object oriented thing for different kinds of webhook (not just discord) - -def f(name,value): - # discord embed field - return {"name":name,"value":value,"inline":True} +webhook_types = {} +def webhook_type(t): + def inner(cls): + webhook_types[t] = cls + return cls + return inner -def discord_on_new_thread(wh_url, thread): - db = get_db() - forum = db.execute("select * from forums where id = ?",(thread['forum'],)).fetchone() - username = thread['creator'] - userpage = url_for('user.view_user',username=username,_external=True) +class WebhookType(abc.ABC): + def __init__(self, url): + self.url = url - forumpage = url_for('forum.view_forum',forum_id=forum['id'],_external=True) + @abc.abstractmethod + def on_new_thread(self,thread): + pass + @abc.abstractmethod + def on_new_post(self,post): + pass - post = db.execute("select * from posts where thread = ? order by id asc limit 1",(thread['id'],)).fetchone() - - - payload = { - "username":"apioforum", - "avatar_url":"https://d.gh0.pw/lib/exe/fetch.php?media=wiki:logo.png", - "embeds":[ - { - "title":thread['title'], - "description":abridge_post(post['content']), - "url": url_for('thread.view_thread',thread_id=thread['id'],_external=True), - "color": 0xff00ff, - "fields":[ - f('author',f"[{username}]({userpage})"), - f('forum',f"[{forum['name']}]({forumpage})"), - ], - "footer":{ - "text":thread['created'].isoformat(' '), - }, - }, - ], - } - send_discord_webhook(wh_url,payload) - -def discord_on_new_post(wh_url, post): - from .thread import post_jump +def get_webhooks(forum_id): db = get_db() + # todo inheritance (if needed) + webhooks = db.execute("select * from webhooks where webhooks.forum = ?;",(forum_id,)).fetchall() - thread = db.execute("select * from threads where id = ?",(post['thread'],)).fetchone() - threadpage = url_for('thread.view_thread',thread_id=thread['id'],_external=True) - - forum = db.execute("select * from forums where id = ?",(thread['forum'],)).fetchone() - forumpage = url_for('forum.view_forum',forum_id=forum['id'],_external=True) - - username = post['author'] - userpage = url_for('user.view_user',username=username,_external=True) - - payload = { - "username":"apioforum", - "avatar_url":"https://d.gh0.pw/lib/exe/fetch.php?media=wiki:logo.png", - "embeds":[ - { - "title":"re: "+thread['title'], - "description":abridge_post(post['content']), - "url": post_jump(post['id'],external=True), - "color": 0x00ffff, - "fields":[ - f('author',f"[{username}]({userpage})"), - f('thread',f"[{thread['title']}]({threadpage})"), - f('forum',f"[{forum['name']}]({forumpage})"), - ], - "footer":{ - "text":post['created'].isoformat(' '), - }, - }, - ], - } - send_discord_webhook(wh_url,payload) - -def _do_webhooks(forum_id,thing,fn): - db = get_db() - # todo inheritance - webhooks = db.execute(""" - WITH RECURSIVE fs AS - (SELECT * FROM forums WHERE id = ? - UNION ALL - SELECT forums.* FROM forums, fs WHERE fs.parent=forums.id) - SELECT * from webhooks - WHERE - webhooks.forum = ? - OR - webhooks.inherits AND webhooks.forum IN (SELECT id FROM fS); - - """,(forum_id,forum_id)).fetchall() for wh in webhooks: + wh_type = wh['type'] + if wh_type not in webhook_types: + print(f"unknown webhook type {wh_type}") + continue wh_url = wh['url'] - try: - fn(wh_url,thing) - except: - pass # handle probably - flash(f"wh {wh['id']}") + wo = webhook_types[wh_type](wh_url) + yield wo def do_webhooks_thread(forum_id,thread): - _do_webhooks(forum_id,thread,discord_on_new_thread) - + for wh in get_webhooks(forum_id): + wh.on_new_thread(thread) def do_webhooks_post(forum_id,post): - _do_webhooks(forum_id,post,discord_on_new_post) - + for wh in get_webhooks(forum_id): + wh.on_new_post(post) + +@webhook_type("fake") +class FakeWebhook(WebhookType): + def on_new_post(self, post): + print(f'fake wh {self.url} post {post["id"]}') + def on_new_thread(self, thread): + print(f'fake wh {self.url} thread {thread["id"]}') + +@webhook_type("discord") +class DiscordWebhook(WebhookType): + def send(self,payload): + headers = { + "User-Agent":"apioforum (https://g.gh0.pw/apioforum, v0.0)", + "Content-Type":"application/json", + } + req = urllib.request.Request( + self.url, + json.dumps(payload).encode("utf-8"), + headers + ) + # todo: read response and things + urllib.request.urlopen(req) + #try: + # res = urllib.request.urlopen(req) + #except urllib.error.HTTPError as e: + # print(f"error {e.code} {e.read()}") + #else: + # print(f"succ {res.read()}") + + @staticmethod + def field(name,value): + return {"name":name,"value":value,"inline":True} + + def on_new_thread(self,thread): + f = self.field + db = get_db() + forum = db.execute("select * from forums where id = ?",(thread['forum'],)).fetchone() + username = thread['creator'] + userpage = url_for('user.view_user',username=username,_external=True) + + forumpage = url_for('forum.view_forum',forum_id=forum['id'],_external=True) + + post = db.execute("select * from posts where thread = ? order by id asc limit 1",(thread['id'],)).fetchone() + + payload = { + "username":"apioforum", + "avatar_url":"https://d.gh0.pw/lib/exe/fetch.php?media=wiki:logo.png", + "embeds":[ + { + "title":"new thread: "+thread['title'], + "description":abridge_post(post['content']), + "url": url_for('thread.view_thread',thread_id=thread['id'],_external=True), + "color": 0xff00ff, + "fields":[ + f('author',f"[{username}]({userpage})"), + f('forum',f"[{forum['name']}]({forumpage})"), + ], + "footer":{ + "text":thread['created'].isoformat(' '), + }, + }, + ], + } + self.send(payload) + + def on_new_post(self,post): + from .thread import post_jump + f = self.field + db = get_db() + + thread = db.execute("select * from threads where id = ?",(post['thread'],)).fetchone() + threadpage = url_for('thread.view_thread',thread_id=thread['id'],_external=True) + + forum = db.execute("select * from forums where id = ?",(thread['forum'],)).fetchone() + forumpage = url_for('forum.view_forum',forum_id=forum['id'],_external=True) + + username = post['author'] + userpage = url_for('user.view_user',username=username,_external=True) + + payload = { + "username":"apioforum", + "avatar_url":"https://d.gh0.pw/lib/exe/fetch.php?media=wiki:logo.png", + "embeds":[ + { + "title":"re: "+thread['title'], + "description":abridge_post(post['content']), + "url": post_jump(post['id'],external=True), + "color": 0x00ffff, + "fields":[ + f('author',f"[{username}]({userpage})"), + f('thread',f"[{thread['title']}]({threadpage})"), + f('forum',f"[{forum['name']}]({forumpage})"), + ], + "footer":{ + "text":post['created'].isoformat(' '), + }, + }, + ], + } + self.send(payload) + -- cgit v1.2.3