From 3dc652f8670ee86f9acaddb85b42f010eab2ca25 Mon Sep 17 00:00:00 2001 From: Aevann Date: Thu, 5 Oct 2023 13:33:01 +0300 Subject: [PATCH] "Hide Signatures" -> "User Signatures" --- files/classes/user.py | 4 ++-- files/routes/settings.py | 2 +- files/templates/settings/advanced.html | 2 +- migrations/20231005-rename-sigs_disabled-to-show_sigs.sql | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 migrations/20231005-rename-sigs_disabled-to-show_sigs.sql diff --git a/files/classes/user.py b/files/classes/user.py index 6950f5648..1b1acaf18 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -112,7 +112,7 @@ class User(Base): sig = deferred(Column(String)) sig_html = Column(String) fp = Column(String) - sigs_disabled = Column(Boolean) + show_sigs = Column(Boolean, default=True) progressivestack = Column(Integer, default=0) deflector = Column(Integer, default=0) friends = deferred(Column(String)) @@ -1365,7 +1365,7 @@ class User(Base): if not self.sig_html or not self.patron: return '' - if v and (v.sigs_disabled or v.poor): + if v and (not v.show_sigs or v.poor): return '' return f'

{self.sig_html}
' diff --git a/files/routes/settings.py b/files/routes/settings.py index b48aaea98..1fe9a594a 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -161,7 +161,7 @@ def settings_personal_post(v): updated = updated or update_flag("nitter", "nitter") updated = updated or update_flag("imginn", "imginn") updated = updated or update_flag("controversial", "controversial") - updated = updated or update_flag("sigs_disabled", "sigs_disabled") + updated = updated or update_flag("show_sigs", "show_sigs") updated = updated or update_flag("is_private", "private") updated = updated or update_flag("lifetimedonated_visible", "lifetimedonated_visible") diff --git a/files/templates/settings/advanced.html b/files/templates/settings/advanced.html index e45631836..348890b90 100644 --- a/files/templates/settings/advanced.html +++ b/files/templates/settings/advanced.html @@ -128,7 +128,7 @@
Content Filters
- {{common.toggle_section('Disable Signatures', 'sigs_disabled', 'sigs_disabled', v.sigs_disabled, 'Hide user signatures.', false)}} + {{common.toggle_section('User Signatures', 'show_sigs', 'show_sigs', v.show_sigs, 'Show user signatures.', false)}} {% if FEATURES['NSFW_MARKING'] %} {{common.toggle_section('NSFW Warnings', 'nsfw_warnings', 'nsfw_warnings', v.nsfw_warnings, "Show a warning when viewing NSFW posts and collapse NSFW comments.", false)}} {% endif %} diff --git a/migrations/20231005-rename-sigs_disabled-to-show_sigs.sql b/migrations/20231005-rename-sigs_disabled-to-show_sigs.sql new file mode 100644 index 000000000..574b8c14c --- /dev/null +++ b/migrations/20231005-rename-sigs_disabled-to-show_sigs.sql @@ -0,0 +1,3 @@ +alter table users rename column sigs_disabled to show_sigs; +update users set show_sigs=true; +alter table users alter column show_sigs set not null;