stop storing Twitter account IDs twice

liberapay · Oct 29, 2018 · abf67a1 · abf67a1
1 parent 76d4a61
commit abf67a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/liberapay/elsewhere/twitter.py b/liberapay/elsewhere/twitter.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 from liberapay.elsewhere._base import PlatformOAuth1
-from liberapay.elsewhere._extractors import key, not_available
+from liberapay.elsewhere._extractors import drop_keys, key, not_available
 from liberapay.elsewhere._paginators import query_param_paginator
 
 
@@ -29,11 +29,12 @@ class Twitter(PlatformOAuth1):
     ratelimit_headers_prefix = 'x-rate-limit-'
 
     # User info extractors
-    x_user_id = key('id')
+    x_user_id = key('id_str')
     x_user_name = key('screen_name')
     x_display_name = key('name')
     x_email = not_available
     x_avatar_url = key('profile_image_url_https',
                        clean=lambda v: v.replace('_normal.', '.'))
     x_friends_count = key('friends_count')
     x_description = key('description')
+    x_extra_info_drop = drop_keys('id')
diff --git a/sql/branch.sql b/sql/branch.sql
@@ -10,7 +10,7 @@ UPDATE elsewhere
    AND json_typeof(extra_info) = 'object';
 
 UPDATE elsewhere
-   SET extra_info = (extra_info::jsonb - 'entities' - 'status')::json
+   SET extra_info = (extra_info::jsonb - 'id_str' - 'entities' - 'status')::json
  WHERE platform = 'twitter'
    AND json_typeof(extra_info) = 'object';