[twitter] Refactor common API calls on contacts

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 27af0f9f557db50ba5435afabc7567ca0ec20451..210f0fa9800f35774597257c760d05ba2f36225e 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -157,19 +157,7 @@ function twitter_follow(App $a, array &$contact)
 
        $uid = $a->getLoggedInUserId();
 
-       $ckey = DI::config()->get('twitter', 'consumerkey');
-       $csecret = DI::config()->get('twitter', 'consumersecret');
-       $otoken = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
-       $osecret = DI::pConfig()->get($uid, 'twitter', 'oauthsecret');
-
-       // If the addon is not configured (general or for this user) quit here
-       if (empty($ckey) || empty($csecret) || empty($otoken) || empty($osecret)) {
-               $contact = false;
-               return;
-       }
-
-       $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
-       $connection->post('friendships/create', ['screen_name' => $nickname]);
+       twitter_api_contact('friendships/create', ['network' => Protocol::TWITTER, 'nick' => $nickname], $uid);
 
        $user = twitter_fetchuser($nickname);
 
@@ -184,13 +172,15 @@ function twitter_follow(App $a, array &$contact)
 
 function twitter_unfollow(App $a, array &$hook_data)
 {
-       $contact = $hook_data['contact'];
+       $hook_data['result'] = twitter_api_contact('friendship/destroy', $hook_data['contact'], $hook_data['uid']);
+}
+
+function twitter_api_contact(string $apiPath, array $contact, int $uid): ?bool
+{
        if ($contact['network'] !== Protocol::TWITTER) {
-               return;
+               return null;
        }
 
-       $uid = $a->getLoggedInUserId();
-
        $ckey    = DI::config()->get('twitter', 'consumerkey');
        $csecret = DI::config()->get('twitter', 'consumersecret');
        $otoken  = DI::pConfig()->get($uid, 'twitter', 'oauthtoken');
@@ -198,17 +188,17 @@ function twitter_unfollow(App $a, array &$hook_data)
 
        // If the addon is not configured (general or for this user) quit here
        if (empty($ckey) || empty($csecret) || empty($otoken) || empty($osecret)) {
-               return;
+               return null;
        }
 
        try {
                $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
-               $result     = $connection->post('friendships/destroy', ['screen_name' => $contact['nick']]);
-               Logger::info('[twitter] API call "friendship/destroy" successful', ['result' => $result]);
-               $hook_data['result'] = true;
+               $result     = $connection->post($apiPath, ['screen_name' => $contact['nick']]);
+               Logger::info('[twitter] API call successful', ['apiPath' => $apiPath, 'result' => $result]);
+               return true;
        } catch (Exception $e) {
-               Logger::notice('[twitter] API call "friendships/destroy" failed', ['uid' => $uid, 'url' => $contact['url'], 'exception' => $e]);
-               $hook_data['result'] = false;
+               Logger::notice('[twitter] API call failed', ['apiPath' => $apiPath, 'uid' => $uid, 'url' => $contact['url'], 'exception' => $e]);
+               return false;
        }
 }