Sync with master branch.

CONTRIBUTING.md

@@ -0,0 +1,8 @@
+# Contribution
+
+Welcome programmer!
+
+If you want to contribute to Goinsta API you must follow a simple instructions.
+
+- **Test your code after making pull request**. The title says it all.
+- **Include jokes if you can**. This instruction is optional.

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Ahmadreza Zibaei
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,70 +1,99 @@
-# GoInsta. Make Goinsta Great Again!
-<p align="center"><img width=100% src="https://raw.github.com/ahmdrz/goinsta/master/resources/goinsta-image.png"></p>
+### Go + Instgaram API
+<p align="center"><img width=100% src="https://raw.githubusercontent.com/ahmdrz/goinsta/v1/resources/goinsta-image.png"></p>
 
 > Unofficial Instagram API for Golang
 
-[![Build Status](https://travis-ci.org/ahmdrz/goinsta.svg?branch=master)](https://travis-ci.org/ahmdrz/goinsta) [![GoDoc](https://godoc.org/github.com/ahmdrz/goinsta?status.svg)](https://godoc.org/github.com/ahmdrz/goinsta) [![Go Report Card](https://goreportcard.com/badge/github.com/ahmdrz/goinsta)](https://goreportcard.com/report/github.com/ahmdrz/goinsta) [![Coverage Status](https://coveralls.io/repos/github/ahmdrz/goinsta/badge.svg?branch=master)](https://coveralls.io/github/ahmdrz/goinsta?branch=master)
+[![GoDoc](https://godoc.org/github.com/ahmdrz/goinsta?status.svg)](https://godoc.org/github.com/ahmdrz/goinsta) [![Go Report Card](https://goreportcard.com/badge/github.com/ahmdrz/goinsta)](https://goreportcard.com/report/github.com/ahmdrz/goinsta)
 
-## Features
+### Features
 
 * **HTTP2 by default. Goinsta uses HTTP2 client enhancing performance.**
 * **Object independency. Can handle multiple instagram accounts.**
 * **Like Instagram mobile application**. Goinsta is very similar to Instagram official application.
 * **Simple**. Goinsta is made by lazy programmers!
 * **Backup methods**. You can use `Export` and `Import` functions.
 * **Security**. Your password is only required to login. After login your password is deleted.
-* **No External Dependencies**. Goinsta will not use any Go packages outside of the standard library.
+* **No External Dependencies**. GoInsta will not use any Go packages outside of the standard library.
 
-## New Version !
-
-We are working on `alpha` branch. Try it and tell us your suggestions!
-
-The newer versions will be exported into v2 branch when new features will be well tested.
-
-## Package installation 
+### Package installation 
 
 `go get -u -v gopkg.in/ahmdrz/goinsta.v2`
 
-## CLI installation
+### CLI installation
 
 ```
 go get -u -v gopkg.in/ahmdrz/goinsta.v2
 go install gopkg.in/ahmdrz/goinsta.v2/goinsta
 ```
 
-## Example
+### Example
 
 ```go
 package main
 
 import (
 	"fmt"
 
-	"github.com/ahmdrz/goinsta"
+	"gopkg.in/ahmdrz/goinsta.v2"
 )
 
 func main() {
-	insta := goinsta.New("USERNAME", "PASSWORD")
+  //insta, err := goinsta.Import("~/.goinsta")
+  insta := goinsta.New("USERNAME", "PASSWORD")
 
-	if err := insta.Login(); err != nil {
-		fmt.Println(err)
-		return
-	}
-	defer insta.Logout()
+  // also you can use New function from gopkg.in/ahmdrz/goinsta.v2/utils
 
-	...
+  // insta.SetProxy("http://localhost:8080", true) // true for insecure connections
+  if err := insta.Login(); err != nil {
+    fmt.Println(err)
+    return
+  }
+  // export your configuration
+  // after exporting you can use Import function instead of New function.
+  insta.Export("~/.goinsta")
+
+  ...
 }
 ```
 
-In the next examples you can use an optional argument to use cache config.
+* [**More Examples**](https://github.com/ahmdrz/goinsta/tree/master/examples)
+
+### Projects using `goinsta`
 
-* [**More Examples**](https://github.com/ahmdrz/goinsta/tree/v2/examples)
+- [instagraph](https://github.com/ahmdrz/instagraph)
+- [icrawler](https://github.com/themester/icrawler)
+- [go-instabot](https://github.com/tducasse/go-instabot)
+- [ermes](https://github.com/borteo/ermes)
+- [nick\_bot](https://github.com/icholy/nick_bot)
+- [goinstadownload](https://github.com/alejoloaiza/goinstadownload)
+- [instafeed](https://github.com/falzm/instafeed)
+- [keepig](https://github.com/seankhliao/keepig)
+- ...
 
-## Legal
+### Legal
 
 This code is in no way affiliated with, authorized, maintained, sponsored or endorsed by Instagram or any of its affiliates or subsidiaries. This is an independent and unofficial API. Use at your own risk.
 
-## Donate
+### Versioning
+
+Goinsta used gopkg.in as versioning control. Stable new API is the version v2.0. You can get it using:
+```bash
+go get -u -v gopkg.in/ahmdrz/goinsta.v2
+```
+
+### New version !
+
+We are working on a new object-oriented API. Try it and tell us your suggestions. See https://github.com/ahmdrz/goinsta/blob/master/CONTRIBUTING.md
+
+If you want to use the old version you can found it in v1 branch or using gopkg.in/ahmdrz/goinsta.v1/
+
+Sorry for breaking dependences :(. You can use this command in your project folder to update old master branch to v1.
+
+```bash
+for i in `grep -r ahmdrz ./ | awk '{split($0, a, ":"); print a[1]}'`; do sed -i 's/github\.com\/ahmdrz\/goinsta/gopkg\.in\/ahmdrz\/goinsta\.v1/g' $i; done
+```
+
+### Donate
 
 **Ahmdrz**
 
@@ -75,38 +104,5 @@ This code is in no way affiliated with, authorized, maintained, sponsored or end
 ![btc](https://raw.githubusercontent.com/reek/anti-adblock-killer/gh-pages/images/bitcoin.png) Bitcoin: `37aogDJYBFkdSJTWG7TgcpgNweGHPCy1Ks`
 
 
-
 [![Analytics](https://ga-beacon.appspot.com/UA-107698067-1/readme-page)](https://github.com/igrigorik/ga-beacon)
 
-
-## Schema
-
-Instagram
-- Account: Personal information and account interactions.
-  - Followers
-  - Following
-  - Feed
-  - Stories
-  - Liked
-  - Saved
-  - Tags
-- Profiles: User interaction.
-  - Blocked
-  - Get user using ID
-  - Get user using Username
-- Media:
-  - Comments
-  - Likes
-  - Likers
-- Search:
-  - Location
-  - Username
-  - Tags
-  - Location **Deprecated**
-  - Facebook
-- Activity:
-  - Following
-  - Recent
-- Hashtag: Hashtag allows user to search using hashtags.
-  - Stories
-  - Media

account.go

@@ -54,7 +54,7 @@ type Account struct {
 	SocialContext              string       `json:"social_context,omitempty"`
 	SearchSocialContext        string       `json:"search_social_context,omitempty"`
 	MutualFollowersCount       float64      `json:"mutual_followers_count"`
-	LatestReelMedia            int          `json:"latest_reel_media,omitempty"`
+	LatestReelMedia            int64        `json:"latest_reel_media,omitempty"`
 	CityID                     int64        `json:"city_id"`
 	CityName                   string       `json:"city_name"`
 	AddressStreet              string       `json:"address_street"`
@@ -77,14 +77,11 @@ func (account *Account) Sync() error {
 	if err != nil {
 		return err
 	}
-
-	body, err := insta.sendRequest(
-		&reqOptions{
-			Endpoint: urlSyncProfile,
-			Query:    generateSignature(data),
-			IsPost:   true,
-		},
-	)
+	body, err := insta.sendRequest(&reqOptions{
+		Endpoint: urlCurrentUser,
+		Query:    generateSignature(data),
+		IsPost:   true,
+	})
 	if err == nil {
 		resp := profResp{}
 		err = json.Unmarshal(body, &resp)
@@ -246,17 +243,27 @@ func (account *Account) Following() *Users {
 
 // Feed returns current account feed
 //
+// 	params can be:
+// 		string: timestamp of the minimum media timestamp.
+//
 // minTime is the minimum timestamp of media.
 //
 // For pagination use FeedMedia.Next()
-func (account *Account) Feed(minTime []byte) *FeedMedia {
+func (account *Account) Feed(params ...interface{}) *FeedMedia {
 	insta := account.inst
 
 	media := &FeedMedia{}
 	media.inst = insta
-	media.timestamp = string(minTime)
 	media.endpoint = urlUserFeed
 	media.uid = account.ID
+
+	for _, param := range params {
+		switch s := param.(type) {
+		case string:
+			media.timestamp = s
+		}
+	}
+
 	return media
 }
 
@@ -312,10 +319,36 @@ func (account *Account) Saved() (*SavedMedia, error) {
 	return nil, err
 }
 
+type editResp struct {
+	Status  string  `json:"status"`
+	Account Account `json:"user"`
+}
+
+func (account *Account) edit() {
+	insta := account.inst
+	acResp := editResp{}
+	body, err := insta.sendRequest(
+		&reqOptions{
+			Endpoint: urlCurrentUser,
+			Query: map[string]string{
+				"edit": "true",
+			},
+		},
+	)
+	if err == nil {
+		err = json.Unmarshal(body, &acResp)
+		if err == nil {
+			acResp.Account.inst = insta
+			*account = acResp.Account
+		}
+	}
+}
+
 // SetBiography changes your Instagram's biography.
 //
 // This function updates current Account information.
 func (account *Account) SetBiography(bio string) error {
+	account.edit() // preparing to edit
 	insta := account.inst
 	data, err := insta.prepareData(
 		map[string]interface{}{