Don't index apps that are hidden (#52)

Author: hellcp

appstore/commands.py

@@ -404,9 +404,18 @@ def generate_index():
     apps = App.query.order_by(App.id)
     result = []
     for app in apps:
-        result.append(algolia_app(app))
+        if app.visible:
+            result.append(algolia_app(app))
     print(flask.json.dumps(result, indent=2))
 
+
+@apps.command('remove-hidden-apps-index')
+def remove_hidden_apps_index():
+    apps = App.query.filter_by(visible=False).order_by(App.id)
+    if algolia_index:
+        algolia_index.delete_objects([app.id for app in apps])
+
+
 @apps.command('update-patched-release')
 @click.argument('new_pbw')
 @click.argument('patchlvl')
@@ -513,7 +522,7 @@ def path(base):
     upload_pbw(release, path(pbw_file))
     db.session.commit()
 
-    if algolia_index:
+    if algolia_index and app_obj.visible:
         algolia_index.partial_update_objects([algolia_app(app_obj)], { 'createIfNotExists': True })
 
 @apps.command('update-app')
@@ -562,9 +571,12 @@ def path(base):
     print(f"Created release {release.id}")
     upload_pbw(release, path(pbw_file))
     db.session.commit()
-    
+
     if algolia_index:
-        algolia_index.partial_update_objects([algolia_app(app_obj)], { 'createIfNotExists': True })
+        if app_obj.visible:
+            algolia_index.partial_update_objects([algolia_app(app_obj)], { 'createIfNotExists': False })
+        else:
+            algolia_index.delete_objects([app_obj.id])
 
 
 def init_app(app):

appstore/dev_portal_api.py

@@ -131,7 +131,7 @@ def add_heart(app_id):
         return
     except IntegrityError:
         return "already hearted", 400
-    if algolia_index:
+    if algolia_index and app.visible:
         algolia_index.partial_update_object({'objectID': app_id, 'hearts': app.hearts}, no_create=True)
     return 'ok'
 
@@ -147,7 +147,7 @@ def remove_heart(app_id):
     db.session.delete(like)
     App.query.filter_by(id=app_id).update({'hearts': App.hearts - 1})
     db.session.commit()
-    if algolia_index:
+    if algolia_index and app.visible:
         algolia_index.partial_update_object({'objectID': app_id, 'hearts': app.hearts}, no_create=True)
     return 'ok'
 

appstore/developer_portal_api.py

@@ -157,6 +157,10 @@ def submit_new_app():
             app_is_timeline_enabled = True
             timeline_token = secrets.token_urlsafe(32)
 
+        is_visible = True
+        if 'visible' in params and params['visible'] == 'false':
+            is_visible = False
+
         # Remove any platforms with no screenshots
         screenshots = {k: v for k, v in screenshots.items() if v}
         app_obj = App(
@@ -182,6 +186,7 @@ def submit_new_app():
             type=params['type'],
             timeline_enabled=app_is_timeline_enabled,
             timeline_token=timeline_token,
+            visible=is_visible,
             website=params['website'] if 'website' in params else "",
         )
         db.session.add(app_obj)
@@ -196,7 +201,7 @@ def submit_new_app():
         upload_pbw(release, request.files['pbw'])
         db.session.commit()
 
-        if algolia_index:
+        if algolia_index and app_obj.visible:
             algolia_index.partial_update_objects([algolia_app(app_obj)], { 'createIfNotExists': True })
 
         try:
@@ -272,7 +277,10 @@ def update_app_fields(app_id):
 
         db.session.commit()
         if algolia_index:
-            algolia_index.partial_update_objects([algolia_app(app)], { 'createIfNotExists': False })
+            if app.visible:
+                algolia_index.partial_update_objects([algolia_app(app)], { 'createIfNotExists': False })
+            else:
+                algolia_index.delete_objects([app_id])
 
         return jsonify(success=True, id=app.id)