fix: Issue with login and sorting order (#235)

* chore: Add context to error

* chore: Trimpath from compile binary

* fix: Fatal error when no users to store

* chore: Bump github.com/Davincible/goinsta/v3 to v3.2.6

* feat: Fetch followings in earliest order

* style: Fix cuddle issue

* refactor: Simplify store users code

Author: obalunenko

go.mod

@@ -3,7 +3,7 @@ module github.com/obalunenko/instadiff-cli
 go 1.19
 
 require (
-	github.com/Davincible/goinsta/v3 v3.1.3
+	github.com/Davincible/goinsta/v3 v3.2.6
 	github.com/briandowns/spinner v1.20.0
 	github.com/disintegration/imaging v1.6.2
 	github.com/hashicorp/go-multierror v1.1.1

go.sum

@@ -40,8 +40,8 @@ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7O
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/Davincible/goinsta/v3 v3.1.3 h1:0XMj7upEgRA/IWSDRS1+d8DLNYtRttCASKaNzQn1H7M=
-github.com/Davincible/goinsta/v3 v3.1.3/go.mod h1:jqCJarVJYVy1zJiXoIWU1zOZKmVCwdeQZbxIp8d+i3g=
+github.com/Davincible/goinsta/v3 v3.2.6 h1:+lNIWU6NABWd2VSGe83UQypnef+kzWwjmfgGihPbwD8=
+github.com/Davincible/goinsta/v3 v3.2.6/go.mod h1:jIDhrWZmttL/gtXj/mkCaZyeNdAAqW3UYjasOUW0YEw=
 github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=

internal/client/instagram/instagram.go

@@ -253,9 +253,6 @@ func (c *Client) UploadMedia(ctx context.Context, file io.Reader, mt media.Type)
 		Album:                nil,
 		Caption:              "",
 		IsStory:              isStory(mt),
-		IsIGTV:               false,
-		Title:                "",
-		IGTVPreview:          false,
 		MuteAudio:            false,
 		DisableComments:      false,
 		DisableLikeViewCount: false,
@@ -317,7 +314,7 @@ func (c *Client) UserFollowers(ctx context.Context, user models.User) ([]models.
 
 	u.SetInstagram(c.client)
 
-	return c.makeUsersList(ctx, u.Followers())
+	return c.makeUsersList(ctx, u.Followers(""))
 }
 
 // UserFollowings returns user followings.
@@ -329,7 +326,7 @@ func (c *Client) UserFollowings(ctx context.Context, user models.User) ([]models
 
 	u.SetInstagram(c.client)
 
-	return c.makeUsersList(ctx, u.Following())
+	return c.makeUsersList(ctx, u.Following("", goinsta.EarliestOrder))
 }
 
 // GetUserByName finds user by username.
@@ -372,12 +369,12 @@ func (c *Client) Unfollow(ctx context.Context, user models.User) error {
 
 // Followers returns list of followers.
 func (c *Client) Followers(ctx context.Context) ([]models.User, error) {
-	return c.makeUsersList(ctx, c.client.Account.Followers())
+	return c.makeUsersList(ctx, c.client.Account.Followers(""))
 }
 
 // Followings returns list of followings.
 func (c *Client) Followings(ctx context.Context) ([]models.User, error) {
-	return c.makeUsersList(ctx, c.client.Account.Following())
+	return c.makeUsersList(ctx, c.client.Account.Following("", goinsta.EarliestOrder))
 }
 
 // Username returns current account username.

internal/service/service.go

@@ -184,18 +184,13 @@ func (svc *Service) getUsers(ctx context.Context, bt models.UsersBatchType) ([]m
 		return nil, fmt.Errorf("find diff users: %w", err)
 	}
 
-	err = svc.storeUsers(ctx, models.UsersBatch{
+	batch := models.UsersBatch{
 		Users:     users,
 		Type:      bt,
 		CreatedAt: time.Now(),
-	})
-	if err != nil {
-		if errors.Is(err, ErrNoUsers) {
-			log.WithError(ctx, err).Warn("Failed to store users")
-
-			return users, nil
-		}
+	}
 
+	if err = svc.storeUsers(ctx, batch); err != nil && !errors.Is(err, ErrNoUsers) {
 		return nil, fmt.Errorf("store users [%s]: %w", bt.String(), err)
 	}
 
@@ -300,12 +295,13 @@ func (svc *Service) GetNotMutualFollowers(ctx context.Context) ([]models.User, e
 
 	bt := models.UsersBatchTypeNotMutual
 
-	err = svc.storeUsers(ctx, models.UsersBatch{
+	batch := models.UsersBatch{
 		Users:     notmutual,
 		Type:      bt,
 		CreatedAt: time.Now(),
-	})
-	if err != nil {
+	}
+
+	if err = svc.storeUsers(ctx, batch); err != nil && !errors.Is(err, ErrNoUsers) {
 		return nil, fmt.Errorf("store users [%s]: %w", bt, err)
 	}
 
@@ -889,7 +885,7 @@ func (svc *Service) UploadMedia(ctx context.Context, file io.Reader, mt media.Ty
 	}
 
 	if !mt.Valid() {
-		return errors.New("media type is invalid")
+		return fmt.Errorf("media type is invalid: %s", mt)
 	}
 
 	file, err := media.AddBorders(file, mt)

scripts/build/compile.sh

@@ -39,6 +39,6 @@ GO_BUILD_PACKAGE="${REPO_ROOT}/cmd/${APP}"
 
 rm -rf "${BIN_OUT}"
 
-go build -o "${BIN_OUT}" -a -ldflags "${GO_BUILD_LDFLAGS}" "${GO_BUILD_PACKAGE}"
+go build -o "${BIN_OUT}" -a -trimpath -ldflags "${GO_BUILD_LDFLAGS}" "${GO_BUILD_PACKAGE}"
 
 echo "Binary compiled at ${BIN_OUT}"