diff options
| author | Aaron Parecki <aaron@parecki.com> | 2016-12-17 15:30:58 -0800 | 
|---|---|---|
| committer | Aaron Parecki <aaron@parecki.com> | 2016-12-17 15:30:58 -0800 | 
| commit | 7d19f61b101ca30debc675018f5509fb28e3de1a (patch) | |
| tree | 16067e41f86d6aa99045d71795724a1e9d21dd7c /controllers | |
| parent | efd82f8ff808f9e9b706e978c04eb77cdb463886 (diff) | |
remove facebook/instagram stuff
Diffstat (limited to 'controllers')
| -rw-r--r-- | controllers/auth.php | 61 | ||||
| -rw-r--r-- | controllers/controllers.php | 70 | 
2 files changed, 6 insertions, 125 deletions
diff --git a/controllers/auth.php b/controllers/auth.php index f339ed4..c4efb1d 100644 --- a/controllers/auth.php +++ b/controllers/auth.php @@ -256,25 +256,6 @@ $app->get('/signout', function() use($app) {  }); -/* -$app->post('/auth/facebook', function() use($app) { -  if($user=require_login($app, false)) { -    $params = $app->request()->params(); -    // User just auth'd with facebook, store the access token -    $user->facebook_access_token = $params['fb_token']; -    $user->save(); - -    $app->response()->body(json_encode(array( -      'result' => 'ok' -    ))); -  } else { -    $app->response()->body(json_encode(array( -      'result' => 'error' -    ))); -  } -}); -*/ -  $app->post('/auth/twitter', function() use($app) {    if($user=require_login($app, false)) {      $params = $app->request()->params(); @@ -360,45 +341,3 @@ $app->get('/auth/twitter/callback', function() use($app) {      $app->redirect('/settings');    }  }); - -$app->get('/auth/instagram', function() use($app) { -  if($user=require_login($app, false)) { - -    $instagram = instagram_client(); - -    // If there is an existing Instagram auth token, check if it's valid -    if($user->instagram_access_token) { -      $instagram->setAccessToken($user->instagram_access_token); -      $igUser = $instagram->getUser(); - -      if($igUser && $igUser->meta->code == 200) { -        $app->response()['Content-type'] = 'application/json'; -        $app->response()->body(json_encode(array( -          'result' => 'ok', -          'username' => $igUser->data->username, -          'url' => $instagram->getLoginUrl(array('basic','likes')) -        ))); -        return; -      } -    } - -    $app->response()['Content-type'] = 'application/json'; -    $app->response()->body(json_encode(array( -      'result' => 'error', -      'url' => $instagram->getLoginUrl(array('basic','likes')) -    ))); -  } -}); - -$app->get('/auth/instagram/callback', function() use($app) { -  if($user=require_login($app)) { -    $params = $app->request()->params(); - -    $instagram = instagram_client(); -    $data = $instagram->getOAuthToken($params['code']); -    $user->instagram_access_token = $data->access_token; -    $user->save(); - -    $app->redirect('/settings'); -  } -}); diff --git a/controllers/controllers.php b/controllers/controllers.php index d6cad4f..1b832b9 100644 --- a/controllers/controllers.php +++ b/controllers/controllers.php @@ -314,7 +314,11 @@ $app->get('/email', function() use($app) {  $app->get('/settings', function() use($app) {    if($user=require_login($app)) { -    $html = render('settings', array('title' => 'Settings', 'include_facebook' => true, 'authorizing' => false)); +    $html = render('settings', [ +      'title' => 'Settings', +      'user' => $user, +      'authorizing' => false +    ]);      $app->response()->body($html);    }  }); @@ -339,54 +343,15 @@ $app->get('/settings/html-content', function() use($app) {    }  }); -$app->get('/favorite-popup', function() use($app) { -  if($user=require_login($app)) { -    $params = $app->request()->params(); - -    $html = $app->render('favorite-popup.php', array( -      'url' => $params['url'], -      'token' => $params['token'] -    )); -    $app->response()->body($html); -  } -}); -  function create_favorite(&$user, $url) {    $micropub_request = array(      'like-of' => $url    );    $r = micropub_post_for_user($user, $micropub_request); -  $facebook_id = false; -  $instagram_id = false;    $tweet_id = false; -  /* -  // Facebook likes are posted via Javascript, so pass the FB ID to the javascript code -  if(preg_match('/https?:\/\/(?:www\.)?facebook\.com\/(?:[^\/]+)\/posts\/(\d+)/', $url, $match)) { -    $facebook_id = $match[1]; -  } - -  if(preg_match('/https?:\/\/(?:www\.)?facebook\.com\/photo\.php\?fbid=(\d+)/', $url, $match)) { -    $facebook_id = $match[1]; -  } -  */ - -  if(preg_match('/https?:\/\/(?:www\.)?instagram\.com\/p\/([^\/]+)/', $url, $match)) { -    $instagram_id = $match[1]; -    if($user->instagram_access_token) { -      $instagram = instagram_client(); -      $instagram->setAccessToken($user->instagram_access_token); -      $ch = curl_init('https://api.instagram.com/v1/media/shortcode/' . $instagram_id . '?access_token=' . $user->instagram_access_token); -      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); -      $result = json_decode(curl_exec($ch)); - -      $result = $instagram->likeMedia($result->data->id); -    } else { -      // TODO: indicate that the instagram post couldn't be liked because no access token was available -    } -  } - +  // POSSE favorites to Twitter    if($user->twitter_access_token && preg_match('/https?:\/\/(?:www\.)?twitter\.com\/[^\/]+\/status(?:es)?\/(\d+)/', $url, $match)) {      $tweet_id = $match[1];      $twitter = new \TwitterOAuth\Api(Config::$twitterClientID, Config::$twitterClientSecret, @@ -417,29 +382,6 @@ function create_repost(&$user, $url) {    return $r;  } -$app->get('/favorite.js', function() use($app) { -  $app->response()->header("Content-type", "text/javascript"); -  if($user=require_login($app, false)) { -    $params = $app->request()->params(); - -    if(array_key_exists('url', $params)) { -      $r = create_favorite($user, $params['url']); - -      $app->response()->body($app->render('favorite-js.php', array( -        'url' => $params['url'], -        'like_url' => $r['location'], -        'error' => $r['error'], -        // 'facebook_id' => $facebook_id -      ))); -    } else { -      $app->response()->body('alert("no url");'); -    } - -  } else { -    $app->response()->body('alert("invalid token");'); -  } -}); -  $app->post('/favorite', function() use($app) {    if($user=require_login($app)) {      $params = $app->request()->params();  | 
