From 9680f6f83ef75d7d7fc03966141ac7272c3a4202 Mon Sep 17 00:00:00 2001
From: Ryan Barrett <git@ryanb.org>
Date: Thu, 2 Feb 2023 20:03:55 -0800
Subject: [PATCH] Activity => Object: drop /recent, tweak feed queries, update
 datastore indices

---
 index.yaml          | 31 +++++++------------------------
 models.py           |  4 ++--
 pages.py            | 16 +---------------
 tests/test_pages.py |  8 ++++----
 4 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/index.yaml b/index.yaml
index fbb2a6b..0c84d9c 100644
--- a/index.yaml
+++ b/index.yaml
@@ -6,37 +6,20 @@ indexes:
 # index.yaml file manually, remove the "# AUTOGENERATED" marker line above.
 # If you want to manage some indexes manually, move them above the marker line.
 
-- kind: Response
+- kind: Object
   properties:
-  - name: status
+  - name: domains
+  - name: labels
   - name: updated
+    direction: asc
 
-- kind: Response
+- kind: Object
   properties:
-  - name: status
+  - name: domains
+  - name: labels
   - name: updated
     direction: desc
 
-- kind: Response
-  properties:
-  - name: domain
-  - name: status
-  - name: updated
-
-- kind: Response
-  properties:
-  - name: domain
-  - name: status
-  - name: updated
-    direction: desc
-
-- kind: Response
-  properties:
-  - name: direction
-  - name: domain
-  - name: created
-    direction: desc
-
 - kind: Follower
   properties:
   - name: dest
diff --git a/models.py b/models.py
index 69bbc20..9d2f741 100644
--- a/models.py
+++ b/models.py
@@ -326,8 +326,8 @@ class Object(StringIdModel):
     undelivered = ndb.StructuredProperty(Target, repeated=True)
     failed = ndb.StructuredProperty(Target, repeated=True)
 
-    created = ndb.DateTimeProperty()#auto_now_add=True)
-    updated = ndb.DateTimeProperty()#auto_now=True)
+    created = ndb.DateTimeProperty(auto_now_add=True)
+    updated = ndb.DateTimeProperty(auto_now=True)
 
     def proxy_url(self):
         """Returns the Bridgy Fed proxy URL to render this post as HTML."""
diff --git a/pages.py b/pages.py
index 1da61ea..5aaabbb 100644
--- a/pages.py
+++ b/pages.py
@@ -79,8 +79,8 @@ def user(domain):
     assert not user.use_instead
 
     query = Object.query(
-        Object.status.IN(('new', 'in progress', 'complete')),
         Object.domains == domain,
+        Object.labels == 'notification',
     )
     objects, before, after = fetch_objects(query)
 
@@ -158,20 +158,6 @@ def feed(domain):
         return body, {'Content-Type': rss.CONTENT_TYPE}
 
 
-@app.get('/recent')
-def recent():
-    """Renders recent objects, with links to logs."""
-    query = Object.query(Object.status.IN(('new', 'in progress', 'complete')))
-    objects, before, after = fetch_objects(query)
-    return render_template(
-        'recent.html',
-        show_domains=True,
-        logs=logs,
-        util=util,
-        **locals(),
-    )
-
-
 def fetch_objects(query):
     """Fetches a page of Object entities from a datastore query.
 
diff --git a/tests/test_pages.py b/tests/test_pages.py
index af71c39..d06cde7 100644
--- a/tests/test_pages.py
+++ b/tests/test_pages.py
@@ -33,15 +33,15 @@ class PagesTest(testutil.TestCase):
     @staticmethod
     def add_objects():
         # post
-        Object(id='a', domains=['foo.com'], labels=['feed'],
+        Object(id='a', domains=['foo.com'], labels=['feed', 'notification'],
                  as1=json_dumps(NOTE)).put()
         # different domain
-        Object(id='b', domains=['bar.org'], labels=['feed'],
+        Object(id='b', domains=['bar.org'], labels=['feed', 'notification'],
                as1=json_dumps(MENTION)).put()
         # reply
-        Object(id='d', domains=['foo.com'], labels=['feed'],
+        Object(id='d', domains=['foo.com'], labels=['feed', 'notification'],
                as1=json_dumps(COMMENT)).put()
-        # not feed
+        # not feed/notif
         Object(id='e', domains=['foo.com'], as1=json_dumps(NOTE)).put()
 
     def test_user(self):