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

Default language selection is always most recently used (Bugfix for #273)

Browse source
This commit is contained in:
freamon 2024-08-19 13:50:49 +00:00
parent db6e198457
commit 6b1218ce02
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/utils.py
View file

@ -1134,32 +1134,39 @@ def recently_downvoted_post_replies(user_id) -> List[int]:
def languages_for_form():
result = []
used_languages = []
other_languages = []
if current_user.is_authenticated:
recently_used_post_languages = db.session.execute(text("""SELECT language_id
recently_used_language_ids = db.session.execute(text("""SELECT language_id
FROM (
SELECT language_id, posted_at
FROM "post"
WHERE user_id = :user_id
SELECT language_id, posted_at
FROM "post"
WHERE user_id = :user_id
UNION ALL
SELECT language_id, posted_at
FROM "post_reply"
WHERE user_id = :user_id
SELECT language_id, posted_at
FROM "post_reply"
WHERE user_id = :user_id
) AS subquery
GROUP BY language_id
ORDER BY MAX(posted_at) DESC
LIMIT 10"""),
{'user_id': current_user.id}).scalars()
for language in Language.query.filter(Language.id.in_(recently_used_post_languages)).all():
result.append((language.id, language.name))
used_languages.append(language.id)
{'user_id': current_user.id}).scalars().all()
# note: recently_used_language_ids is now a List, ordered with the most recently used at the top
# but Language.query.filter(Language.id.in_(recently_used_language_ids)) isn't guaranteed to return
# language results in the same order as that List :(
for language_id in recently_used_language_ids:
used_languages.append((language_id, ""))
for language in Language.query.order_by(Language.name).all():
if language.code != 'und' and language.id not in used_languages:
result.append((language.id, language.name))
try:
i = used_languages.index((language.id, ""))
used_languages[i] = (language.id, language.name)
except:
if language.code != "und":
other_languages.append((language.id, language.name))
return result
return used_languages + other_languages
def english_language_id():