save

awakari · Apr 7, 2024 · ba76021 · ba76021
1 parent bd2798e
commit ba76021
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/api/grpc/tgbot/controller.go b/api/grpc/tgbot/controller.go
@@ -7,6 +7,7 @@ import (
 	"github.com/awakari/bot-telegram/service"
 	"github.com/awakari/bot-telegram/service/chats"
 	"github.com/awakari/bot-telegram/service/messages"
+	"github.com/awakari/bot-telegram/service/subscriptions"
 	"github.com/awakari/client-sdk-go/api"
 	"github.com/awakari/client-sdk-go/model/subscription"
 	tgverifier "github.com/electrofocus/telegram-auth-verifier"
@@ -142,7 +143,7 @@ func (c controller) Subscribe(ctx context.Context, req *SubscribeRequest) (resp
 		var d subscription.Data
 		d, err = c.clientAwk.ReadSubscription(groupIdCtx, userId, subId)
 		if err == nil {
-			_ = tgCtx.Send(fmt.Sprintf("New subscription \"%s\" is linked to this chat", d.Description))
+			_ = tgCtx.Send(fmt.Sprintf(subscriptions.MsgFmtChatLinked, d.Description, intervalDefault), telebot.ModeHTML, telebot.NoPreview)
 		}
 	}
 	return

diff --git a/service/chats/reader.go b/service/chats/reader.go
@@ -205,9 +205,9 @@ func (r *reader) checkExpiration(groupIdCtx context.Context) {
 		switch {
 		case sd.Expires.IsZero(): // never expires
 		case sd.Expires.Before(time.Now().UTC()):
-			_ = r.tgCtx.Send(msgExpired + fmt.Sprintf(msgFmtExtendSteps, sd.Description))
+			_ = r.tgCtx.Send(msgExpired + msgFmtExtendSteps)
 		case sd.Expires.Sub(time.Now().UTC()) < 168*time.Hour: // expires earlier than in 1 week
-			_ = r.tgCtx.Send(fmt.Sprintf(msgExpiresSoon, sd.Expires.Sub(time.Now().UTC()).Round(time.Minute)) + fmt.Sprintf(msgFmtExtendSteps, sd.Description))
+			_ = r.tgCtx.Send(fmt.Sprintf(msgExpiresSoon, sd.Expires.Sub(time.Now().UTC()).Round(time.Minute)) + msgFmtExtendSteps)
 		}
 	}
 }

diff --git a/service/subscriptions/start.go b/service/subscriptions/start.go
@@ -16,9 +16,9 @@ import (
 )
 
 const CmdStart = "sub_start"
-const msgFmtChatLinked = "Linked the subscription \"%s\" to this chat. " +
-	"New matching messages will appear here with a minimum interval of %s. " +
-	"Use the <a href=\"https://awakari.com/login.html\" target=\"blank\">app</a> to manage own subscriptions."
+const MsgFmtChatLinked = "Linked the subscription \"%s\" to this chat. " +
+	"New results will appear here. Min interval: %s. " +
+	"To manage own subscriptions use the <a href=\"https://awakari.com/login.html\" target=\"blank\">app</a>."
 
 var deliveryIntervalRows = [][]string{
 	{
@@ -115,7 +115,7 @@ func start(
 		subData, err = clientAwk.ReadSubscription(groupIdCtx, userId, subId)
 	}
 	if err == nil {
-		err = tgCtx.Send(fmt.Sprintf(msgFmtChatLinked, subData.Description, minInterval), telebot.ModeHTML)
+		err = tgCtx.Send(fmt.Sprintf(MsgFmtChatLinked, subData.Description, minInterval), telebot.ModeHTML, telebot.NoPreview)
 	}
 	if err == nil {
 		r := chats.NewReader(tgCtx, clientAwk, chatStor, chat.Id, chat.SubId, groupId, userId, msgFmt, minInterval)