forgot to save modified twitter.py module

This commit is contained in:
Tristan Lee
2022-05-09 09:37:36 -05:00
parent b13e62eb5d
commit e2d922301e

View File

@@ -874,18 +874,6 @@ class _TwitterAPIScraper(snscrape.base.Scraper):
kwargs['cashtags'] = [o['text'] for o in tweet['entities']['symbols']]
if card:
kwargs['card'] = card
<<<<<<< HEAD
# Try to convert the URL to the non-shortened/t.co one
try:
i = kwargs['tcooutlinks'].index(card.url)
except ValueError:
_logger.warning('Could not find card URL in tcooutlinks')
except KeyError:
# retweets are missing this attribute
pass
else:
card.url = kwargs['outlinks'][i]
=======
if hasattr(card, 'url') and '//t.co/' in card.url:
# Try to convert the URL to the non-shortened/t.co one
# Retweets inherit the card but not the outlinks; try to get them from the retweeted tweet instead in that case.
@@ -895,7 +883,6 @@ class _TwitterAPIScraper(snscrape.base.Scraper):
card.url = retweetedTweet.outlinks[retweetedTweet.tcooutlinks.index(card.url)]
else:
_logger.warning(f'Could not translate t.co card URL on tweet {tweetId}')
>>>>>>> ed3ea944d177157d688786470c8369198b0ce8ce
return Tweet(**kwargs)
def _make_medium(self, medium, tweetId):