Merge pull request #45 from pebble-dev/add_reporting_endpoint

Add flag endpoint

Author: Willow-Systems

appstore/dev_portal_api.py

@@ -6,7 +6,8 @@
 from sqlalchemy.orm.exc import NoResultFound
 
 from .utils import authed_request, demand_authed_request, get_uid
-from .models import LockerEntry, UserLike, db, App, Developer
+from .models import LockerEntry, UserLike, db, App, Developer, UserFlag
+from .discord import report_app_flag
 from .settings import config
 
 parent_app = None
@@ -27,13 +28,14 @@ def me():
     rebble_id = me['rebble_id']
     added_ids = [x.app_id for x in LockerEntry.query.filter_by(user_id=rebble_id)]
     voted_ids = [x.app_id for x in UserLike.query.filter_by(user_id=rebble_id)]
+    flagged_ids = [x.app_id for x in UserFlag.query.filter_by(user_id=rebble_id)]
     return jsonify({
         'users': [{
             'id': me['id'],
             'uid': me['uid'],
             'added_ids': added_ids,
             'voted_ids': voted_ids,
-            'flagged_ids': [],
+            'flagged_ids': flagged_ids,
             'applications': [],
             'name': me['name'],
             'href': request.url,
@@ -148,6 +150,35 @@ def remove_heart(app_id):
         algolia_index.partial_update_object({'objectID': app_id, 'hearts': app.hearts}, no_create=True)
     return 'ok'
 
+@legacy_api.route('/applications/<app_id>/add_flag', methods=['POST'])
+def add_flag(app_id):
+    uid = get_uid()
+
+    try:
+        app = App.query.filter_by(id=app_id).one()
+        flag = UserFlag(user_id=uid, app_id=app_id)
+        db.session.add(flag)
+        db.session.commit()
+        report_app_flag(app.title, app.developer.name, app_id, app.app_uuid)
+    except NoResultFound:
+        abort(404)
+        return
+    except IntegrityError:
+        return jsonify(error="already flagged",e="flag.exists"), 400
+    return 'ok'
+
+
+@legacy_api.route('/applications/<app_id>/remove_flag', methods=['POST'])
+def remove_flag(app_id):
+    uid = get_uid()
+    try:
+        flag = UserFlag.query.filter_by(app_id=app_id, user_id=uid).one()
+    except NoResultFound:
+        return ''
+    db.session.delete(flag)
+    db.session.commit()
+    return 'ok'
+
 
 def init_app(app, url_prefix='/api/v0'):
     global parent_app

appstore/discord.py

@@ -93,7 +93,7 @@ def announce_new_app(app, is_generated):
             "fields": request_fields
         }]
     }
-    
+
     send_discord_webhook(request_data, is_generated)
 
 def audit_log(operation, affected_app_uuid = None):
@@ -127,6 +127,39 @@ def audit_log(operation, affected_app_uuid = None):
 
     send_admin_discord_webhook(request_data)
 
+def report_app_flag(app_name, developer_name, app_id, affected_app_uuid = None):
+
+    if affected_app_uuid is not None:
+        if config["TEST_APP_UUID"] is not None and config["TEST_APP_UUID"] == str(affected_app_uuid):
+            return
+
+    request_fields = [{
+             "name": "App",
+             "value": app_name
+         },
+         {
+             "name": "Developer",
+             "value": developer_name
+         }
+     ]
+
+    request_data = {
+        "embeds": [{
+            "title": f"New Flagged App Report 🚩",
+            "color": int("0xFF4745", 0),
+            "description": f"An end user has reported an app on the appstore from within a mobile app.",
+            "thumbnail": {
+                "url": "https://i.imgur.com/5f6rGQ9.png",
+                "height": 80,
+                "width": 80
+            },
+            "url": f"{config['APPSTORE_ROOT']}/application/{app_id}",
+            "fields": request_fields
+        }]
+    }
+
+    send_admin_discord_webhook(request_data)
+
 def send_discord_webhook(request_data, is_generated = False):
     if not is_generated:
         if config['DISCORD_HOOK_URL'] is not None:
@@ -135,7 +168,7 @@ def send_discord_webhook(request_data, is_generated = False):
     else:
         if config['DISCORD_GENERATED_HOOK_URL'] is not None:
             headers = {'Content-Type': 'application/json'}
-            requests.post(config['DISCORD_GENERATED_HOOK_URL'], data=json.dumps(request_data), headers=headers)            
+            requests.post(config['DISCORD_GENERATED_HOOK_URL'], data=json.dumps(request_data), headers=headers)
 
 def send_admin_discord_webhook(request_data):
     if config['DISCORD_ADMIN_HOOK_URL'] is not None:

appstore/models.py

@@ -168,6 +168,13 @@ class UserLike(db.Model):
     app = db.relationship('App')
 db.Index('user_like_app_user_index', UserLike.app_id, UserLike.user_id, unique=True)
 
+class UserFlag(db.Model):
+    __tablename__ = "user_flags"
+    user_id = db.Column(db.Integer(), primary_key=True, index=True)
+    app_id = db.Column(db.String(24), db.ForeignKey('apps.id', ondelete='cascade'), primary_key=True, index=True)
+    app = db.relationship('App')
+db.Index('user_flag_app_user_index', UserFlag.app_id, UserFlag.user_id, unique=True)
+
 def init_app(app):
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
     db.init_app(app)

appstore/utils.py

@@ -136,8 +136,8 @@ def jsonify_app(app: App, target_hw: str) -> dict:
             'share': f"{config['APPSTORE_ROOT']}/application/{app.id}",
             'add': 'https://a',
             'remove': 'https://b',
-            'add_flag': 'https://c',
-            'remove_flag': 'https://d',
+            'add_flag': url_for('legacy_api.add_flag', app_id=app.id, _external=True),
+            'remove_flag': url_for('legacy_api.remove_flag', app_id=app.id, _external=True),
         },
         'list_image': {
             '80x80': generate_image_url(app.icon_large, 80, 80, True),
@@ -209,14 +209,16 @@ def asset_fallback(collections: Dict[str, AssetCollection], target_hw='basalt')
     # and given that, produce the sanest possible result.
     # In particular, monochrome devices have colour fallbacks to reduce the chance of
     # ending up with round screenshots.
+    # 13 Aug 25 - WM - Apparently we are getting a lot of requests with 'unknown' as the target_hw.
+    # Anyone failing to identify will be presumed to be diorite.
     fallbacks = {
         'aplite': ['aplite', 'diorite', 'basalt'],
         'basalt': ['basalt', 'aplite'],
         'chalk': ['chalk', 'basalt'],
         'diorite': ['diorite', 'aplite', 'basalt'],
         'emery': ['emery', 'basalt', 'diorite', 'aplite']
     }
-    fallback = fallbacks[target_hw]
+    fallback = fallbacks[target_hw] if target_hw in fallbacks else fallbacks['diorite']
     for hw in fallback:
         if hw in collections:
             return collections[hw]

migrations/versions/ddb71f0a1c96_add_user_reports_table.py

@@ -0,0 +1,30 @@
+"""Add user_reports table
+
+Revision ID: ddb71f0a1c96
+Revises: c4e0470dc040
+Create Date: 2025-08-19 23:16:05.018578
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'ddb71f0a1c96'
+down_revision = 'c4e0470dc040'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_table(
+        'user_flags',
+        sa.Column('user_id', sa.Integer(), nullable=False),
+        sa.Column('app_id', sa.String(length=24), nullable=False),
+        sa.PrimaryKeyConstraint('app_id', 'user_id', name='user_flags_pkey')
+    )
+
+
+def downgrade():
+    op.drop_table('user_flags')
+