From be24a37f5cd911c4e10e7aa4bcf27ecbe519982f Mon Sep 17 00:00:00 2001 From: Yusur Princeps Date: Thu, 6 Nov 2025 06:36:02 +0100 Subject: [PATCH 1/4] move old migrations away from project root --- migrate_0_4_to_0_5.py => src/old_migrations/migrate_0_4_to_0_5.py | 0 migrate_0_6_to_0_7.py => src/old_migrations/migrate_0_6_to_0_7.py | 0 migrate_0_7_to_0_8.py => src/old_migrations/migrate_0_7_to_0_8.py | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename migrate_0_4_to_0_5.py => src/old_migrations/migrate_0_4_to_0_5.py (100%) rename migrate_0_6_to_0_7.py => src/old_migrations/migrate_0_6_to_0_7.py (100%) rename migrate_0_7_to_0_8.py => src/old_migrations/migrate_0_7_to_0_8.py (100%) diff --git a/migrate_0_4_to_0_5.py b/src/old_migrations/migrate_0_4_to_0_5.py similarity index 100% rename from migrate_0_4_to_0_5.py rename to src/old_migrations/migrate_0_4_to_0_5.py diff --git a/migrate_0_6_to_0_7.py b/src/old_migrations/migrate_0_6_to_0_7.py similarity index 100% rename from migrate_0_6_to_0_7.py rename to src/old_migrations/migrate_0_6_to_0_7.py diff --git a/migrate_0_7_to_0_8.py b/src/old_migrations/migrate_0_7_to_0_8.py similarity index 100% rename from migrate_0_7_to_0_8.py rename to src/old_migrations/migrate_0_7_to_0_8.py From c46dce5e3bef094dc726483232ee02049cf6edd9 Mon Sep 17 00:00:00 2001 From: Yusur Princeps Date: Thu, 6 Nov 2025 07:25:07 +0100 Subject: [PATCH 2/4] add CSRF token --- CHANGELOG.md | 1 + genmig.sh | 6 ++++++ pyproject.toml | 4 +++- src/coriplus/__init__.py | 8 +++++++- src/coriplus/models.py | 3 ++- src/coriplus/templates/about.html | 9 ++++++--- src/coriplus/templates/admin_report_detail.html | 1 + src/coriplus/templates/base.html | 2 +- src/coriplus/templates/change_password.html | 1 + src/coriplus/templates/confirm_delete.html | 9 ++++----- src/coriplus/templates/create.html | 1 + src/coriplus/templates/edit.html | 1 + src/coriplus/templates/edit_profile.html | 1 + src/coriplus/templates/login.html | 1 + src/coriplus/templates/report_message.html | 1 + src/coriplus/templates/report_user.html | 1 + 16 files changed, 38 insertions(+), 12 deletions(-) create mode 100755 genmig.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index ff728bc..24a2232 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ + Codebase refactor (with breaking changes!) + Move ALL config to .env (config.py is NO MORE supported) + Config SITE_NAME replaced with APP_NAME ++ Add CSRF token and flask_WTF ## 0.9.0 diff --git a/genmig.sh b/genmig.sh new file mode 100755 index 0000000..bc624ce --- /dev/null +++ b/genmig.sh @@ -0,0 +1,6 @@ +#!/usr/bin/bash +# GENERATE MIGRATIONS + +source venv/bin/activate && \ +source .env && \ +pw_migrate create --auto --auto-source=coriplus.models --directory=src/migrations --database="$DATABASE_URL" "$@" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index f4d5b53..72b1800 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,9 @@ dependencies = [ "Python-Dotenv>=1.0.0", "Flask", "Flask-Login", - "Peewee" + "Peewee", + "Flask-WTF", + "peewee-migrate" ] requires-python = ">=3.10" classifiers = [ diff --git a/src/coriplus/__init__.py b/src/coriplus/__init__.py index 4f01715..d829da9 100644 --- a/src/coriplus/__init__.py +++ b/src/coriplus/__init__.py @@ -20,6 +20,7 @@ from flask import ( send_from_directory, __version__ as flask_version) import os, sys from flask_login import LoginManager +from flask_wtf import CSRFProtect import dotenv import logging @@ -44,6 +45,8 @@ app.secret_key = os.environ['SECRET_KEY'] login_manager = LoginManager(app) +CSRFProtect(app) + from .models import * from .utils import * @@ -64,7 +67,10 @@ def before_request(): @app.after_request def after_request(response): - g.db.close() + try: + g.db.close() + except Exception: + logger.error('database closed twice') return response @app.context_processor diff --git a/src/coriplus/models.py b/src/coriplus/models.py index 4cdb2b5..0c9c68e 100644 --- a/src/coriplus/models.py +++ b/src/coriplus/models.py @@ -13,11 +13,12 @@ The tables are: from flask import request from peewee import * +from playhouse.db_url import connect import os # here should go `from .utils import get_current_user`, but it will cause # import errors. It's instead imported at function level. -database = SqliteDatabase('coriplus.sqlite') +database = connect(os.environ['DATABASE_URL']) class BaseModel(Model): class Meta: diff --git a/src/coriplus/templates/about.html b/src/coriplus/templates/about.html index e5691a8..b337caa 100644 --- a/src/coriplus/templates/about.html +++ b/src/coriplus/templates/about.html @@ -3,9 +3,12 @@ {% block body %}

About {{ site_name }}

-

{{ site_name }} {{ version }} – Python {{ python_version }} – - Flask {{ flask_version }}

-

Copyright © 2019 Sakuragasaki46.

+ +

Copyright © 2019, 2025 Sakuragasaki46.

License

Permission is hereby granted, free of charge, to any person obtaining diff --git a/src/coriplus/templates/admin_report_detail.html b/src/coriplus/templates/admin_report_detail.html index d445d64..8f5d2c6 100644 --- a/src/coriplus/templates/admin_report_detail.html +++ b/src/coriplus/templates/admin_report_detail.html @@ -21,6 +21,7 @@ {% include "includes/reported_message.html" %} {% endif %}

+
diff --git a/src/coriplus/templates/base.html b/src/coriplus/templates/base.html index b2f79bc..adba498 100644 --- a/src/coriplus/templates/base.html +++ b/src/coriplus/templates/base.html @@ -34,7 +34,7 @@ {% block body %}{% endblock %}
-

© 2019 Sakuragasaki46. +

© 2019, 2025 Sakuragasaki46. About - Terms - Privacy - GitHub

diff --git a/src/coriplus/templates/change_password.html b/src/coriplus/templates/change_password.html index afd4e28..1eb2eae 100644 --- a/src/coriplus/templates/change_password.html +++ b/src/coriplus/templates/change_password.html @@ -4,6 +4,7 @@

Change Password

+
Old password:
diff --git a/src/coriplus/templates/confirm_delete.html b/src/coriplus/templates/confirm_delete.html index b48919c..ea753ef 100644 --- a/src/coriplus/templates/confirm_delete.html +++ b/src/coriplus/templates/confirm_delete.html @@ -3,20 +3,19 @@ {% block body %}

Confirm Deletion

-

Are you sure you want to permanently delete this post? +

Are you sure you want to permanently delete this post? Neither you nor others will be able to see it; you cannot recover a post after it's deleted.

-

If you only want to hide it from the public, - you can set its privacy to "Only me".

- -

Here's the content of the message for reference:

+

Tip: If you only want to hide it from the public, + you can set its privacy to "Only me".

  • {% include "includes/message.html" %}
+ {% endblock %} diff --git a/src/coriplus/templates/create.html b/src/coriplus/templates/create.html index 8f31263..2e3bd34 100644 --- a/src/coriplus/templates/create.html +++ b/src/coriplus/templates/create.html @@ -2,6 +2,7 @@ {% block body %}

Create

+
Message:
diff --git a/src/coriplus/templates/edit.html b/src/coriplus/templates/edit.html index 2de4877..5a8f907 100644 --- a/src/coriplus/templates/edit.html +++ b/src/coriplus/templates/edit.html @@ -2,6 +2,7 @@ {% block body %}

Edit

+
Message:
diff --git a/src/coriplus/templates/edit_profile.html b/src/coriplus/templates/edit_profile.html index 349d6bd..319a9c2 100644 --- a/src/coriplus/templates/edit_profile.html +++ b/src/coriplus/templates/edit_profile.html @@ -4,6 +4,7 @@

Edit Profile

+
Username:
diff --git a/src/coriplus/templates/login.html b/src/coriplus/templates/login.html index d1dbaae..dee8219 100644 --- a/src/coriplus/templates/login.html +++ b/src/coriplus/templates/login.html @@ -3,6 +3,7 @@

Login

{% if error %}

Error: {{ error }}{% endif %} +

Username or email:
diff --git a/src/coriplus/templates/report_message.html b/src/coriplus/templates/report_message.html index c17553e..0012c34 100644 --- a/src/coriplus/templates/report_message.html +++ b/src/coriplus/templates/report_message.html @@ -3,6 +3,7 @@ {% block body %} {% for reason in report_reasons %} +

{{ reason[1] }}

diff --git a/src/coriplus/templates/report_user.html b/src/coriplus/templates/report_user.html index c17553e..0012c34 100644 --- a/src/coriplus/templates/report_user.html +++ b/src/coriplus/templates/report_user.html @@ -3,6 +3,7 @@ {% block body %} {% for reason in report_reasons %} +

{{ reason[1] }}

From a5695707b06c2c37e40a9840b4ae68928bb82234 Mon Sep 17 00:00:00 2001 From: Yusur Princeps Date: Thu, 6 Nov 2025 17:19:00 +0100 Subject: [PATCH 3/4] add migrations --- genmig.sh | 5 +- pyproject.toml | 3 +- src/coriplus/models.py | 4 +- src/migrations/001_0_9_to_0_10.py | 171 ++++++++++++++++++++++++++++++ 4 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 src/migrations/001_0_9_to_0_10.py diff --git a/genmig.sh b/genmig.sh index bc624ce..a29c9fb 100755 --- a/genmig.sh +++ b/genmig.sh @@ -3,4 +3,7 @@ source venv/bin/activate && \ source .env && \ -pw_migrate create --auto --auto-source=coriplus.models --directory=src/migrations --database="$DATABASE_URL" "$@" \ No newline at end of file +case "$1" in + ("+") pw_migrate create --auto --auto-source=coriplus.models --directory=src/migrations --database="$DATABASE_URL" "${@:2}" ;; + ("@") pw_migrate migrate --directory=src/migrations --database="$DATABASE_URL" "${@:2}" ;; +esac \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 72b1800..76e1140 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,8 @@ dependencies = [ "Flask-Login", "Peewee", "Flask-WTF", - "peewee-migrate" + "peewee-migrate", + "PsycoPG2" ] requires-python = ">=3.10" classifiers = [ diff --git a/src/coriplus/models.py b/src/coriplus/models.py index 0c9c68e..5a2ae50 100644 --- a/src/coriplus/models.py +++ b/src/coriplus/models.py @@ -15,6 +15,8 @@ from flask import request from peewee import * from playhouse.db_url import connect import os + +from . import BASEDIR # here should go `from .utils import get_current_user`, but it will cause # import errors. It's instead imported at function level. @@ -190,7 +192,7 @@ class Relationship(BaseModel): ) -UPLOAD_DIRECTORY = os.path.join(os.path.split(os.path.dirname(__file__))[0], 'uploads') +UPLOAD_DIRECTORY = os.path.join(BASEDIR, 'uploads') class Upload(BaseModel): # the extension of the media diff --git a/src/migrations/001_0_9_to_0_10.py b/src/migrations/001_0_9_to_0_10.py new file mode 100644 index 0000000..17a8884 --- /dev/null +++ b/src/migrations/001_0_9_to_0_10.py @@ -0,0 +1,171 @@ +"""Peewee migrations -- 001_0_9_to_0_10.py. + +Some examples (model - class or model name):: + + > Model = migrator.orm['table_name'] # Return model in current state by name + > Model = migrator.ModelClass # Return model in current state by name + + > migrator.sql(sql) # Run custom SQL + > migrator.run(func, *args, **kwargs) # Run python function with the given args + > migrator.create_model(Model) # Create a model (could be used as decorator) + > migrator.remove_model(model, cascade=True) # Remove a model + > migrator.add_fields(model, **fields) # Add fields to a model + > migrator.change_fields(model, **fields) # Change fields + > migrator.remove_fields(model, *field_names, cascade=True) + > migrator.rename_field(model, old_field_name, new_field_name) + > migrator.rename_table(model, new_table_name) + > migrator.add_index(model, *col_names, unique=False) + > migrator.add_not_null(model, *field_names) + > migrator.add_default(model, field_name, default) + > migrator.add_constraint(model, name, sql) + > migrator.drop_index(model, *col_names) + > migrator.drop_not_null(model, *field_names) + > migrator.drop_constraints(model, *constraints) + +""" + +from contextlib import suppress + +import peewee as pw +from peewee_migrate import Migrator + + +with suppress(ImportError): + import playhouse.postgres_ext as pw_pext + + +def migrate(migrator: Migrator, database: pw.Database, *, fake=False): + """Write your migrations here.""" + + @migrator.create_model + class BaseModel(pw.Model): + id = pw.AutoField() + + class Meta: + table_name = "basemodel" + + @migrator.create_model + class User(pw.Model): + id = pw.AutoField() + username = pw.CharField(max_length=255, unique=True) + full_name = pw.TextField() + password = pw.CharField(max_length=255) + email = pw.CharField(max_length=255) + birthday = pw.DateField() + join_date = pw.DateTimeField() + is_disabled = pw.IntegerField() + + class Meta: + table_name = "user" + + @migrator.create_model + class Message(pw.Model): + id = pw.AutoField() + user = pw.ForeignKeyField(column_name='user_id', field='id', model=migrator.orm['user']) + text = pw.TextField() + pub_date = pw.DateTimeField() + privacy = pw.IntegerField() + + class Meta: + table_name = "message" + + @migrator.create_model + class MessageUpvote(pw.Model): + id = pw.AutoField() + message = pw.ForeignKeyField(column_name='message_id', field='id', model=migrator.orm['message']) + user = pw.ForeignKeyField(column_name='user_id', field='id', model=migrator.orm['user']) + created_date = pw.DateTimeField() + + class Meta: + table_name = "messageupvote" + indexes = [(('message', 'user'), True)] + + @migrator.create_model + class Notification(pw.Model): + id = pw.AutoField() + type = pw.TextField() + target = pw.ForeignKeyField(column_name='target_id', field='id', model=migrator.orm['user']) + detail = pw.TextField() + pub_date = pw.DateTimeField() + seen = pw.IntegerField() + + class Meta: + table_name = "notification" + + @migrator.create_model + class Relationship(pw.Model): + id = pw.AutoField() + from_user = pw.ForeignKeyField(column_name='from_user_id', field='id', model=migrator.orm['user']) + to_user = pw.ForeignKeyField(column_name='to_user_id', field='id', model=migrator.orm['user']) + created_date = pw.DateTimeField() + + class Meta: + table_name = "relationship" + indexes = [(('from_user', 'to_user'), True)] + + @migrator.create_model + class Report(pw.Model): + id = pw.AutoField() + media_type = pw.IntegerField() + media_id = pw.IntegerField() + sender = pw.ForeignKeyField(column_name='sender_id', field='id', model=migrator.orm['user'], null=True) + reason = pw.IntegerField() + status = pw.IntegerField() + created_date = pw.DateTimeField() + + class Meta: + table_name = "report" + + @migrator.create_model + class Upload(pw.Model): + id = pw.AutoField() + type = pw.TextField() + message = pw.ForeignKeyField(column_name='message_id', field='id', model=migrator.orm['message']) + + class Meta: + table_name = "upload" + + @migrator.create_model + class UserAdminship(pw.Model): + user = pw.ForeignKeyField(column_name='user_id', field='id', model=migrator.orm['user'], primary_key=True) + + class Meta: + table_name = "useradminship" + + @migrator.create_model + class UserProfile(pw.Model): + user = pw.ForeignKeyField(column_name='user_id', field='id', model=migrator.orm['user'], primary_key=True) + biography = pw.TextField() + location = pw.IntegerField(null=True) + year = pw.IntegerField(null=True) + website = pw.TextField(null=True) + instagram = pw.TextField(null=True) + facebook = pw.TextField(null=True) + telegram = pw.TextField(null=True) + + class Meta: + table_name = "userprofile" + + +def rollback(migrator: Migrator, database: pw.Database, *, fake=False): + """Write your rollback migrations here.""" + + migrator.remove_model('userprofile') + + migrator.remove_model('useradminship') + + migrator.remove_model('upload') + + migrator.remove_model('report') + + migrator.remove_model('relationship') + + migrator.remove_model('notification') + + migrator.remove_model('messageupvote') + + migrator.remove_model('message') + + migrator.remove_model('user') + + migrator.remove_model('basemodel') From c834424836eeaa9865014ec27e5a2c7af98dbc83 Mon Sep 17 00:00:00 2001 From: Yusur Princeps Date: Sat, 8 Nov 2025 20:02:52 +0100 Subject: [PATCH 4/4] style changes + regularize admin platform access + add link to material icons font --- README.md | 15 ++++- src/coriplus/__init__.py | 4 ++ src/coriplus/admin.py | 16 +++--- src/coriplus/static/style.css | 44 +++++++++++---- src/coriplus/templates/403.html | 9 +++ src/coriplus/templates/404.html | 6 +- src/coriplus/templates/about.html | 56 ++++++++++--------- src/coriplus/templates/admin_base.html | 7 ++- .../templates/admin_report_detail.html | 4 +- src/coriplus/templates/admin_reports.html | 2 +- src/coriplus/templates/base.html | 32 ++++++----- src/coriplus/templates/change_password.html | 28 +++++----- src/coriplus/templates/confirm_delete.html | 28 +++++----- src/coriplus/templates/create.html | 2 + src/coriplus/templates/edit.html | 2 + src/coriplus/templates/edit_profile.html | 2 + src/coriplus/templates/explore.html | 3 +- src/coriplus/templates/feed.html | 3 +- src/coriplus/templates/homepage.html | 2 + src/coriplus/templates/join.html | 2 + src/coriplus/templates/login.html | 6 +- src/coriplus/templates/macros/message.html | 35 ++++++++++++ src/coriplus/templates/notifications.html | 2 +- src/coriplus/templates/privacy.html | 51 +++++++++-------- src/coriplus/templates/terms.html | 4 +- src/coriplus/templates/user_detail.html | 9 ++- src/coriplus/utils.py | 12 +--- 27 files changed, 251 insertions(+), 135 deletions(-) create mode 100644 src/coriplus/templates/403.html create mode 100644 src/coriplus/templates/macros/message.html diff --git a/README.md b/README.md index b96fffc..3ee8c96 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,19 @@ This is the server. For the client, see [coriplusapp](https://github.com/sakurag * Add info to your profile * In-site notifications * Public API -* SQLite-based app +* SQLite (or PostgreSQL)-based app ## Requirements -* **Python 3** only. We don't want to support Python 2. -* **Flask** web framework (also required extension **Flask-Login**). +* **Python 3.10+** with **pip**. +* **Flask** web framework. * **Peewee** ORM. +* A \*nix-based OS. + +## Installation + +* Install dependencies: `pip install .` +* Set the `DATABASE_URL` (must be SQLite or PostgreSQL) +* Run the migrations: `sh ./genmig.sh @` +* i forgor + diff --git a/src/coriplus/__init__.py b/src/coriplus/__init__.py index d829da9..98b4d85 100644 --- a/src/coriplus/__init__.py +++ b/src/coriplus/__init__.py @@ -85,6 +85,10 @@ def _inject_variables(): def _inject_user(userid): return User[userid] +@app.errorhandler(403) +def error_403(body): + return render_template('403.html'), 403 + @app.errorhandler(404) def error_404(body): return render_template('404.html'), 404 diff --git a/src/coriplus/admin.py b/src/coriplus/admin.py index b8fb4b9..a78cf1b 100644 --- a/src/coriplus/admin.py +++ b/src/coriplus/admin.py @@ -4,7 +4,8 @@ Management of reports and the entire site. New in 0.8. ''' -from flask import Blueprint, redirect, render_template, request, url_for +from flask import Blueprint, abort, redirect, render_template, request, url_for +from flask_login import current_user from .models import User, Message, Report, report_reasons, REPORT_STATUS_ACCEPTED, \ REPORT_MEDIA_USER, REPORT_MEDIA_MESSAGE from .utils import pwdhash, object_list @@ -12,21 +13,18 @@ from functools import wraps bp = Blueprint('admin', __name__, url_prefix='/admin') -def check_auth(username, password): +def _check_auth(username, password) -> bool: try: - return User.get((User.username == username) & (User.password == pwdhash(password)) - ).is_admin + return User.select().where((User.username == username) & (User.password == pwdhash(password)) & (User.is_admin) + ).exists() except User.DoesNotExist: return False def admin_required(f): @wraps(f) def wrapped_view(**kwargs): - auth = request.authorization - if not (auth and check_auth(auth.username, auth.password)): - return ('Unauthorized', 401, { - 'WWW-Authenticate': 'Basic realm="Login Required"' - }) + if not _check_auth(current_user.username, current_user.password): + abort(403) return f(**kwargs) return wrapped_view diff --git a/src/coriplus/static/style.css b/src/coriplus/static/style.css index 87152a8..c238285 100644 --- a/src/coriplus/static/style.css +++ b/src/coriplus/static/style.css @@ -1,19 +1,41 @@ -body,button,input,select,textarea{font-family:Roboto,'Segoe UI',Arial,Helvetica,sans-serif} +:root { + --accent: #f0372e; + --link: #3399ff; +} +body, button, input, select, textarea { + font-family: Inter, Roboto, sans-serif; + line-height: 1.6; + background-color: #eeeeee; +} +#site-name, h1, h2, h3, h4, h5, h6 { + font-family: 'Funnel Sans', Roboto, sans-serif; + line-height: 1.2; +} body{margin:0} +main{margin:auto; max-width: 960px;} a{text-decoration:none} a:hover{text-decoration:underline} +.mobile-collapse {font-size: smaller;} @media (max-width:640px){ .mobile-collapse{display:none} } -.header{padding:12px;color:white;background-color:#ff3018;box-shadow:0 0 3px 3px #ccc} +.header{ + padding:12px;color:white; background-color:var(--accent); box-shadow:0 0 3px 3px #ccc; display: flex; position: relative; +} +.centered{ + text-align: center; +} .content{padding:12px} -.header a{color:white} +.header a{color:white; } .header a svg{fill:white} -.content a{color:#3399ff} -.content a svg{fill:#3399ff} -.content a.plus{color:#ff3018} -.metanav{float:right} -.metanav-divider{width:1px;background:white;display:inline-block} +.content a{color:var(--link)} +.content a svg{fill:var(--link)} +.content a.plus{color:var(--accent)} +.leftnav, .rightnav{list-style: none; display: flex; padding: 0; margin: 0;position: absolute;} +.leftnav {left: 0} +.rightnav {right: 0} +.card {background-color: #fafafa; border-radius: 12px; padding: 12px; margin-bottom: 12px; border-bottom: 2px solid #999999;} +#site-name {text-align: center;flex: 1} .header h1{margin:0;display:inline-block} .flash{background-color:#ff9;border:yellow 1px solid} .infobox{padding:12px;border:#ccc 1px solid} @@ -23,15 +45,15 @@ a:hover{text-decoration:underline} .weak{opacity:.5} .field_desc{display:block} ul.timeline{padding:0;margin:auto;max-width:960px} -ul.timeline > li{list-style:none;border-bottom:#808080 1px solid} +ul.timeline > li{list-style:none;} .message-visual img{max-width:100%;margin:auto} .message-options-showhide::before{content:'\2026'} .message-options{display:none} .create_text{width:100%;height:8em} .biography_text{height:4em} .before-toggle:not(:checked) + input{display:none} -.follow_button,input[type="submit"]{background-color:#ff3018;color:white;border-radius:3px;border:1px solid #ff3018} -.follow_button.following{background-color:transparent;color:#ff3018;border-color:#ff3018} +.follow_button,input[type="submit"]{background-color:var(--accent);color:white;border-radius:3px;border:1px solid var(--accent)} +.follow_button.following{background-color:transparent;color:var(--accent);border-color:var(--accent)} .copyright{font-size:smaller;text-align:center;color:#808080} .copyright a:link,.copyright a:visited{color:#31559e} .copyright ul{list-style:none;padding:0} diff --git a/src/coriplus/templates/403.html b/src/coriplus/templates/403.html new file mode 100644 index 0000000..5cdbf3b --- /dev/null +++ b/src/coriplus/templates/403.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} + +{% block body %} +
+

Forbidden

+ +

Back to homepage.

+
+{% endblock %} \ No newline at end of file diff --git a/src/coriplus/templates/404.html b/src/coriplus/templates/404.html index d434c9a..4acfb0b 100644 --- a/src/coriplus/templates/404.html +++ b/src/coriplus/templates/404.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block body %} -

Not Found

+
+

Not Found

-

Back to homepage.

+

Back to homepage.

+
{% endblock %} \ No newline at end of file diff --git a/src/coriplus/templates/about.html b/src/coriplus/templates/about.html index b337caa..905eb8d 100644 --- a/src/coriplus/templates/about.html +++ b/src/coriplus/templates/about.html @@ -1,37 +1,39 @@ {% extends "base.html" %} {% block body %} -

About {{ site_name }}

+
+

About {{ site_name }}

-
    -
  • {{ site_name }} {{ version }}
    • -
  • Python {{ python_version }}
    • -
  • Flask {{ flask_version }}
    • -
-

Copyright © 2019, 2025 Sakuragasaki46.

+
    +
  • {{ site_name }} {{ version }}
    • +
  • Python {{ python_version }}
    • +
  • Flask {{ flask_version }}
    • +
+

Copyright © 2019, 2025 Sakuragasaki46.

-

License

-

Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files - (the "Software"), to deal in the Software without restriction, - including without limitation the rights to use, copy, modify, merge, - publish, distribute, sublicense, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions:

+

License

+

Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions:

-

The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software.

+

The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software.

-

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

Source code for this site: - https://github.com/sakuragasaki46/coriplus/ +

Source code for this site: + https://github.com/sakuragasaki46/coriplus/ +

{% endblock %} diff --git a/src/coriplus/templates/admin_base.html b/src/coriplus/templates/admin_base.html index e59e813..c20c146 100644 --- a/src/coriplus/templates/admin_base.html +++ b/src/coriplus/templates/admin_base.html @@ -7,16 +7,19 @@
-

{{ site_name }} Admin

-
+

{{ site_name }}: Admin

+
+ {% for message in get_flashed_messages() %}
{{ message }}
{% endfor %} +
{% block body %}{% endblock %} +

© 2019 Sakuragasaki46. diff --git a/src/coriplus/templates/admin_report_detail.html b/src/coriplus/templates/admin_report_detail.html index 8f5d2c6..819c783 100644 --- a/src/coriplus/templates/admin_report_detail.html +++ b/src/coriplus/templates/admin_report_detail.html @@ -1,7 +1,8 @@ {% extends "admin_base.html" %} {% block body %} -

Report detail #{{ report.id }}

+

Report detail #{{ report.id }}

+

Type: {{ [None, 'user', 'message'][report.media_type] }}

Reason: {{ report_reasons[report.reason] }}

Status: {{ ['Unreviewed', 'Accepted', 'Declined'][report.status] }}

@@ -25,4 +26,5 @@ +
{% endblock %} diff --git a/src/coriplus/templates/admin_reports.html b/src/coriplus/templates/admin_reports.html index 1d022a8..0474fab 100644 --- a/src/coriplus/templates/admin_reports.html +++ b/src/coriplus/templates/admin_reports.html @@ -3,7 +3,7 @@ {% block body %}
{% for message in get_flashed_messages() %}
{{ message }}
{% endfor %} +
{% block body %}{% endblock %} +

© 2019, 2025 Sakuragasaki46. diff --git a/src/coriplus/templates/change_password.html b/src/coriplus/templates/change_password.html index 1eb2eae..22fa5bb 100644 --- a/src/coriplus/templates/change_password.html +++ b/src/coriplus/templates/change_password.html @@ -1,18 +1,20 @@ {% extends "base.html" %} {% block body %} -

Change Password

+
+

Change Password

-
- -
-
Old password:
-
-
New password:
-
-
New password, again:
-
-
-
-
+
+ +
+
Old password:
+
+
New password:
+
+
New password, again:
+
+
+
+
+
{% endblock %} diff --git a/src/coriplus/templates/confirm_delete.html b/src/coriplus/templates/confirm_delete.html index ea753ef..3d89e16 100644 --- a/src/coriplus/templates/confirm_delete.html +++ b/src/coriplus/templates/confirm_delete.html @@ -1,21 +1,23 @@ {% extends "base.html" %} {% block body %} -

Confirm Deletion

+
+

Confirm Deletion

-

Are you sure you want to permanently delete this post? - Neither you nor others will be able to see it; - you cannot recover a post after it's deleted.

+

Are you sure you want to permanently delete this post? + Neither you nor others will be able to see it; + you cannot recover a post after it's deleted.

-

Tip: If you only want to hide it from the public, - you can set its privacy to "Only me".

+

Tip: If you only want to hide it from the public, + you can set its privacy to "Only me".

-
    -
  • {% include "includes/message.html" %}
    • -
+
    +
  • {% include "includes/message.html" %}
    • +
-
- - -
+
+ + +
+
{% endblock %} diff --git a/src/coriplus/templates/create.html b/src/coriplus/templates/create.html index 2e3bd34..f8a0104 100644 --- a/src/coriplus/templates/create.html +++ b/src/coriplus/templates/create.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% block body %} +

Create

@@ -16,4 +17,5 @@
+
{% endblock %} diff --git a/src/coriplus/templates/edit.html b/src/coriplus/templates/edit.html index 5a8f907..316dc7e 100644 --- a/src/coriplus/templates/edit.html +++ b/src/coriplus/templates/edit.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% block body %} +

Edit

@@ -15,4 +16,5 @@
+
{% endblock %} diff --git a/src/coriplus/templates/edit_profile.html b/src/coriplus/templates/edit_profile.html index 319a9c2..66ecd28 100644 --- a/src/coriplus/templates/edit_profile.html +++ b/src/coriplus/templates/edit_profile.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block body %} +

Edit Profile

@@ -33,4 +34,5 @@
+
{% endblock %} diff --git a/src/coriplus/templates/explore.html b/src/coriplus/templates/explore.html index 65d1846..e86a8f2 100644 --- a/src/coriplus/templates/explore.html +++ b/src/coriplus/templates/explore.html @@ -1,9 +1,10 @@ {% extends "base.html" %} +{% from "macros/message.html" import feed_message with context %} {% block body %}

Explore

{% include "includes/pagination.html" %} diff --git a/src/coriplus/templates/feed.html b/src/coriplus/templates/feed.html index 88b05ac..beb6607 100644 --- a/src/coriplus/templates/feed.html +++ b/src/coriplus/templates/feed.html @@ -1,9 +1,10 @@ {% extends "base.html" %} +{% from "macros/message.html" import feed_message with context %} {% block body %}

Your Timeline

{% include "includes/pagination.html" %} diff --git a/src/coriplus/templates/homepage.html b/src/coriplus/templates/homepage.html index 106bf9a..fdad92f 100644 --- a/src/coriplus/templates/homepage.html +++ b/src/coriplus/templates/homepage.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block body %} +

Hello

{{ site_name }} is made by people like you.
Log in or register to see more.

+
{% endblock %} diff --git a/src/coriplus/templates/join.html b/src/coriplus/templates/join.html index 607387f..a45b511 100644 --- a/src/coriplus/templates/join.html +++ b/src/coriplus/templates/join.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% block body %} +

Join {{ site_name }}

@@ -32,4 +33,5 @@
+
{% endblock %} diff --git a/src/coriplus/templates/login.html b/src/coriplus/templates/login.html index dee8219..21a5e93 100644 --- a/src/coriplus/templates/login.html +++ b/src/coriplus/templates/login.html @@ -1,9 +1,10 @@ {% extends "base.html" %} {% block body %}

Login

- {% if error %}

Error: {{ error }}{% endif %} + {% if error %}

Error: {{ error }}

{% endif %} +
- +
Username or email:
@@ -19,4 +20,5 @@
+
{% endblock %} diff --git a/src/coriplus/templates/macros/message.html b/src/coriplus/templates/macros/message.html new file mode 100644 index 0000000..b4ef93a --- /dev/null +++ b/src/coriplus/templates/macros/message.html @@ -0,0 +1,35 @@ +{% macro feed_message(message) %} +
  • +

    {{ message.text|enrich }}

    +{% if message.uploads %} +
    + +
    +{% endif %} +

    + + + {{ message.score }} + - + {{ message.user.username }} + - + {% set message_privacy = message.privacy %} + {% if message_privacy == 0 %} Public + {% elif message_privacy == 1 %} Unlisted + {% elif message_privacy == 2 %} Friends + {% elif message_privacy == 3 %} Only me + {% endif %} + - + + - + +

    + +
    • +{% endmacro %} \ No newline at end of file diff --git a/src/coriplus/templates/notifications.html b/src/coriplus/templates/notifications.html index 04b61d1..33ee7bb 100644 --- a/src/coriplus/templates/notifications.html +++ b/src/coriplus/templates/notifications.html @@ -3,7 +3,7 @@

    Notifications

      {% for notification in notification_list %} -
    • {% include "includes/notification.html" %}
      • +
    • {% include "includes/notification.html" %}
      • {% endfor %}
    {% include "includes/pagination.html" %} diff --git a/src/coriplus/templates/privacy.html b/src/coriplus/templates/privacy.html index a7b8570..df4248a 100644 --- a/src/coriplus/templates/privacy.html +++ b/src/coriplus/templates/privacy.html @@ -1,47 +1,54 @@ {% extends "base.html" %} {% block body %} -

    Privacy Policy

    +
    +

    Privacy Policy

    -

    At {{ site_name }}, accessible from {{ request.host }}, one of our main priorities is the privacy of our visitors. This Privacy Policy document contains types of information that is collected and recorded by {{ site_name }} and how we use it.

    +

    At {{ site_name }}, accessible from {{ request.host }}, one of our main priorities is the privacy of our visitors. This Privacy Policy document contains types of information that is collected and recorded by {{ site_name }} and how we use it.

    -

    If you have additional questions or require more information about our Privacy Policy, do not hesitate to contact us through email at sakuragasaki46@gmail.com

    +

    If you have additional questions or require more information about our Privacy Policy, do not hesitate to contact us through email at sakuragasaki46@gmail.com

    -

    Log Files

    +

    Log Files

    -

    {{ site_name }} follows a standard procedure of using log files. These files log visitors when they visit websites. All hosting companies do this and a part of hosting services' analytics. The information collected by log files include internet protocol (IP) addresses, browser type, Internet Service Provider (ISP), date and time stamp, referring/exit pages, and possibly the number of clicks. These are not linked to any information that is personally identifiable. The purpose of the information is for analyzing trends, administering the site, tracking users' movement on the website, and gathering demographic information.

    +

    {{ site_name }} follows a standard procedure of using log files. These files log visitors when they visit websites. All hosting companies do this and a part of hosting services' analytics. The information collected by log files include internet protocol (IP) addresses, browser type, Internet Service Provider (ISP), date and time stamp, referring/exit pages, and possibly the number of clicks. These are not linked to any information that is personally identifiable. The purpose of the information is for analyzing trends, administering the site, tracking users' movement on the website, and gathering demographic information.

    -

    Cookies and Web Beacons

    +

    Cookies and Web Beacons

    -

    Like any other website, {{ site_name }} uses 'cookies'. These cookies are used to store information including visitors' preferences, and the pages on the website that the visitor accessed or visited. The information is used to optimize the users' experience by customizing our web page content based on visitors' browser type and/or other information.

    +

    Like any other website, {{ site_name }} uses 'cookies'. These cookies are used to store information including visitors' preferences, and the pages on the website that the visitor accessed or visited. The information is used to optimize the users' experience by customizing our web page content based on visitors' browser type and/or other information.

    +

    You can choose to disable cookies through your individual browser options. This, however, can and will hurt Your usage of {{ site_name }}

    + +

    Privacy Policies

    +

    You may consult this list to find the Privacy Policy for each of the advertising partners of {{ site_name }}. Our Privacy Policy was created with the help of the Privacy Policy Generator and the Generate Privacy Policy Generator.

    -

    Privacy Policies

    +

    Third-party ad servers or ad networks uses technologies like cookies, JavaScript, or Web Beacons that are used in their respective advertisements and links that appear on {{ site_name }}, which are sent directly to users' browser. They automatically receive your IP address when this occurs. These technologies are used to measure the effectiveness of their advertising campaigns and/or to personalize the advertising content that you see on websites that you visit.

    -

    You may consult this list to find the Privacy Policy for each of the advertising partners of {{ site_name }}. Our Privacy Policy was created with the help of the Privacy Policy Generator and the Generate Privacy Policy Generator.

    +

    Note that {{ site_name }} has no access to or control over these cookies that are used by third-party advertisers.

    -

    Third-party ad servers or ad networks uses technologies like cookies, JavaScript, or Web Beacons that are used in their respective advertisements and links that appear on {{ site_name }}, which are sent directly to users' browser. They automatically receive your IP address when this occurs. These technologies are used to measure the effectiveness of their advertising campaigns and/or to personalize the advertising content that you see on websites that you visit.

    +

    Third Party Privacy Policies

    -

    Note that {{ site_name }} has no access to or control over these cookies that are used by third-party advertisers.

    +

    {{ site_name }}'s Privacy Policy does not apply to other advertisers or websites. Thus, we are advising you to consult the respective Privacy Policies of these third-party ad servers for more detailed information. It may include their practices and instructions about how to opt-out of certain options. You may find a complete list of these Privacy Policies and their links here: Privacy Policy Links.

    -

    Third Party Privacy Policies

    +

    Legal Basis

    -

    {{ site_name }}'s Privacy Policy does not apply to other advertisers or websites. Thus, we are advising you to consult the respective Privacy Policies of these third-party ad servers for more detailed information. It may include their practices and instructions about how to opt-out of certain options. You may find a complete list of these Privacy Policies and their links here: Privacy Policy Links.

    +

    Legal Basis for treatment is Legitimate Interest, except:

    +
      +
    • Transactional information, such as username, email and essential cookies, are treated according to Providing a Service.
      • +
    -

    You can choose to disable cookies through your individual browser options. To know more detailed information about cookie management with specific web browsers, it can be found at the browsers' respective websites. What Are Cookies?

    +

    Children's Information

    -

    Children's Information

    +

    Another part of our priority is adding protection for children while using the internet. We encourage parents and guardians to observe, participate in, monitor, guide and/or exercise total control on their online activity.

    -

    Another part of our priority is adding protection for children while using the internet. We encourage parents and guardians to observe, participate in, and/or monitor and guide their online activity.

    +

    {{ site_name }} does not knowingly collect any Personal Identifiable Information from children under the age of 13. If you think that your child provided this kind of information on our website, we strongly encourage you to contact us immediately and we will do our best efforts to promptly remove such information from our records.

    -

    {{ site_name }} does not knowingly collect any Personal Identifiable Information from children under the age of 13. If you think that your child provided this kind of information on our website, we strongly encourage you to contact us immediately and we will do our best efforts to promptly remove such information from our records.

    +

    Online Privacy Policy Only

    -

    Online Privacy Policy Only

    +

    This Privacy Policy applies only to our online activities and is valid for visitors to our website with regards to the information that they shared and/or collect in {{ site_name }}. This policy is not applicable to any information collected via channels other than this website.

    -

    This Privacy Policy applies only to our online activities and is valid for visitors to our website with regards to the information that they shared and/or collect in {{ site_name }}. This policy is not applicable to any information collected offline or via channels other than this website.

    +

    Consent

    -

    Consent

    - -

    By using our website, you hereby consent to our Privacy Policy and agree to its Terms and Conditions.

    +

    By using our website, you hereby consent irrevocably to our Privacy Policy and agree to its Terms and Conditions.

    +
    {% endblock %} diff --git a/src/coriplus/templates/terms.html b/src/coriplus/templates/terms.html index 203e44e..ab8ca7f 100644 --- a/src/coriplus/templates/terms.html +++ b/src/coriplus/templates/terms.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block body %} +

    Terms of Service

    - +

    [decline to state]

    +
    {% endblock %} diff --git a/src/coriplus/templates/user_detail.html b/src/coriplus/templates/user_detail.html index 9b5e7a5..6324f1e 100644 --- a/src/coriplus/templates/user_detail.html +++ b/src/coriplus/templates/user_detail.html @@ -1,15 +1,18 @@ {% extends "base.html" %} +{% from "macros/message.html" import feed_message with context %} {% block body %} {% include "includes/infobox_profile.html" %}

    Messages from {{ user.username }}

    {% if not current_user.is_anonymous %} {% if user.username != current_user.username %} {% if current_user|is_following(user) %} -
    + +
    {% else %} -
    + +
    {% endif %} @@ -20,7 +23,7 @@ {% endif %}
      {% for message in message_list %} -
    • {% include "includes/message.html" %}
      • + {{ feed_message(message) }} {% endfor %}
    {% include "includes/pagination.html" %} diff --git a/src/coriplus/utils.py b/src/coriplus/utils.py index 5259b80..7a98d5b 100644 --- a/src/coriplus/utils.py +++ b/src/coriplus/utils.py @@ -218,12 +218,6 @@ def create_mentions(cur_user, text, privacy): pass # New in 0.9 -def inline_svg(name, width=None): - try: - with open('icons/' + name + '-24px.svg') as f: - data = f.read() - if isinstance(width, int): - data = re.sub(r'( (?:height|width)=")\d+(")', lambda x:x.group(1) + str(width) + x.group(2), data) - return Markup(data) - except OSError: - return '' +# changed in 0.10 +def inline_svg(name): + return Markup('{}').format(name)