Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiples fixes: #194

Merged
merged 6 commits into from
Nov 8, 2017
Merged

Multiples fixes: #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
220d12c
Merge remote-tracking branch 'github/master'
Geolim4 Oct 20, 2017
534a655
Simplified endpoints urls
Geolim4 Oct 20, 2017
ba616c4
Merge remote-tracking branch 'github/master'
Geolim4 Nov 4, 2017
1b9c62e
Simplified endpoints urls (reverted from commit 534a655612c176d9ce564…
Geolim4 Nov 4, 2017
768999b
Multiples fixes:
Geolim4 Nov 4, 2017
374833f
Merge remote-tracking branch 'github/master'
Geolim4 Nov 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions src/InstagramScraper/Endpoints.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,68 +36,68 @@ class Endpoints

public static function getAccountPageLink($username)
{
return str_replace('{username}', urlencode($username), Endpoints::ACCOUNT_PAGE);
return str_replace('{username}', urlencode($username), static::ACCOUNT_PAGE);
}

public static function getAccountJsonLink($username)
{
return str_replace('{username}', urlencode($username), Endpoints::ACCOUNT_JSON_INFO);
return str_replace('{username}', urlencode($username), static::ACCOUNT_JSON_INFO);
}

public static function getAccountJsonInfoLinkByAccountId($id)
{
return str_replace('{userId}', urlencode($id), Endpoints::ACCOUNT_JSON_INFO_BY_ID);
return str_replace('{userId}', urlencode($id), static::ACCOUNT_JSON_INFO_BY_ID);
}

public static function getAccountMediasJsonLink($username, $maxId = '')
{
$url = str_replace('{username}', urlencode($username), Endpoints::ACCOUNT_MEDIAS);
$url = str_replace('{username}', urlencode($username), static::ACCOUNT_MEDIAS);
return str_replace('{max_id}', urlencode($maxId), $url);
}

public static function getMediaPageLink($code)
{
return str_replace('{code}', urlencode($code), Endpoints::MEDIA_LINK);
return str_replace('{code}', urlencode($code), static::MEDIA_LINK);
}

public static function getMediaJsonLink($code)
{
return str_replace('{code}', urlencode($code), Endpoints::MEDIA_JSON_INFO);
return str_replace('{code}', urlencode($code), static::MEDIA_JSON_INFO);
}

public static function getMediasJsonByLocationIdLink($facebookLocationId, $maxId = '')
{
$url = str_replace('{{facebookLocationId}}', urlencode($facebookLocationId), Endpoints::MEDIA_JSON_BY_LOCATION_ID);
$url = str_replace('{{facebookLocationId}}', urlencode($facebookLocationId), static::MEDIA_JSON_BY_LOCATION_ID);
return str_replace('{{maxId}}', urlencode($maxId), $url);
}

public static function getMediasJsonByTagLink($tag, $maxId = '')
{
$url = str_replace('{tag}', urlencode($tag), Endpoints::MEDIA_JSON_BY_TAG);
$url = str_replace('{tag}', urlencode($tag), static::MEDIA_JSON_BY_TAG);
return str_replace('{max_id}', urlencode($maxId), $url);
}

public static function getGeneralSearchJsonLink($query)
{
return str_replace('{query}', urlencode($query), Endpoints::GENERAL_SEARCH);
return str_replace('{query}', urlencode($query), static::GENERAL_SEARCH);
}

public static function getCommentsBeforeCommentIdByCode($code, $count, $commentId)
{
$url = str_replace('{{shortcode}}', urlencode($code), Endpoints::COMMENTS_BEFORE_COMMENT_ID_BY_CODE);
$url = str_replace('{{shortcode}}', urlencode($code), static::COMMENTS_BEFORE_COMMENT_ID_BY_CODE);
$url = str_replace('{{count}}', urlencode($count), $url);
return str_replace('{{commentId}}', urlencode($commentId), $url);
}

public static function getLastLikesByCodeLink($code)
{
$url = str_replace('{{code}}', urlencode($code), Endpoints::LAST_LIKES_BY_CODE);
$url = str_replace('{{code}}', urlencode($code), static::LAST_LIKES_BY_CODE);
return $url;
}

public static function getGraphQlUrl($queryId, $parameters)
{
$url = str_replace('{{queryId}}', urlencode($queryId), Endpoints::GRAPH_QL_QUERY_URL);
$url = str_replace('{{queryId}}', urlencode($queryId), static::GRAPH_QL_QUERY_URL);
foreach ($parameters as $key => $value) {
$url .= "&$key=$value";
}
Expand All @@ -106,13 +106,13 @@ public static function getGraphQlUrl($queryId, $parameters)

public static function getFollowUrl($accountId)
{
$url = str_replace('{{accountId}}', urlencode($accountId), Endpoints::FOLLOW_URL);
$url = str_replace('{{accountId}}', urlencode($accountId), static::FOLLOW_URL);
return $url;
}

public static function getFollowersJsonLink($accountId, $count, $after = '')
{
$url = str_replace('{{accountId}}', urlencode($accountId), Endpoints::FOLLOWERS_URL);
$url = str_replace('{{accountId}}', urlencode($accountId), static::FOLLOWERS_URL);
$url = str_replace('{{count}}', urlencode($count), $url);

if ($after === '') {
Expand Down
Loading