Merge pull request #469 from danluki/feat/usedcommands-me

apps/parser/internal/commands/stats/user_me.go

@@ -27,8 +27,9 @@ var UserMe = &types.DefaultCommand{
 		result := &types.CommandsHandlerResult{
 			Result: []string{
 				fmt.Sprintf(
-					"$(%s) used emotes · $(%s) watched · $(%s) messages · $(%s) used points · $(%s) songs requested",
+					"$(%s) used emotes · $(%s) used commands · $(%s) watched · $(%s) messages · $(%s) used points · $(%s) songs requested",
 					user.Emotes.Name,
+					user.Commands.Name,
 					user.Watched.Name,
 					user.Messages.Name,
 					user.UsedChannelPoints.Name,

apps/parser/internal/variables/user/commands.go

@@ -0,0 +1,40 @@
+package user
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/samber/lo"
+	"github.com/satont/twir/apps/parser/internal/types"
+	model "github.com/satont/twir/libs/gomodels"
+)
+
+var Commands = &types.Variable{
+	Name:         "user.commands",
+	Description:  lo.ToPtr("User used commands count"),
+	CommandsOnly: true,
+	Handler: func(
+		ctx context.Context, parseCtx *types.VariableParseContext, variableData *types.VariableData,
+	) (*types.VariableHandlerResult, error) {
+		result := &types.VariableHandlerResult{}
+
+		var count int64
+		err := parseCtx.Services.Gorm.
+			WithContext(ctx).
+			Where(`"channelId" = ? AND "userId" = ?`, parseCtx.Channel.ID, parseCtx.Sender.ID).
+			Model(&model.ChannelsCommandsUsages{}).
+			Count(&count).
+			Error
+
+		if err != nil {
+			parseCtx.Services.Logger.Sugar().Error(err)
+
+			result.Result = "internal error"
+			return result, nil
+		}
+
+		result.Result = fmt.Sprint(count)
+
+		return result, nil
+	},
+}

apps/parser/internal/variables/variables.go

@@ -104,6 +104,7 @@ func New(opts *Opts) *Variables {
 			user.SongsRequestedDuration,
 			user.EmotesTop,
 			user.Watched,
+			user.Commands,
 			last_donate.Amount,
 			last_donate.Currency,
 			last_donate.UserName,