Kruto

Satont · Dec 23, 2023 · a11a828 · a11a828
1 parent fbe2c9e
commit a11a828
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 21 deletions.
diff --git a/internal/announcesender/impl_temporal.go b/internal/announcesender/impl_temporal.go
@@ -70,8 +70,8 @@ func (c *AnnounceSenderTemporal) SendOnline(ctx context.Context, opts ChannelOnl
 		if followerChat.Service == domain.ChatServiceTelegram {
 			err = c.messageSender.SendMessageTelegram(
 				ctx,
-				messagesender.Opts{
-					Target: messagesender.MessageTarget{
+				messagesender.TelegramOpts{
+					ServiceChatID: messagesender.MessageTarget{
 						ServiceChatID: followerChat.ChatID,
 					},
 					Text:     localizedString,
@@ -118,8 +118,8 @@ func (c *AnnounceSenderTemporal) SendOffline(ctx context.Context, opts ChannelOf
 		if followerChat.Service == domain.ChatServiceTelegram {
 			err = c.messageSender.SendMessageTelegram(
 				ctx,
-				messagesender.Opts{
-					Target: messagesender.MessageTarget{
+				messagesender.TelegramOpts{
+					ServiceChatID: messagesender.MessageTarget{
 						ServiceChatID: followerChat.ChatID,
 					},
 					Text: localizedString,
@@ -168,8 +168,8 @@ func (c *AnnounceSenderTemporal) SendTitleChange(
 		if followerChat.Service == domain.ChatServiceTelegram {
 			err = c.messageSender.SendMessageTelegram(
 				ctx,
-				messagesender.Opts{
-					Target: messagesender.MessageTarget{
+				messagesender.TelegramOpts{
+					ServiceChatID: messagesender.MessageTarget{
 						ServiceChatID: followerChat.ChatID,
 					},
 					Text: localizedString,
@@ -218,8 +218,8 @@ func (c *AnnounceSenderTemporal) SendCategoryChange(
 		if followerChat.Service == domain.ChatServiceTelegram {
 			err = c.messageSender.SendMessageTelegram(
 				ctx,
-				messagesender.Opts{
-					Target: messagesender.MessageTarget{
+				messagesender.TelegramOpts{
+					ServiceChatID: messagesender.MessageTarget{
 						ServiceChatID: followerChat.ChatID,
 					},
 					Text: localizedString,
@@ -268,8 +268,8 @@ func (c *AnnounceSenderTemporal) SendTitleAndCategoryChange(
 		if followerChat.Service == domain.ChatServiceTelegram {
 			err = c.messageSender.SendMessageTelegram(
 				ctx,
-				messagesender.Opts{
-					Target: messagesender.MessageTarget{
+				messagesender.TelegramOpts{
+					ServiceChatID: messagesender.MessageTarget{
 						ServiceChatID: followerChat.ChatID,
 					},
 					Text: localizedString,

diff --git a/internal/announcesender/impl_temporal_workflow.go b/internal/announcesender/impl_temporal_workflow.go
@@ -63,8 +63,8 @@ func (c *AnnounceSenderWorkflows) SendOnline(
 		if followerChat.Service == domain.ChatServiceTelegram {
 			err = c.messageSender.SendMessageTelegram(
 				ctx,
-				messagesender.Opts{
-					Target: messagesender.MessageTarget{
+				messagesender.TelegramOpts{
+					ServiceChatID: messagesender.MessageTarget{
 						ServiceChatID: followerChat.ChatID,
 					},
 					Text:     localizedString,

diff --git a/internal/messagesender/message_sender.go b/internal/messagesender/message_sender.go
@@ -5,17 +5,13 @@ import (
 )
 
 type MessageSender interface {
-	SendMessageTelegram(ctx context.Context, opts Opts) error
+	SendMessageTelegram(ctx context.Context, opts TelegramOpts) error
 	// For add new service we need to implement new method, for example:
-	// SendMessageDiscord(ctx context.Context, opts Opts) error
+	// SendMessageDiscord(ctx context.Context, opts TelegramOpts) error
 }
 
-type Opts struct {
-	Target   MessageTarget
-	Text     string
-	ImageURL string
-}
-
-type MessageTarget struct {
+type TelegramOpts struct {
 	ServiceChatID string
+	Text          string
+	ImageURL      string
 }
diff --git a/internal/messagesender/temporal/activity.go b/internal/messagesender/temporal/activity.go
@@ -0,0 +1 @@
+package temporal
diff --git a/internal/messagesender/temporal/impl.go b/internal/messagesender/temporal/impl.go
@@ -0,0 +1,20 @@
+package temporal
+
+import (
+	"context"
+
+	"github.com/satont/twitch-notifier/internal/messagesender"
+)
+
+func NewTemporal() *Temporal {
+	return &Temporal{}
+}
+
+type Temporal struct {
+}
+
+var _ messagesender.MessageSender = (*Temporal)(nil)
+
+func (m *Temporal) SendMessageTelegram(ctx context.Context, opts messagesender.TelegramOpts) error {
+	return nil
+}
diff --git a/internal/messagesender/temporal/workflow.go b/internal/messagesender/temporal/workflow.go
@@ -0,0 +1,20 @@
+package temporal
+
+import (
+	"github.com/satont/twitch-notifier/internal/messagesender"
+	"go.temporal.io/sdk/workflow"
+	"go.uber.org/fx"
+)
+
+type WorkflowOpts struct {
+	fx.In
+}
+
+func NewWorkflow(opts WorkflowOpts) *Workflow {
+	return &Workflow{}
+}
+
+type Workflow struct {
+}
+
+func (c *Workflow) SendTelegram(ctx workflow.Context, opts messagesender.TelegramOpts)
diff --git a/...humbnailchecker/temporal/impl_activity.go → ...nal/thumbnailchecker/temporal/activity.go b/...humbnailchecker/temporal/impl_activity.go → ...nal/thumbnailchecker/temporal/activity.go
diff --git a/...ailchecker/temporal/impl_activity_test.go → ...humbnailchecker/temporal/activity_test.go b/...ailchecker/temporal/impl_activity_test.go → ...humbnailchecker/temporal/activity_test.go
diff --git a/.../thumbnailchecker/temporal/impl_worker.go → internal/thumbnailchecker/temporal/worker.go b/.../thumbnailchecker/temporal/impl_worker.go → internal/thumbnailchecker/temporal/worker.go
diff --git a/...humbnailchecker/temporal/impl_workflow.go → ...nal/thumbnailchecker/temporal/workflow.go b/...humbnailchecker/temporal/impl_workflow.go → ...nal/thumbnailchecker/temporal/workflow.go
diff --git a/...ailchecker/temporal/impl_workflow_test.go → ...humbnailchecker/temporal/workflow_test.go b/...ailchecker/temporal/impl_workflow_test.go → ...humbnailchecker/temporal/workflow_test.go