X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=app%2Fblueprints%2Fhomepage%2F__init__.py;h=dfb3bd0388670c3c3b1d7dde343f2c057df4727c;hb=92fb54556ad0409a519c308e7e34b63e11621903;hp=03299484f7744abb0c908d8521aed2b6133b998e;hpb=7d0a93483acb7b81b94813957b41fb863cc8ea25;p=cheatdb.git

diff --git a/app/blueprints/homepage/__init__.py b/app/blueprints/homepage/__init__.py
index 0329948..dfb3bd0 100644
--- a/app/blueprints/homepage/__init__.py
+++ b/app/blueprints/homepage/__init__.py
@@ -15,16 +15,16 @@ def home():
 			joinedload(Package.license), \
 			joinedload(Package.media_license))
 
-	query   = Package.query.filter_by(approved=True, soft_deleted=False)
+	query   = Package.query.filter_by(state=PackageState.APPROVED)
 	count   = query.count()
 
-	new     = join(query.order_by(db.desc(Package.created_at))).limit(8).all()
+	new     = join(query.order_by(db.desc(Package.approved_at))).limit(8).all()
 	pop_mod = join(query.filter_by(type=PackageType.MOD).order_by(db.desc(Package.score))).limit(8).all()
 	pop_gam = join(query.filter_by(type=PackageType.GAME).order_by(db.desc(Package.score))).limit(4).all()
 	pop_txp = join(query.filter_by(type=PackageType.TXP).order_by(db.desc(Package.score))).limit(4).all()
 
 	updated = db.session.query(Package).select_from(PackageRelease).join(Package) \
-			.filter_by(soft_deleted=False, approved=True) \
+			.filter_by(state=PackageState.APPROVED) \
 			.order_by(db.desc(PackageRelease.releaseDate)) \
 			.limit(20).all()
 	updated = updated[:8]
@@ -34,5 +34,8 @@ def home():
 	downloads_result = db.session.query(func.sum(Package.downloads)).one_or_none()
 	downloads = 0 if not downloads_result or not downloads_result[0] else downloads_result[0]
 
-	return render_template("index.html", count=count, downloads=downloads, \
+	tags = db.session.query(func.count(Tags.c.tag_id), Tag) \
+		.select_from(Tag).outerjoin(Tags).group_by(Tag.id).order_by(db.asc(Tag.title)).all()
+
+	return render_template("index.html", count=count, downloads=downloads, tags=tags, \
 			new=new, updated=updated, pop_mod=pop_mod, pop_txp=pop_txp, pop_gam=pop_gam, reviews=reviews)