Skip to content

Commit

Permalink
feat: use greetings repository in bots and events
Browse files Browse the repository at this point in the history
  • Loading branch information
@Satont
Satont committed Dec 19, 2024
1 parent c4aadf1 commit 549f40d
Show file tree
Hide file tree
Showing 9 changed files with 390 additions and 107 deletions.
22 changes: 13 additions & 9 deletions apps/bots/internal/stream-handlers/stream-handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,35 @@ import (

"github.com/satont/twir/libs/logger"
bus_core "github.com/twirapp/twir/libs/bus-core"
"github.com/twirapp/twir/libs/repositories/greetings"
"go.uber.org/fx"
"gorm.io/gorm"
)

type PubSubHandlers struct {
db *gorm.DB
logger logger.Logger
bus *bus_core.Bus
db *gorm.DB
logger logger.Logger
bus *bus_core.Bus
greetingsRepository greetings.Repository
}

type Opts struct {
fx.In

LC fx.Lifecycle

DB *gorm.DB
Bus *bus_core.Bus
Logger logger.Logger
DB *gorm.DB
Bus *bus_core.Bus
Logger logger.Logger
GreetingsRepository greetings.Repository
}

func New(opts Opts) {
service := &PubSubHandlers{
db: opts.DB,
logger: opts.Logger,
bus: opts.Bus,
db: opts.DB,
logger: opts.Logger,
bus: opts.Bus,
greetingsRepository: opts.GreetingsRepository,
}

opts.LC.Append(
Expand Down
12 changes: 9 additions & 3 deletions apps/bots/internal/stream-handlers/streams_online.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import (
"context"
"log/slog"

"github.com/samber/lo"
model "github.com/satont/twir/libs/gomodels"
"github.com/twirapp/twir/libs/bus-core/twitch"
"github.com/twirapp/twir/libs/repositories/greetings"
)

func (c *PubSubHandlers) streamsOnline(
Expand All @@ -25,9 +27,13 @@ func (c *PubSubHandlers) streamsOnline(
return struct{}{}
}

err := c.db.Model(&model.ChannelsGreetings{}).
Where(`"channelId" = ?`, channel.ID).
Update("processed", false).Error
err := c.greetingsRepository.UpdateManyByChannelID(
ctx, greetings.UpdateManyInput{
ChannelID: channel.ID,
Processed: lo.ToPtr(false),
},
)

if err != nil {
c.logger.Error(
"cannot update channel greetings",
Expand Down
6 changes: 6 additions & 0 deletions apps/events/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import (
"github.com/twirapp/twir/libs/grpc/clients"
"github.com/twirapp/twir/libs/grpc/tokens"
"github.com/twirapp/twir/libs/grpc/websockets"
greetingsrepository "github.com/twirapp/twir/libs/repositories/greetings"
greetingsrepositorypgx "github.com/twirapp/twir/libs/repositories/greetings/pgx"
"github.com/twirapp/twir/libs/uptrace"
"go.uber.org/fx"
)
Expand All @@ -21,6 +23,10 @@ var App = fx.Module(
"events",
baseapp.CreateBaseApp(baseapp.Opts{AppName: "events"}),
fx.Provide(
fx.Annotate(
greetingsrepositorypgx.NewFx,
fx.As(new(greetingsrepository.Repository)),
),
func(config cfg.Config) tokens.TokensClient {
return clients.NewTokens(config.AppEnv)
},
Expand Down
116 changes: 84 additions & 32 deletions apps/events/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,103 +1,155 @@
module github.com/satont/twir/apps/events

go 1.23.0
go 1.23.2

toolchain go1.23.4

replace (
github.com/satont/twir/libs/config => ../../libs/config
github.com/satont/twir/libs/gomodels => ../../libs/gomodels
github.com/satont/twir/libs/pubsub => ../../libs/pubsub
github.com/satont/twir/libs/sentry => ../../libs/sentry
github.com/satont/twir/libs/twitch => ../../libs/twitch
github.com/satont/twir/libs/types => ../../libs/types
github.com/twirapp/twir/libs/api => ../../libs/api
github.com/twirapp/twir/libs/baseapp => ../../libs/baseapp
github.com/twirapp/twir/libs/grpc => ../../libs/grpc
github.com/twirapp/twir/libs/integrations => ../../libs/integrations
github.com/twirapp/twir/libs/repositories => ../../libs/repositories
github.com/twirapp/twir/libs/uptrace => ../../libs/uptrace
github.com/satont/twir/libs/pubsub => ../../libs/pubsub
)

require (
github.com/goccy/go-json v0.10.3
github.com/google/uuid v1.6.0
github.com/guregu/null v4.0.0+incompatible
github.com/nicklaw5/helix/v2 v2.25.3
github.com/redis/go-redis/v9 v9.6.1
github.com/nicklaw5/helix/v2 v2.30.0
github.com/redis/go-redis/v9 v9.7.0
github.com/samber/lo v1.47.0
github.com/satont/twir/libs/config v0.0.0-20240126231400-72985ccc25a5
github.com/satont/twir/libs/config v0.0.0-20241105005614-f68dbf11ade1
github.com/satont/twir/libs/gomodels v0.0.0-20240225024146-742838c78cea
github.com/satont/twir/libs/logger v0.0.0-20241219050524-c4aadf14459f
github.com/satont/twir/libs/twitch v0.0.0-20231203205548-e635accc6b72
github.com/satont/twir/libs/types v0.0.0-20231203205548-e635accc6b72
github.com/twirapp/twir/libs/bus-core v0.0.0-20240225024146-742838c78cea
github.com/twirapp/twir/libs/grpc v0.0.0-20240126231400-72985ccc25a5
github.com/satont/twir/libs/types v0.0.0-20241026093228-a5284254dcfe
github.com/satont/twir/libs/utils v0.0.0-20241219050524-c4aadf14459f
github.com/twirapp/twir/libs/api v0.0.0-00010101000000-000000000000
github.com/twirapp/twir/libs/baseapp v0.0.0-00010101000000-000000000000
github.com/twirapp/twir/libs/bus-core v0.0.0-20241219050524-c4aadf14459f
github.com/twirapp/twir/libs/grpc v0.0.0-20241105005614-f68dbf11ade1
github.com/twirapp/twir/libs/integrations v0.0.0-00010101000000-000000000000
github.com/twirapp/twir/libs/repositories v0.0.0-00010101000000-000000000000
github.com/twirapp/twir/libs/uptrace v0.0.0-00010101000000-000000000000
github.com/valyala/fasttemplate v1.2.2
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0
go.temporal.io/sdk v1.25.1
go.uber.org/fx v1.22.2
golang.org/x/sync v0.8.0
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.35.1
gorm.io/gorm v1.25.12
)

require (
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/Masterminds/squirrel v1.5.4 // indirect
github.com/andybalholm/brotli v1.1.1 // indirect
github.com/avito-tech/go-transaction-manager/drivers/pgxv5/v2 v2.0.0 // indirect
github.com/avito-tech/go-transaction-manager/trm/v2 v2.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cloudflare/circl v1.3.9 // indirect
github.com/cloudflare/circl v1.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/exaring/otelpgx v0.7.0 // indirect
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
github.com/getsentry/sentry-go v0.28.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/gogo/status v1.1.1 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/imroc/req/v3 v3.43.7 // indirect
github.com/imroc/req/v3 v3.48.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/pgx/v5 v5.7.1 // indirect
github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/joho/godotenv v1.5.1 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/nats-io/nats.go v1.37.0 // indirect
github.com/nats-io/nkeys v0.4.7 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/onsi/ginkgo/v2 v2.20.0 // indirect
github.com/onsi/ginkgo/v2 v2.21.0 // indirect
github.com/pborman/uuid v1.2.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/quic-go v0.46.0 // indirect
github.com/quic-go/qpack v0.5.1 // indirect
github.com/quic-go/quic-go v0.48.1 // indirect
github.com/redis/go-redis/extra/rediscmd/v9 v9.7.0 // indirect
github.com/redis/go-redis/extra/redisotel/v9 v9.7.0 // indirect
github.com/refraction-networking/utls v1.6.7 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/rs/zerolog v1.33.0 // indirect
github.com/samber/slog-common v0.17.1 // indirect
github.com/samber/slog-multi v1.2.0 // indirect
github.com/samber/slog-sentry/v2 v2.8.0 // indirect
github.com/samber/slog-zerolog/v2 v2.7.0 // indirect
github.com/satont/twir/libs/pubsub v0.0.0-00010101000000-000000000000 // indirect
github.com/satont/twir/libs/sentry v0.0.0-00010101000000-000000000000 // indirect
github.com/satori/go.uuid v1.2.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.3.2 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.3.2 // indirect
github.com/uptrace/uptrace-go v1.27.1 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.53.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect
go.opentelemetry.io/otel/log v0.4.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.temporal.io/api v1.24.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/dig v1.18.0 // indirect
go.uber.org/mock v0.4.0 // indirect
go.uber.org/mock v0.5.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.24.0 // indirect
golang.org/x/tools v0.26.0 // indirect
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/driver/postgres v1.5.9 // indirect
)
Loading

0 comments on commit 549f40d

Please sign in to comment.