From 2a7a3c6167dfaacd9a78d8e1decb2c29a5f77c35 Mon Sep 17 00:00:00 2001 From: MariosK1574 Date: Mon, 1 Jul 2024 14:25:04 +0300 Subject: [PATCH] Modify the report functionality --- .../setup/users-service/blueprints/posts.py | 18 +++++++++-- .../users-service/templates/add_post.html | 2 +- .../setup/users-service/templates/post.html | 30 ++++++++++--------- .../setup/users-service/templates/posts.html | 2 +- .../{report_url.html => report_post.html} | 27 +++++++---------- 5 files changed, 43 insertions(+), 36 deletions(-) rename web/xanadus-scripted-symphony/setup/users-service/templates/{report_url.html => report_post.html} (68%) diff --git a/web/xanadus-scripted-symphony/setup/users-service/blueprints/posts.py b/web/xanadus-scripted-symphony/setup/users-service/blueprints/posts.py index 2843107..cd07957 100644 --- a/web/xanadus-scripted-symphony/setup/users-service/blueprints/posts.py +++ b/web/xanadus-scripted-symphony/setup/users-service/blueprints/posts.py @@ -70,11 +70,23 @@ def show_post(post_id): @login_required def report_post(): if request.method == 'POST': - url = request.form['url'] + post_id = request.form['postId'] + valid_id = True + + try: + post_id = int(post_id) + except: + valid_id = False + + if not post_id or valid_id == False: + return render_template('report_post.html', error_message="Please provide a valid post ID.") + + + url = f"http://users-service:5000/posts/{post_id}" requests.get(f"http://admin-bot-service:3000/report?url={url}") - return render_template('report_url.html', success_message="The admin will visit your URL soon.") + return render_template('report_post.html', success_message="The admin will visit your post soon.") - return render_template('report_url.html') \ No newline at end of file + return render_template('report_post.html') \ No newline at end of file diff --git a/web/xanadus-scripted-symphony/setup/users-service/templates/add_post.html b/web/xanadus-scripted-symphony/setup/users-service/templates/add_post.html index 4afd824..11d61e5 100644 --- a/web/xanadus-scripted-symphony/setup/users-service/templates/add_post.html +++ b/web/xanadus-scripted-symphony/setup/users-service/templates/add_post.html @@ -50,7 +50,7 @@

Add New Post

Log Out - Report URL + Report Post My Posts
diff --git a/web/xanadus-scripted-symphony/setup/users-service/templates/post.html b/web/xanadus-scripted-symphony/setup/users-service/templates/post.html index 11b140a..3a625ec 100644 --- a/web/xanadus-scripted-symphony/setup/users-service/templates/post.html +++ b/web/xanadus-scripted-symphony/setup/users-service/templates/post.html @@ -23,6 +23,21 @@

{{ post.title }}

+ + +
@@ -32,26 +47,13 @@

{{ post.title }}

{{ post.title }}

{{ post.content | safe}}

Posted by {{ user.username }}

+

Post ID: {{ post.id }}

- - diff --git a/web/xanadus-scripted-symphony/setup/users-service/templates/posts.html b/web/xanadus-scripted-symphony/setup/users-service/templates/posts.html index f810209..ef58537 100644 --- a/web/xanadus-scripted-symphony/setup/users-service/templates/posts.html +++ b/web/xanadus-scripted-symphony/setup/users-service/templates/posts.html @@ -36,7 +36,7 @@

My Posts

Log Out - Report URL + Report Post Add Post
diff --git a/web/xanadus-scripted-symphony/setup/users-service/templates/report_url.html b/web/xanadus-scripted-symphony/setup/users-service/templates/report_post.html similarity index 68% rename from web/xanadus-scripted-symphony/setup/users-service/templates/report_url.html rename to web/xanadus-scripted-symphony/setup/users-service/templates/report_post.html index f82aacd..77d9bc2 100644 --- a/web/xanadus-scripted-symphony/setup/users-service/templates/report_url.html +++ b/web/xanadus-scripted-symphony/setup/users-service/templates/report_post.html @@ -3,7 +3,7 @@ - Report URL + Report Post