Turn a possibly empty field into a pointer

Author: PaulSonOfLars

bot.go

@@ -17,7 +17,7 @@ type Bot struct {
 	Token string
 
 	// The bot's User info, as returned by Bot.GetMe. Populated when created through the NewBot method.
-	User
+	*User
 	// The bot client to use to make requests
 	BotClient
 }
@@ -75,7 +75,7 @@ func NewBot(token string, opts *BotOpts) (*Bot, error) {
 		if err != nil {
 			return nil, fmt.Errorf("failed to check bot token: %w", err)
 		}
-		b.User = *botUser
+		b.User = botUser
 	}
 
 	return &b, nil

ext/botmapping_test.go

@@ -2,17 +2,11 @@ package ext
 
 import (
 	"testing"
-
-	"github.com/PaulSonOfLars/gotgbot/v2"
 )
 
 func Test_botMapping(t *testing.T) {
 	bm := botMapping{}
-	b := &gotgbot.Bot{
-		User:      gotgbot.User{},
-		Token:     "SOME_TOKEN",
-		BotClient: &gotgbot.BaseBotClient{},
-	}
+	b := NewTestBot()
 
 	var origBdata *botData
 	t.Run("addBot", func(t *testing.T) {
@@ -78,11 +72,7 @@ func Test_botMapping(t *testing.T) {
 
 func Test_botData_isUpdateChannelStopped(t *testing.T) {
 	bm := botMapping{}
-	b := &gotgbot.Bot{
-		User:      gotgbot.User{},
-		Token:     "SOME_TOKEN",
-		BotClient: &gotgbot.BaseBotClient{},
-	}
+	b := NewTestBot()
 
 	bData, err := bm.addBot(b, "", "")
 	if err != nil {

ext/common_test.go

@@ -2,6 +2,9 @@ package ext
 
 import (
 	"errors"
+	"math/rand"
+	"net/http"
+	"net/http/httptest"
 
 	"github.com/PaulSonOfLars/gotgbot/v2"
 )
@@ -37,3 +40,24 @@ func (u *Updater) InjectUpdate(token string, upd gotgbot.Update) error {
 	}
 	return d.ProcessUpdate(bData.bot, &upd, nil)
 }
+
+func NewTestBot() *gotgbot.Bot {
+	server := httptest.NewServer(nil)
+	return &gotgbot.Bot{
+		Token: "use-me",
+		User: &gotgbot.User{
+			Id:        rand.Int63(),
+			IsBot:     false,
+			FirstName: "gobot",
+			LastName:  "",
+			Username:  "gotgbot",
+		},
+		BotClient: &gotgbot.BaseBotClient{
+			Client: http.Client{},
+			DefaultRequestOpts: &gotgbot.RequestOpts{
+				Timeout: 0,
+				APIURL:  server.URL,
+			},
+		},
+	}
+}

ext/context.go

@@ -13,7 +13,7 @@ type Context struct {
 	// We store the info of the Bot that received this update so we can keep track of update ownership.
 	// We do NOT store full gotgbot.Bot struct, as that would leak the bot token and bot client information in what
 	// should be a data-only struct.
-	Bot gotgbot.User
+	Bot *gotgbot.User
 	// Data represents update-local storage.
 	// This can be used to pass data across handlers - for example, to cache operations relevant to the current update,
 	// such as admin checks.

ext/handlers/common_test.go

@@ -16,8 +16,8 @@ func NewTestBot() *gotgbot.Bot {
 	server := httptest.NewServer(nil)
 	return &gotgbot.Bot{
 		Token: "use-me",
-		User: gotgbot.User{
-			Id:        0,
+		User: &gotgbot.User{
+			Id:        rand.Int63(),
 			IsBot:     false,
 			FirstName: "gobot",
 			LastName:  "",

ext/updater_test.go

@@ -21,11 +21,7 @@ import (
 )
 
 func TestUpdaterThrowsErrorWhenSameWebhookAddedTwice(t *testing.T) {
-	b := &gotgbot.Bot{
-		User:      gotgbot.User{},
-		Token:     "SOME_TOKEN",
-		BotClient: &gotgbot.BaseBotClient{},
-	}
+	b := ext.NewTestBot()
 
 	d := ext.NewDispatcher(&ext.DispatcherOpts{})
 	u := ext.NewUpdater(d, nil)
@@ -45,12 +41,7 @@ func TestUpdaterThrowsErrorWhenSameWebhookAddedTwice(t *testing.T) {
 }
 
 func TestUpdaterSupportsWebhookReAdding(t *testing.T) {
-	b := &gotgbot.Bot{
-		User:      gotgbot.User{},
-		Token:     "SOME_TOKEN",
-		BotClient: &gotgbot.BaseBotClient{},
-	}
-
+	b := ext.NewTestBot()
 	d := ext.NewDispatcher(&ext.DispatcherOpts{})
 	u := ext.NewUpdater(d, nil)
 
@@ -117,7 +108,7 @@ func concurrentTest(t *testing.T) {
 	}
 
 	b := &gotgbot.Bot{
-		User:      gotgbot.User{},
+		User:      &gotgbot.User{},
 		Token:     "SOME_TOKEN",
 		BotClient: &gotgbot.BaseBotClient{},
 	}
@@ -449,7 +440,7 @@ func TestUpdaterSupportsLongPollReAdding(t *testing.T) {
 	}
 
 	b := &gotgbot.Bot{
-		User:  gotgbot.User{},
+		User:  &gotgbot.User{},
 		Token: "SOME_TOKEN",
 		BotClient: &gotgbot.BaseBotClient{
 			DefaultRequestOpts: reqOpts,