Merge branch 'develop'

* develop: fix: track channel tip tx (#1231)
consolelabs · Nov 15, 2023 · 5b85de2 · 5b85de2
2 parents b9cab86 + b22e21e
commit 5b85de2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 28 deletions.
diff --git a/pkg/entities/offchain_tip_bot.go b/pkg/entities/offchain_tip_bot.go
@@ -192,6 +192,7 @@ func (e *Entity) TransferTokenV2(req request.TransferV2Request) (*response.Trans
 		"channel_id":      req.ChannelId,
 		"channel_name":    req.ChannelName,
 		"channel_url":     req.ChannelUrl,
+		"channel_avatar":  req.ChannelAvatar,
 		"template":        template,
 	}
 

diff --git a/pkg/entities/vault.go b/pkg/entities/vault.go
@@ -343,22 +343,29 @@ func (e *Entity) TransferVaultToken(req *request.TransferVaultTokenRequest) erro
 	if req.Address != "" {
 		destination = req.Address
 	}
+	// get discord guild for tracking
+	guild, err := e.svc.Discord.GetGuild(req.GuildId)
+	if err != nil {
+		e.log.Fields(logger.Fields{"req": req}).Errorf(err, "[entity.TransferVaultToken] - e.svc.Discord.GetGuild failed")
+		return err
+	}
 
 	_, err = e.svc.MochiPay.TransferVaultMochiPay(request.MochiPayVaultRequest{
-		ProfileId:   treasurerRequest.RequesterProfileId,
-		Amount:      amountBigIntStr,
-		To:          destination,
-		PrivateKey:  privateKey,
-		Token:       token.Symbol,
-		Chain:       token.Chain.ChainId,
-		Name:        vault.Name,
-		VaultId:     vault.Id,
-		Reciever:    treasurerRequest.UserProfileId,
-		Message:     treasurerRequest.Message,
-		ListNotify:  listNotify,
-		RequestId:   treasurerRequest.Id,
-		Platform:    req.Platform,
-		MesssageUrl: treasurerRequest.MessageUrl,
+		ProfileId:    treasurerRequest.RequesterProfileId,
+		Amount:       amountBigIntStr,
+		To:           destination,
+		PrivateKey:   privateKey,
+		Token:        token.Symbol,
+		Chain:        token.Chain.ChainId,
+		Name:         vault.Name,
+		VaultId:      vault.Id,
+		Reciever:     treasurerRequest.UserProfileId,
+		Message:      treasurerRequest.Message,
+		ListNotify:   listNotify,
+		RequestId:    treasurerRequest.Id,
+		Platform:     req.Platform,
+		ServerName:   guild.Name,
+		ServerAvatar: guild.Icon,
 	})
 	if err != nil {
 		e.log.Fields(logger.Fields{"req": req}).Errorf(err, "[entity.TransferVaultToken] - e.svc.MochiPay.TransferVaultMochiPay failed")

diff --git a/pkg/request/offchain_tip_bot.go b/pkg/request/offchain_tip_bot.go
@@ -36,4 +36,5 @@ type TransferV2Request struct {
 	ChannelId      string                 `json:"channel_id"`
 	ChannelName    string                 `json:"channel_name"`
 	ChannelUrl     string                 `json:"channel_url"`
+	ChannelAvatar  string                 `json:"channel_avatar"`
 }
diff --git a/pkg/request/vault.go b/pkg/request/vault.go
@@ -82,20 +82,21 @@ type CreateTreasurerSubmission struct {
 }
 
 type MochiPayVaultRequest struct {
-	ProfileId   string   `json:"profile_id"`
-	PrivateKey  string   `json:"private_key"`
-	To          string   `json:"to"`
-	Amount      string   `json:"amount"`
-	Token       string   `json:"token"`
-	Chain       string   `json:"chain"`
-	Name        string   `json:"name"`
-	VaultId     int64    `json:"vault_id"`
-	Reciever    string   `json:"receiver"`
-	Message     string   `json:"message"`
-	ListNotify  []string `json:"list_notify"`
-	RequestId   int64    `json:"request_id"`
-	Platform    string   `json:"platform"`
-	MesssageUrl string   `json:"message_url"`
+	ProfileId    string   `json:"profile_id"`
+	PrivateKey   string   `json:"private_key"`
+	To           string   `json:"to"`
+	Amount       string   `json:"amount"`
+	Token        string   `json:"token"`
+	Chain        string   `json:"chain"`
+	Name         string   `json:"name"`
+	VaultId      int64    `json:"vault_id"`
+	Reciever     string   `json:"receiver"`
+	Message      string   `json:"message"`
+	ListNotify   []string `json:"list_notify"`
+	RequestId    int64    `json:"request_id"`
+	Platform     string   `json:"platform"`
+	ServerName   string   `json:"server_name"`
+	ServerAvatar string   `json:"server_avatar"`
 }
 
 type GetVaultsRequest struct {