Atom: switch to converting AS1 id (instead of url) to Atom id

snarfed · snarfed · commit 93a64e91a5f5 · 2022-05-25T06:51:07.000-07:00
diff --git a/README.md b/README.md
@@ -292,6 +292,9 @@ Changelog
 ---
 ### 4.1 - unreleased
 
+* Atom:
+  * Switch to converting AS1 `id` (instead of `url`) to Atom `id`.
+
 - _Non-breaking changes_
 
 * Twitter
@@ -300,6 +303,7 @@ Changelog
 * Facebook
   * Scraping: extract post id from `_ft_` query param instead of `story_fbid`, which is now an opaque token that changes regularly. ([facebook-atom#27](https://github.com/snarfed/facebook-atom/issues/27))
 
+
 ### 4.0 - 2022-03-23
 
 _Breaking changes:_
diff --git a/granary/templates/_entry.atom b/granary/templates/_entry.atom
@@ -7,7 +7,7 @@
   {% endif %}
 
   {% set url = activity.url or obj.url %}
-  <id>{{ url }}</id>
+  <id>{{ activity.id or obj.id or url }}</id>
   <title>{{ activity.title|safe }}</title>
 
   {% if obj.summary %}
diff --git a/granary/tests/test_atom.py b/granary/tests/test_atom.py
@@ -19,7 +19,7 @@
 </author>
 
   <activity:object-type>http://activitystrea.ms/schema/1.0/photo</activity:object-type>
-  <id>https://www.instagram.com/p/ABC123/</id>
+  <id>tag:instagram.com:123_456</id>
   <title>this picture -&gt; is #abc @foo #xyz</title>
   <content type="xhtml">
   <div xmlns="http://www.w3.org/1999/xhtml">
@@ -80,14 +80,14 @@
 INSTAGRAM_ACTIVITY = {
   'objectType': 'activity',
   'verb': 'post',
-  'id': 'https://www.instagram.com/p/ABC123/',
+  'id': 'tag:instagram.com:123_456',
   'actor': {
     'displayName': 'Ryan B',
     'objectType': 'person',
     'url': 'https://www.instagram.com/snarfed/',
   },
   'object': {
-    'id': 'https://www.instagram.com/p/ABC123/',
+    'id': 'tag:instagram.com:123_456',
     'objectType': 'photo',
     'title': 'this picture -> is #abc @foo #xyz',
     'content': 'this picture -> is #abc @foo #xyz Le Truc',
diff --git a/granary/tests/test_facebook.py b/granary/tests/test_facebook.py
@@ -982,7 +982,7 @@ def tag_uri(name):
 
   <activity:object-type>http://activitystrea.ms/schema/1.0/image</activity:object-type>
 
-  <id>https://www.facebook.com/212038/posts/10100176064482163</id>
+  <id>tag:facebook.com:10100176064482163</id>
   <title>Checking another side project off my list. portablecontacts-unofficial is live! &amp;3 Super Happy Block...</title>
 
   <content type="xhtml">
diff --git a/granary/tests/test_instagram.py b/granary/tests/test_instagram.py
@@ -415,7 +415,7 @@ def tag_uri(name):
 
   <activity:object-type>http://activitystrea.ms/schema/1.0/photo</activity:object-type>
 
-  <id>https://www.instagram.com/p/ABC123/</id>
+  <id>tag:instagram.com:123_456</id>
   <title>this picture -&gt; is #abc @foo #xyz</title>
 
   <content type="xhtml">
diff --git a/granary/tests/test_twitter.py b/granary/tests/test_twitter.py
@@ -618,7 +618,7 @@ def tag_uri(name):
 
   <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
 
-  <id>https://twitter.com/snarfed_org/status/100</id>
+  <id>tag:twitter.com:100</id>
   <title>@twitter meets @seepicturely at #tcdisrupt &lt;3 first instagr.am/p/MuW67</title>
 
   <content type="xhtml">
