make User.sent_dms per-protocol by changing its type to Target

for #1205, #1148, #966, #1024

models.py

@@ -83,7 +83,7 @@ OBJECT_EXPIRE_TYPES = (
 )
 OBJECT_EXPIRE_AGE = timedelta(days=90)
 
-# Types of DMs that we send
+# Types of DMs that we send. Used in User.sent_dms
 DMS = (
     'follow_request_from_bridged_user',
     'replied_to_bridged_user',
@@ -197,8 +197,10 @@ class User(StringIdModel, metaclass=ProtocolUserMeta):
     # reset_protocol_properties.
     enabled_protocols = ndb.StringProperty(repeated=True, choices=list(PROTOCOLS.keys()))
 
-    # DMs that we've attempted to send to this user
-    sent_dms = ndb.StringProperty(repeated=True, choices=DMS)
+    # DMs that we've attempted to send to this user. Target.protocol is the
+    # protocol we sent the DM about (and the bot account it came from),
+    # Target.uri is the type of DM.
+    sent_dms = ndb.StructuredProperty(Target, repeated=True, choices=DMS)
 
     created = ndb.DateTimeProperty(auto_now_add=True)
     updated = ndb.DateTimeProperty(auto_now=True)
@@ -505,7 +507,7 @@ class User(StringIdModel, metaclass=ProtocolUserMeta):
             user = self.key.get()
             if to_proto.LABEL not in user.enabled_protocols:
                 user.enabled_protocols.append(to_proto.LABEL)
-                add(user.sent_dms, 'welcome')
+                add(user.sent_dms, Target(protocol=to_proto.LABEL, uri='welcome'))
                 user.put()
                 nonlocal added
                 added = True

tests/test_integrations.py

@@ -380,7 +380,7 @@ class IntegrationTests(TestCase):
         # check results
         user = ActivityPub.get_by_id('https://inst/alice')
         self.assertTrue(user.is_enabled(ATProto))
-        self.assertEqual(['welcome'], user.sent_dms)
+        self.assertEqual([Target(protocol='atproto', uri='welcome')], user.sent_dms)
 
         self.assertEqual(1, len(user.copies))
         self.assertEqual('atproto', user.copies[0].protocol)
@@ -505,7 +505,8 @@ class IntegrationTests(TestCase):
 
         user = ATProto.get_by_id('did:plc:alice')
         self.assertTrue(user.is_enabled(ActivityPub))
-        self.assertEqual(['welcome'], user.sent_dms)
+        self.assertEqual([Target(protocol='activitypub', uri='welcome')],
+                         user.sent_dms)
 
         headers = {
             'Content-Type': 'application/json',