michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-02-03 00:31:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

move reply thresholds into filters too, after rebase

Browse source
This commit is contained in:
Hendrik Langer 2024-06-28 15:33:16 +00:00
parent 93fbba1d1e
commit 1ab093e095
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/templates/user/edit_settings.html
View file

@ -25,10 +25,6 @@
{{ render_field(form.newsletter) }}
{{ render_field(form.email_unread) }}
<h5> Visibility </h5>
{{ render_field(form.reply_collapse_threshold) }}
<small class="field_hint">{{ _('Collapse replies with a score at or below this level - click to view.') }}</small>
{{ render_field(form.reply_hide_threshold) }}
<small class="field_hint">{{ _('Hide replies with a score at or below this level.') }}</small>
{{ render_field(form.searchable) }}
{{ render_field(form.indexable) }}
<h5> Preferences </h5>

4
app/templates/user/filters.html
View file

@ -24,6 +24,10 @@
{{ render_field(form.ignore_bots) }}
{{ render_field(form.hide_nsfw) }}
{{ render_field(form.hide_nsfl) }}
{{ render_field(form.reply_collapse_threshold) }}
<small class="field_hint">{{ _('Collapse replies with a score at or below this level - click to view.') }}</small>
{{ render_field(form.reply_hide_threshold) }}
<small class="field_hint">{{ _('Hide replies with a score at or below this level.') }}</small>
{{ render_field(form.submit) }}
</form>
<hr />

4
app/user/forms.py
View file

@ -35,8 +35,6 @@ class SettingsForm(FlaskForm):
interface_language = SelectField(_l('Interface language'), coerce=str, validators=[Optional()], render_kw={'class': 'form-select'})
newsletter = BooleanField(_l('Subscribe to email newsletter'))
email_unread = BooleanField(_l('Receive email about missed notifications'))
reply_collapse_threshold = IntegerField(_l('Reply collapse threshold'))
reply_hide_threshold = IntegerField(_l('Reply hide threshold'))
markdown_editor = BooleanField(_l('Use markdown editor GUI when writing'))
searchable = BooleanField(_l('Show profile in user list'))
indexable = BooleanField(_l('My posts appear in search results'))
@ -97,6 +95,8 @@ class FilterForm(FlaskForm):
default=1, coerce=int, render_kw={'class': 'form-select'})
hide_nsfl = SelectField(_l('Show NSFL posts'), choices=hide_type_choices,
default=1, coerce=int, render_kw={'class': 'form-select'})
reply_collapse_threshold = IntegerField(_l('Reply collapse threshold'))
reply_hide_threshold = IntegerField(_l('Reply hide threshold'))
submit = SubmitField(_l('Save settings'))

8
app/user/routes.py
View file

@ -235,8 +235,6 @@ def change_settings():
current_user.email_unread = form.email_unread.data
current_user.markdown_editor = form.markdown_editor.data
current_user.interface_language = form.interface_language.data
current_user.reply_collapse_threshold = form.reply_collapse_threshold.data
current_user.reply_hide_threshold = form.reply_hide_threshold.data
session['ui_language'] = form.interface_language.data
import_file = request.files['import_file']
if propagate_indexable:
@ -273,8 +271,6 @@ def change_settings():
form.theme.data = current_user.theme
form.markdown_editor.data = current_user.markdown_editor
form.interface_language.data = current_user.interface_language
form.reply_collapse_threshold.data = current_user.reply_collapse_threshold
form.reply_hide_threshold.data = current_user.reply_hide_threshold
return render_template('user/edit_settings.html', title=_('Edit profile'), form=form, user=current_user,
moderating_communities=moderating_communities(current_user.get_id()),
@ -753,6 +749,8 @@ def user_settings_filters():
current_user.ignore_bots = form.ignore_bots.data
current_user.hide_nsfw = form.hide_nsfw.data
current_user.hide_nsfl = form.hide_nsfl.data
current_user.reply_collapse_threshold = form.reply_collapse_threshold.data
current_user.reply_hide_threshold = form.reply_hide_threshold.data
db.session.commit()
flash(_('Your changes have been saved.'), 'success')
@ -761,6 +759,8 @@ def user_settings_filters():
form.ignore_bots.data = current_user.ignore_bots
form.hide_nsfw.data = current_user.hide_nsfw
form.hide_nsfl.data = current_user.hide_nsfl
form.reply_collapse_threshold.data = current_user.reply_collapse_threshold
form.reply_hide_threshold.data = current_user.reply_hide_threshold
filters = Filter.query.filter_by(user_id=current_user.id).order_by(Filter.title).all()
blocked_users = User.query.filter_by(deleted=False).join(UserBlock, UserBlock.blocked_id == User.id).\
filter(UserBlock.blocker_id == current_user.id).order_by(User.user_name).all()