Fix 2 filter_by bugs

Fixes #101

app/views/packages/__init__.py

@@ -37,11 +37,11 @@ def build_packages_query():
 		type = PackageType[type_name.upper()]
 
 	title = "Packages"
-	query = Package.query.filter_by(soft_deleted=False)
+	query = Package.query.filter_by(soft_deleted=False, approved=True)
 
 	if type is not None:
 		title = type.value + "s"
-		query = query.filter_by(type=type, approved=True)
+		query = query.filter_by(type=type)
 
 	search = request.args.get("q")
 	if search is not None and search.strip() != "":

app/views/threads.py

@@ -27,8 +27,10 @@ from wtforms.validators import *
 
 @app.route("/threads/")
 def threads_page():
-	threads = Thread.query.filter_by(private=False).all()
-	return render_template("threads/list.html", threads=threads)
+	query = Thread.query
+	if not Permission.SEE_THREAD.check(current_user):
+		query = query.filter_by(private=False)
+	return render_template("threads/list.html", threads=query.all())
 
 @app.route("/threads/<int:id>/", methods=["GET", "POST"])
 def thread_page(id):