itsulu/FediFetcher
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include access token when fetching user followers/followings

Browse source 
GoToSocial requires authentication on these endpoints, and not supplying the token was causing these requests to fail
with a 401 error.

Fixes #117.
This commit is contained in:
Ruby Iris Juric 2024-10-08 19:08:30 +11:00
parent 5adea1cbb4
commit 3f4c87f91f
No known key found for this signature in database
GPG key ID: B6D7116C451A5B41
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
find_posts.py
View file

@ -301,9 +301,11 @@ def filter_known_users(users, known_users):
users users
)) ))
def get_new_followers(server, user_id, max, known_followers): def get_new_followers(server, user_id, access_token, max, known_followers):
"""Get any new followings for the specified user, up to the max number provided""" """Get any new followings for the specified user, up to the max number provided"""
followers = get_paginated_mastodon(f"https://{server}/api/v1/accounts/{user_id}/followers", max) followers = get_paginated_mastodon(f"https://{server}/api/v1/accounts/{user_id}/followers", max, {
"Authorization": f"Bearer {access_token}",
})
# Remove any we already know about # Remove any we already know about
new_followers = filter_known_users(followers, known_followers) new_followers = filter_known_users(followers, known_followers)
@ -312,9 +314,11 @@ def get_new_followers(server, user_id, max, known_followers):
return new_followers return new_followers
def get_new_followings(server, user_id, max, known_followings): def get_new_followings(server, user_id, access_token, max, known_followings):
"""Get any new followings for the specified user, up to the max number provided""" """Get any new followings for the specified user, up to the max number provided"""
following = get_paginated_mastodon(f"https://{server}/api/v1/accounts/{user_id}/following", max) following = get_paginated_mastodon(f"https://{server}/api/v1/accounts/{user_id}/following", max, {
"Authorization": f"Bearer {access_token}",
})
# Remove any we already know about # Remove any we already know about
new_followings = filter_known_users(following, known_followings) new_followings = filter_known_users(following, known_followings)
@ -1698,13 +1702,13 @@ if __name__ == "__main__":
if arguments.max_followings > 0: if arguments.max_followings > 0:
logger.info(f"Getting posts from last {arguments.max_followings} followings") logger.info(f"Getting posts from last {arguments.max_followings} followings")
user_id = get_user_id(arguments.server, arguments.user, token) user_id = get_user_id(arguments.server, arguments.user, token)
followings = get_new_followings(arguments.server, user_id, arguments.max_followings, all_known_users) followings = get_new_followings(arguments.server, user_id, token, arguments.max_followings, all_known_users)
add_user_posts(arguments.server, token, followings, known_followings, all_known_users, seen_urls, seen_hosts) add_user_posts(arguments.server, token, followings, known_followings, all_known_users, seen_urls, seen_hosts)
if arguments.max_followers > 0: if arguments.max_followers > 0:
logger.info(f"Getting posts from last {arguments.max_followers} followers") logger.info(f"Getting posts from last {arguments.max_followers} followers")
user_id = get_user_id(arguments.server, arguments.user, token) user_id = get_user_id(arguments.server, arguments.user, token)
followers = get_new_followers(arguments.server, user_id, arguments.max_followers, all_known_users) followers = get_new_followers(arguments.server, user_id, token, arguments.max_followers, all_known_users)
add_user_posts(arguments.server, token, followers, recently_checked_users, all_known_users, seen_urls, seen_hosts) add_user_posts(arguments.server, token, followers, recently_checked_users, all_known_users, seen_urls, seen_hosts)
if arguments.max_follow_requests > 0: if arguments.max_follow_requests > 0:

13
tests/test_find_posts.py
View file

@ -448,14 +448,17 @@ def test_get_new_followers(
server = "server" server = "server"
user_id = 1 user_id = 1
access_token = "access_token"
max = 50 max = 50
known_followers = ["follower1"] known_followers = ["follower1"]
expected_result = ["follower2", "follower3"] expected_result = ["follower2", "follower3"]
result = find_posts.get_new_followers(server, user_id, max, known_followers) result = find_posts.get_new_followers(server, user_id, access_token, max, known_followers)
mock_get_paginated_mastodon.assert_called_once_with( mock_get_paginated_mastodon.assert_called_once_with(
f"https://{server}/api/v1/accounts/{user_id}/followers", max f"https://{server}/api/v1/accounts/{user_id}/followers", max, {
"Authorization": f"Bearer {access_token}",
},
) )
mock_filter_known_users.assert_called_once_with( mock_filter_known_users.assert_called_once_with(
["follower1", "follower2", "follower3"], known_followers ["follower1", "follower2", "follower3"], known_followers
@ -473,9 +476,11 @@ def test_get_new_followings(
): ):
mock_get_paginated_mastodon.return_value = ["user1", "user2", "user3"] mock_get_paginated_mastodon.return_value = ["user1", "user2", "user3"]
mock_filter_known_users.return_value = ["user1", "user2"] mock_filter_known_users.return_value = ["user1", "user2"]
result = get_new_followings("server", "100", 5, "known_users") result = get_new_followings("server", "100", "access_token", 5, "known_users")
mock_get_paginated_mastodon.assert_called_with( mock_get_paginated_mastodon.assert_called_with(
"https://server/api/v1/accounts/100/following", 5 "https://server/api/v1/accounts/100/following", 5, {
"Authorization": "Bearer access_token",
}
) )
mock_filter_known_users.assert_called_with( mock_filter_known_users.assert_called_with(
["user1", "user2", "user3"], "known_users" ["user1", "user2", "user3"], "known_users"