Merge remote-tracking branch 'upstream/2021.12-rc' into avatar

This commit is contained in:
Michael 2022-01-30 19:00:14 +00:00
commit d527848dfc
285 changed files with 5862 additions and 2178 deletions

View file

@ -157,7 +157,10 @@ function twitter_follow(App $a, array &$contact)
$uid = $a->getLoggedInUserId();
twitter_api_contact('friendships/create', ['network' => Protocol::TWITTER, 'nick' => $nickname], $uid);
if (!twitter_api_contact('friendships/create', ['network' => Protocol::TWITTER, 'nick' => $nickname], $uid)) {
$contact = null;
return;
}
$user = twitter_fetchuser($nickname);