repo_name stringlengths 1 62 | dataset stringclasses 1 value | lang stringclasses 11 values | pr_id int64 1 20.1k | owner stringlengths 2 34 | reviewer stringlengths 2 39 | diff_hunk stringlengths 15 262k | code_review_comment stringlengths 1 99.6k |
|---|---|---|---|---|---|---|---|
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,117 @@
+package smr
+
+import (
+ "context"
+ "encoding/json"
+ "errors"
+
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/redis/rueidis"
+ "github.com/sourcegraph/conc/pool"
+)
+
+func (s *Service) AddTask(taskInfo types.TaskInfo) error {
+ result, err := json.Marshal(&taskInfo)
+ if err != nil {
+ return err
+ }
+
+ err = s.redisClient.Do(context.Background(), s.redisClient.B().Lpush().Key("smr/task").Element(string(result)).Build()).Error()
+ if err != nil {
+ return err
+ }
+
+ s.logger.
+ WithField("url", taskInfo.Url).
+ WithField("platform", taskInfo.Platform).
+ Info("smr service: task added")
+
+ // TODO: #111 should reject ongoing smr request in the same chat
+ return nil
+}
+
+func (s *Service) stop() {
+ if s.alreadyClosed {
+ return
+ }
+ s.closeChan <- struct{}{}
+ close(s.closeChan) | 用 context.CancelFunc 关？ |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,117 @@
+package smr
+
+import (
+ "context"
+ "encoding/json"
+ "errors"
+
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/redis/rueidis"
+ "github.com/sourcegraph/conc/pool"
+)
+
+func (s *Service) AddTask(taskInfo types.TaskInfo) error {
+ result, err := json.Marshal(&taskInfo)
+ if err != nil {
+ return err
+ }
+
+ err = s.redisClient.Do(context.Background(), s.redisClient.B().Lpush().Key("smr/task").Element(string(result)).Build()).Error()
+ if err != nil {
+ return err
+ }
+
+ s.logger.
+ WithField("url", taskInfo.Url).
+ WithField("platform", taskInfo.Platform).
+ Info("smr service: task added")
+
+ // TODO: #111 should reject ongoing smr request in the same chat
+ return nil
+}
+
+func (s *Service) stop() {
+ if s.alreadyClosed {
+ return
+ }
+ s.closeChan <- struct{}{}
+ close(s.closeChan)
+}
+
+func (s *Service) getTask() (types.TaskInfo, error) {
+ var info types.TaskInfo
+
+ res, err := s.redisClient.Do(context.Background(), s.redisClient.B().Brpop().Key("smr/task").Timeout(10).Build()).AsStrSlice()
+ if err != nil {
+ return info, err
+ }
+
+ err = json.Unmarshal([]byte(res[1]), &info)
+ if err != nil {
+ return info, err
+ }
+
+ return info, err
+}
+
+func (s *Service) run() {
+ s.queue = types.NewTaskQueue()
+ s.closeChan = make(chan struct{})
+ s.started = true
+
+ s.logger.Info("smr service started")
+
+ needToClose := false
+
+ taskRunner := pool.New().WithMaxGoroutines(10)
+
+ for {
+ select {
+ case <-s.closeChan:
+ s.logger.WithField("last tasks count", s.queue.Len()).Info("smr service: received stop signal, waiting for all tasks done")
+
+ needToClose = true
+ default:
+ }
+
+ // get task
+ if s.queue.Len() >= 10 {
+ continue
+ }
+
+ info, err := s.getTask()
+ if err != nil {
+ if errors.Is(err, rueidis.Nil) {
+ continue
+ }
+
+ s.logger.WithError(err).Warn("smr service: failed to get task")
+
+ continue
+ }
+
+ s.queue.AddTask(info)
+ taskRunner.Go(func() {
+ defer func() {
+ err2 := recover()
+ if err2 != nil {
+ s.logger.
+ WithField("err", err2).
+ WithField("task", info).
+ Error("smr service: task failed with panic")
+ }
+ }()
+
+ s.processor(info)
+ s.queue.RemoveTask()
+ })
+
+ if needToClose {
+ break
+ } | 可以放 select 上面方便读 |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -12,5 +13,6 @@ func NewModules() fx.Option {
fx.Provide(health.NewHealth()),
fx.Provide(pprof.NewPprof()),
fx.Provide(autorecap.NewAutoRecapService()),
+ fx.Provide(smr.NewService()), | 其实我没有太理解为什么要单独加一个 service，是为了避免并发造成的 OOM 吗？ |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -39,20 +31,16 @@ func (h *Handlers) Handle(c *tgbot.Context) (tgbot.Response, error) {
return nil, tgbot.NewExceptionError(err)
}
- ctx, cancel := context.WithTimeout(context.Background(), time.Minute*2)
- defer cancel()
+ err = h.smrService.AddTask(types.TaskInfo{
+ Platform: smr.FromPlatformTelegram,
+ Url: urlString, | URL |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,157 @@
+package handlers
+
+import (
+ "context"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrqueue"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrutils"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/ent"
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot/services"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/sirupsen/logrus"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewHandlers()),
+ )
+}
+
+type NewHandlersParam struct {
+ fx.In
+
+ Config *configs.Config
+ Logger *logger.Logger
+ Ent *datastore.Ent
+ SmrQueue *smrqueue.Queue
+ Services *services.Services
+}
+
+type Handlers struct {
+ config *configs.Config
+ logger *logger.Logger
+ ent *datastore.Ent
+ smrQueue *smrqueue.Queue
+ services *services.Services
+}
+
+func NewHandlers() func(param NewHandlersParam) *Handlers {
+ return func(param NewHandlersParam) *Handlers {
+ return &Handlers{
+ config: param.Config,
+ ent: param.Ent,
+ logger: param.Logger,
+ smrQueue: param.SmrQueue,
+ services: param.Services,
+ }
+ }
+}
+
+type receivedCommandInfo struct {
+ Command string `form:"command"`
+ Text string `form:"text"`
+ ResponseUrl string `form:"response_url"`
+ UserID string `form:"user_id"`
+ ChannelID string `form:"channel_id"`
+ TeamID string `form:"team_id"`
+}
+
+func (h *Handlers) PostCommandInfo(ctx *gin.Context) {
+ var body receivedCommandInfo
+ if err := ctx.Bind(&body); err != nil {
+ ctx.AbortWithStatus(http.StatusBadRequest)
+ h.logger.WithField("error", err.Error()).Warn("failed to bind request body, maybe slack request definition changed") | ```suggestion
h.logger.WithField("error", err.Error()).Warn("failed to bind request body, type definition of slack request body may have changed")
``` |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,157 @@
+package handlers
+
+import (
+ "context"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrqueue"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrutils"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/ent"
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot/services"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/sirupsen/logrus"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewHandlers()),
+ )
+}
+
+type NewHandlersParam struct {
+ fx.In
+
+ Config *configs.Config
+ Logger *logger.Logger
+ Ent *datastore.Ent
+ SmrQueue *smrqueue.Queue
+ Services *services.Services
+}
+
+type Handlers struct {
+ config *configs.Config
+ logger *logger.Logger
+ ent *datastore.Ent
+ smrQueue *smrqueue.Queue
+ services *services.Services
+}
+
+func NewHandlers() func(param NewHandlersParam) *Handlers {
+ return func(param NewHandlersParam) *Handlers {
+ return &Handlers{
+ config: param.Config,
+ ent: param.Ent,
+ logger: param.Logger,
+ smrQueue: param.SmrQueue,
+ services: param.Services,
+ }
+ }
+}
+
+type receivedCommandInfo struct {
+ Command string `form:"command"`
+ Text string `form:"text"`
+ ResponseUrl string `form:"response_url"`
+ UserID string `form:"user_id"`
+ ChannelID string `form:"channel_id"`
+ TeamID string `form:"team_id"`
+}
+
+func (h *Handlers) PostCommandInfo(ctx *gin.Context) {
+ var body receivedCommandInfo
+ if err := ctx.Bind(&body); err != nil {
+ ctx.AbortWithStatus(http.StatusBadRequest)
+ h.logger.WithField("error", err.Error()).Warn("failed to bind request body, maybe slack request definition changed")
+
+ return
+ }
+
+ h.logger.WithFields(logrus.Fields{
+ "user_id": body.UserID,
+ "channel_id": body.ChannelID,
+ }).Infof("slack: command received: /smr %s", body.Text) | ```suggestion
}).Trace("slack: command received: /smr %s", body.Text)
``` |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,157 @@
+package handlers
+
+import (
+ "context"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrqueue"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrutils"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/ent"
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot/services"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/sirupsen/logrus"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewHandlers()),
+ )
+}
+
+type NewHandlersParam struct {
+ fx.In
+
+ Config *configs.Config
+ Logger *logger.Logger
+ Ent *datastore.Ent
+ SmrQueue *smrqueue.Queue
+ Services *services.Services
+}
+
+type Handlers struct {
+ config *configs.Config
+ logger *logger.Logger
+ ent *datastore.Ent
+ smrQueue *smrqueue.Queue
+ services *services.Services
+}
+
+func NewHandlers() func(param NewHandlersParam) *Handlers {
+ return func(param NewHandlersParam) *Handlers {
+ return &Handlers{
+ config: param.Config,
+ ent: param.Ent,
+ logger: param.Logger,
+ smrQueue: param.SmrQueue,
+ services: param.Services,
+ }
+ }
+}
+
+type receivedCommandInfo struct {
+ Command string `form:"command"`
+ Text string `form:"text"`
+ ResponseUrl string `form:"response_url"`
+ UserID string `form:"user_id"`
+ ChannelID string `form:"channel_id"`
+ TeamID string `form:"team_id"`
+}
+
+func (h *Handlers) PostCommandInfo(ctx *gin.Context) {
+ var body receivedCommandInfo
+ if err := ctx.Bind(&body); err != nil {
+ ctx.AbortWithStatus(http.StatusBadRequest)
+ h.logger.WithField("error", err.Error()).Warn("failed to bind request body, maybe slack request definition changed")
+
+ return
+ }
+
+ h.logger.WithFields(logrus.Fields{
+ "user_id": body.UserID,
+ "channel_id": body.ChannelID,
+ }).Infof("slack: command received: /smr %s", body.Text)
+
+ urlString := body.Text
+
+ err := smrutils.CheckUrl(urlString)
+ if err != nil {
+ if smrutils.IsUrlCheckError(err) {
+ ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage(err.Error())) | 这种也可以用 AbortWithStatus 么？ |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -1,34 +1,26 @@
package summarize
import (
- "context"
- "errors"
- "net/url"
- "time"
-
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
- "github.com/samber/lo"
-
"github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrutils"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
"github.com/nekomeowww/insights-bot/pkg/bots/tgbot"
)
func (h *Handlers) Handle(c *tgbot.Context) (tgbot.Response, error) {
urlString := c.Update.Message.CommandArguments()
- if urlString == "" {
- if c.Update.Message.ReplyToMessage != nil && c.Update.Message.ReplyToMessage.Text != "" {
- urlString = c.Update.Message.ReplyToMessage.Text
- } else {
- return nil, tgbot.NewMessageError("没有找到链接，可以发送一个有效的链接吗？用法：/smr <链接>").WithReply(c.Update.Message)
- }
+ if urlString == "" && c.Update.Message.ReplyToMessage != nil && c.Update.Message.ReplyToMessage.Text != "" {
+ urlString = c.Update.Message.ReplyToMessage.Text
}
- parsedURL, err := url.Parse(urlString)
+ err := smrutils.CheckUrl(urlString)
if err != nil {
- return nil, tgbot.NewMessageError("你发来的链接无法被理解，可以重新发一个试试。用法：/smr <链接>").WithReply(c.Update.Message)
- }
- if parsedURL.Scheme == "" || !lo.Contains([]string{"http", "https"}, parsedURL.Scheme) {
- return nil, tgbot.NewMessageError("你发来的链接无法被理解，可以重新发一个试试。用法：/smr <链接>").WithReply(c.Update.Message)
+ if smrutils.IsUrlCheckError(err) {
+ return nil, tgbot.NewMessageError(err.Error()).WithReply(c.Update.Message)
+ }
+
+ return nil, tgbot.NewMessageError("出现了一些问题，可以再试试？").WithReply(c.Update.Message) | ```suggestion
return nil, tgbot.NewExceptionError(err).WithReply(c.Update.Message)
``` |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -39,20 +31,16 @@ func (h *Handlers) Handle(c *tgbot.Context) (tgbot.Response, error) {
return nil, tgbot.NewExceptionError(err)
}
- ctx, cancel := context.WithTimeout(context.Background(), time.Minute*2)
- defer cancel()
+ err = h.smrQueue.AddTask(types.TaskInfo{
+ Platform: smr.FromPlatformTelegram,
+ Url: urlString,
+ ChatID: c.Update.Message.Chat.ID,
+ MessageID: processingMessage.MessageID,
+ })
- summarization, err := h.smr.SummarizeInputURL(ctx, urlString, smr.FromPlatformTelegram)
if err != nil {
- if errors.Is(err, smr.ErrContentNotSupported) {
- return nil, tgbot.NewMessageError("暂时不支持量子速读这样的内容呢，可以换个别的链接试试。").WithEdit(&processingMessage)
- }
- if errors.Is(err, smr.ErrNetworkError) || errors.Is(err, smr.ErrRequestFailed) {
- return nil, tgbot.NewMessageError("量子速读的链接读取失败了哦。可以再试试？").WithEdit(&processingMessage)
- }
-
- return nil, tgbot.NewMessageError("量子速读失败了。可以再试试？").WithEdit(&processingMessage)
+ return nil, tgbot.NewMessageError("量子速读请求发送失败了，可以再试试？").WithEdit(&processingMessage) | ```suggestion
return nil, tgbot.NewExceptionError(err).WithMessage("量子速读失败了。可以再试试？").WithEdit(&processingMessage)
```
文案上不需要包含这种细节，可以用 ExceptionError + err 传递的方式处理掉 |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,9 @@
+package smr
+
+import "errors"
+
+var (
+ ErrNoLink = errors.New("没有找到链接，可以发送一个有效的链接吗？用法：/smr <链接>")
+ ErrParse = errors.New("你发来的链接无法被理解，可以重新发一个试试。用法：/smr <链接>")
+ ErrScheme = errors.New("你发来的链接无法被理解，可以重新发一个试试。用法：/smr <链接>") | 最好不要把这种有程序错误作为上游的错误文案放到 error 里面，文案应该是业务 specific 的。比如 Telegram 的 `/smr <链接>` 应该用 `<code></code>` 扩起来，其他平台不行。 |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,129 @@
+package smr
+
+import (
+ "context"
+ "errors"
+ "time"
+
+ "github.com/disgoorg/disgo/discord"
+ "github.com/disgoorg/snowflake/v2"
+ tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/slack-go/slack"
+)
+
+func (s *Service) processOutput(info types.TaskInfo, result *smr.URLSummarizationOutput) string {
+ switch info.Platform {
+ case smr.FromPlatformTelegram:
+ return result.FormatSummarizationAsHTML()
+ case smr.FromPlatformSlack:
+ return result.FormatSummarizationAsSlackMarkdown()
+ case smr.FromPlatformDiscord:
+ return result.FormatSummarizationAsDiscordMarkdown()
+ }
+
+ return "" | 直接写 default 吧 |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,129 @@
+package smr
+
+import (
+ "context"
+ "errors"
+ "time"
+
+ "github.com/disgoorg/disgo/discord"
+ "github.com/disgoorg/snowflake/v2"
+ tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/slack-go/slack"
+)
+
+func (s *Service) processOutput(info types.TaskInfo, result *smr.URLSummarizationOutput) string {
+ switch info.Platform {
+ case smr.FromPlatformTelegram:
+ return result.FormatSummarizationAsHTML()
+ case smr.FromPlatformSlack:
+ return result.FormatSummarizationAsSlackMarkdown()
+ case smr.FromPlatformDiscord:
+ return result.FormatSummarizationAsDiscordMarkdown()
+ }
+
+ return ""
+}
+
+func (s *Service) processError(err error) string {
+ if errors.Is(err, smr.ErrContentNotSupported) {
+ return "暂时不支持量子速读这样的内容呢，可以换个别的链接试试。"
+ } else if errors.Is(err, smr.ErrNetworkError) || errors.Is(err, smr.ErrRequestFailed) {
+ return "量子速读的链接读取失败了哦。可以再试试？"
+ }
+
+ return "量子速读失败了。可以再试试？"
+}
+
+func (s *Service) sendResult(info types.TaskInfo, result string) {
+ switch info.Platform {
+ case smr.FromPlatformTelegram:
+ msgEdit := tgbotapi.EditMessageTextConfig{
+ Text: result,
+ }
+ msgEdit.ChatID = info.ChatID
+ msgEdit.MessageID = info.MessageID
+ msgEdit.ParseMode = tgbotapi.ModeHTML
+
+ _, err := s.tgBot.Send(msgEdit)
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to send result message") | 太长了，链式调用换个行吧 |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,129 @@
+package smr
+
+import (
+ "context"
+ "errors"
+ "time"
+
+ "github.com/disgoorg/disgo/discord"
+ "github.com/disgoorg/snowflake/v2"
+ tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/slack-go/slack"
+)
+
+func (s *Service) processOutput(info types.TaskInfo, result *smr.URLSummarizationOutput) string {
+ switch info.Platform {
+ case smr.FromPlatformTelegram:
+ return result.FormatSummarizationAsHTML()
+ case smr.FromPlatformSlack:
+ return result.FormatSummarizationAsSlackMarkdown()
+ case smr.FromPlatformDiscord:
+ return result.FormatSummarizationAsDiscordMarkdown()
+ }
+
+ return ""
+}
+
+func (s *Service) processError(err error) string {
+ if errors.Is(err, smr.ErrContentNotSupported) {
+ return "暂时不支持量子速读这样的内容呢，可以换个别的链接试试。"
+ } else if errors.Is(err, smr.ErrNetworkError) || errors.Is(err, smr.ErrRequestFailed) {
+ return "量子速读的链接读取失败了哦。可以再试试？"
+ }
+
+ return "量子速读失败了。可以再试试？"
+}
+
+func (s *Service) sendResult(info types.TaskInfo, result string) {
+ switch info.Platform {
+ case smr.FromPlatformTelegram:
+ msgEdit := tgbotapi.EditMessageTextConfig{
+ Text: result,
+ }
+ msgEdit.ChatID = info.ChatID
+ msgEdit.MessageID = info.MessageID
+ msgEdit.ParseMode = tgbotapi.ModeHTML
+
+ _, err := s.tgBot.Send(msgEdit)
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to send result message")
+ }
+ case smr.FromPlatformSlack:
+ token, err := s.ent.SlackOAuthCredentials.Query().
+ Where(slackoauthcredentials.TeamID(info.TeamID)).
+ First(context.Background())
+
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to get team's access token") | ```suggestion
s.logger.WithError(err).
WithField("platform", info.Platform).
Warn("smr service: failed to get team's access token")
``` |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,129 @@
+package smr
+
+import (
+ "context"
+ "errors"
+ "time"
+
+ "github.com/disgoorg/disgo/discord"
+ "github.com/disgoorg/snowflake/v2"
+ tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/slack-go/slack"
+)
+
+func (s *Service) processOutput(info types.TaskInfo, result *smr.URLSummarizationOutput) string {
+ switch info.Platform {
+ case smr.FromPlatformTelegram:
+ return result.FormatSummarizationAsHTML()
+ case smr.FromPlatformSlack:
+ return result.FormatSummarizationAsSlackMarkdown()
+ case smr.FromPlatformDiscord:
+ return result.FormatSummarizationAsDiscordMarkdown()
+ }
+
+ return ""
+}
+
+func (s *Service) processError(err error) string {
+ if errors.Is(err, smr.ErrContentNotSupported) {
+ return "暂时不支持量子速读这样的内容呢，可以换个别的链接试试。"
+ } else if errors.Is(err, smr.ErrNetworkError) || errors.Is(err, smr.ErrRequestFailed) {
+ return "量子速读的链接读取失败了哦。可以再试试？"
+ }
+
+ return "量子速读失败了。可以再试试？"
+}
+
+func (s *Service) sendResult(info types.TaskInfo, result string) {
+ switch info.Platform {
+ case smr.FromPlatformTelegram:
+ msgEdit := tgbotapi.EditMessageTextConfig{
+ Text: result,
+ }
+ msgEdit.ChatID = info.ChatID
+ msgEdit.MessageID = info.MessageID
+ msgEdit.ParseMode = tgbotapi.ModeHTML
+
+ _, err := s.tgBot.Send(msgEdit)
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to send result message")
+ }
+ case smr.FromPlatformSlack:
+ token, err := s.ent.SlackOAuthCredentials.Query().
+ Where(slackoauthcredentials.TeamID(info.TeamID)).
+ First(context.Background())
+
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to get team's access token")
+ return
+ }
+
+ slackCfg := s.config.Slack
+ slackCli := slackbot.NewSlackCli(nil, slackCfg.ClientID, slackCfg.ClientSecret, token.RefreshToken, token.AccessToken)
+ _, _, _, err = slackCli.SendMessageWithTokenExpirationCheck(
+ info.ChannelID,
+ s.slackBot.GetService().NewStoreFuncForRefresh(info.TeamID),
+ slack.MsgOptionText(result, false),
+ )
+
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to send result message") | ```suggestion
s.logger.WithError(err).
WithField("platform", info.Platform).
Warn("smr service: failed to send result message")
``` |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,129 @@
+package smr
+
+import (
+ "context"
+ "errors"
+ "time"
+
+ "github.com/disgoorg/disgo/discord"
+ "github.com/disgoorg/snowflake/v2"
+ tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/slack-go/slack"
+)
+
+func (s *Service) processOutput(info types.TaskInfo, result *smr.URLSummarizationOutput) string {
+ switch info.Platform {
+ case smr.FromPlatformTelegram:
+ return result.FormatSummarizationAsHTML()
+ case smr.FromPlatformSlack:
+ return result.FormatSummarizationAsSlackMarkdown()
+ case smr.FromPlatformDiscord:
+ return result.FormatSummarizationAsDiscordMarkdown()
+ }
+
+ return ""
+}
+
+func (s *Service) processError(err error) string {
+ if errors.Is(err, smr.ErrContentNotSupported) {
+ return "暂时不支持量子速读这样的内容呢，可以换个别的链接试试。"
+ } else if errors.Is(err, smr.ErrNetworkError) || errors.Is(err, smr.ErrRequestFailed) {
+ return "量子速读的链接读取失败了哦。可以再试试？"
+ }
+
+ return "量子速读失败了。可以再试试？"
+}
+
+func (s *Service) sendResult(info types.TaskInfo, result string) {
+ switch info.Platform {
+ case smr.FromPlatformTelegram:
+ msgEdit := tgbotapi.EditMessageTextConfig{
+ Text: result,
+ }
+ msgEdit.ChatID = info.ChatID
+ msgEdit.MessageID = info.MessageID
+ msgEdit.ParseMode = tgbotapi.ModeHTML
+
+ _, err := s.tgBot.Send(msgEdit)
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to send result message")
+ }
+ case smr.FromPlatformSlack:
+ token, err := s.ent.SlackOAuthCredentials.Query().
+ Where(slackoauthcredentials.TeamID(info.TeamID)).
+ First(context.Background())
+
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to get team's access token")
+ return
+ }
+
+ slackCfg := s.config.Slack
+ slackCli := slackbot.NewSlackCli(nil, slackCfg.ClientID, slackCfg.ClientSecret, token.RefreshToken, token.AccessToken)
+ _, _, _, err = slackCli.SendMessageWithTokenExpirationCheck(
+ info.ChannelID,
+ s.slackBot.GetService().NewStoreFuncForRefresh(info.TeamID),
+ slack.MsgOptionText(result, false),
+ )
+
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to send result message")
+ }
+ case smr.FromPlatformDiscord:
+ channelID, _ := snowflake.Parse(info.ChannelID)
+ _, err := s.discordBot.Rest().
+ CreateMessage(channelID, discord.NewMessageCreateBuilder().
+ SetContent(result).
+ Build(),
+ )
+
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to send result message") | ```suggestion
s.logger.WithError(err).
WithField("platform", info.Platform).
Warn("smr service: failed to send result message")
``` |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,129 @@
+package smr
+
+import (
+ "context"
+ "errors"
+ "time"
+
+ "github.com/disgoorg/disgo/discord"
+ "github.com/disgoorg/snowflake/v2"
+ tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/slack-go/slack"
+)
+
+func (s *Service) processOutput(info types.TaskInfo, result *smr.URLSummarizationOutput) string {
+ switch info.Platform {
+ case smr.FromPlatformTelegram:
+ return result.FormatSummarizationAsHTML()
+ case smr.FromPlatformSlack:
+ return result.FormatSummarizationAsSlackMarkdown()
+ case smr.FromPlatformDiscord:
+ return result.FormatSummarizationAsDiscordMarkdown()
+ }
+
+ return ""
+}
+
+func (s *Service) processError(err error) string {
+ if errors.Is(err, smr.ErrContentNotSupported) {
+ return "暂时不支持量子速读这样的内容呢，可以换个别的链接试试。"
+ } else if errors.Is(err, smr.ErrNetworkError) || errors.Is(err, smr.ErrRequestFailed) {
+ return "量子速读的链接读取失败了哦。可以再试试？"
+ }
+
+ return "量子速读失败了。可以再试试？"
+}
+
+func (s *Service) sendResult(info types.TaskInfo, result string) {
+ switch info.Platform {
+ case smr.FromPlatformTelegram:
+ msgEdit := tgbotapi.EditMessageTextConfig{
+ Text: result,
+ }
+ msgEdit.ChatID = info.ChatID
+ msgEdit.MessageID = info.MessageID
+ msgEdit.ParseMode = tgbotapi.ModeHTML
+
+ _, err := s.tgBot.Send(msgEdit)
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to send result message")
+ }
+ case smr.FromPlatformSlack:
+ token, err := s.ent.SlackOAuthCredentials.Query().
+ Where(slackoauthcredentials.TeamID(info.TeamID)).
+ First(context.Background())
+
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to get team's access token")
+ return
+ }
+
+ slackCfg := s.config.Slack
+ slackCli := slackbot.NewSlackCli(nil, slackCfg.ClientID, slackCfg.ClientSecret, token.RefreshToken, token.AccessToken)
+ _, _, _, err = slackCli.SendMessageWithTokenExpirationCheck(
+ info.ChannelID,
+ s.slackBot.GetService().NewStoreFuncForRefresh(info.TeamID),
+ slack.MsgOptionText(result, false),
+ )
+
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to send result message")
+ }
+ case smr.FromPlatformDiscord:
+ channelID, _ := snowflake.Parse(info.ChannelID)
+ _, err := s.discordBot.Rest().
+ CreateMessage(channelID, discord.NewMessageCreateBuilder().
+ SetContent(result).
+ Build(),
+ )
+
+ if err != nil {
+ s.logger.WithError(err).WithField("platform", info.Platform).Warn("smr service: failed to send result message")
+ }
+ }
+}
+
+func (s *Service) botExists(platform smr.FromPlatform) bool { | 返回 bool 的函数用动词 verb 开头，isBotExists 或者 hasBot |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,160 @@
+package smr
+
+import (
+ "context"
+ "errors"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrqueue"
+ "github.com/nekomeowww/insights-bot/pkg/bots/discordbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/tgbot"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/redis/rueidis"
+ "github.com/samber/lo"
+ "github.com/sourcegraph/conc/pool"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Options(smrqueue.NewModules()),
+ fx.Provide(NewService()),
+ )
+}
+
+type NewServiceParam struct {
+ fx.In
+
+ LifeCycle fx.Lifecycle
+
+ Config *configs.Config
+ Logger *logger.Logger
+
+ RedisClient *datastore.Redis
+ Ent *datastore.Ent
+ Queue *smrqueue.Queue
+
+ Model *smr.Model
+
+ TgBot *tgbot.BotService
+ SlackBot *slackbot.BotService
+ DiscordBot *discordbot.BotService
+}
+
+type Service struct {
+ logger *logger.Logger
+ config *configs.Config
+
+ ent *datastore.Ent
+
+ model *smr.Model
+
+ tgBot *tgbot.BotService
+ slackBot *slackbot.BotService
+ discordBot *discordbot.BotService
+
+ started bool
+ closeChan chan struct{}
+ alreadyClosed bool | 用 lazy init 的 `cancelFunc context.CancelFunc` 来解决呗？ |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,160 @@
+package smr
+
+import (
+ "context"
+ "errors"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrqueue"
+ "github.com/nekomeowww/insights-bot/pkg/bots/discordbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/tgbot"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/redis/rueidis"
+ "github.com/samber/lo"
+ "github.com/sourcegraph/conc/pool"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Options(smrqueue.NewModules()),
+ fx.Provide(NewService()),
+ )
+}
+
+type NewServiceParam struct {
+ fx.In
+
+ LifeCycle fx.Lifecycle
+
+ Config *configs.Config
+ Logger *logger.Logger
+
+ RedisClient *datastore.Redis
+ Ent *datastore.Ent
+ Queue *smrqueue.Queue
+
+ Model *smr.Model
+
+ TgBot *tgbot.BotService
+ SlackBot *slackbot.BotService
+ DiscordBot *discordbot.BotService
+}
+
+type Service struct {
+ logger *logger.Logger
+ config *configs.Config
+
+ ent *datastore.Ent
+
+ model *smr.Model
+
+ tgBot *tgbot.BotService
+ slackBot *slackbot.BotService
+ discordBot *discordbot.BotService
+
+ started bool
+ closeChan chan struct{}
+ alreadyClosed bool
+
+ queue *smrqueue.Queue
+}
+
+func (s *Service) Check(ctx context.Context) error {
+ return lo.Ternary(s.started, nil, errors.New("smr service not started yet"))
+}
+
+func NewService() func(param NewServiceParam) (*Service, error) {
+ return func(param NewServiceParam) (*Service, error) {
+ s := &Service{
+ logger: param.Logger,
+ ent: param.Ent,
+ config: param.Config,
+ model: param.Model,
+ queue: param.Queue,
+ tgBot: param.TgBot,
+ slackBot: param.SlackBot,
+ discordBot: param.DiscordBot,
+ }
+
+ param.LifeCycle.Append(fx.Hook{OnStop: func(ctx context.Context) error {
+ s.stop()
+
+ return nil
+ }})
+
+ return s, nil
+ }
+}
+
+func (s *Service) run() {
+ s.closeChan = make(chan struct{})
+ s.started = true
+
+ s.logger.Info("smr service started")
+
+ needToClose := false
+
+ taskRunner := pool.New().WithMaxGoroutines(10)
+
+ for {
+ select {
+ case <-s.closeChan:
+ s.logger.WithField("last tasks count", s.queue.Count()).Info("smr service: received stop signal, waiting for all tasks done")
+
+ needToClose = true | 用 `context.Context.Done()` 可以吗 |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,160 @@
+package smr
+
+import (
+ "context"
+ "errors"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrqueue"
+ "github.com/nekomeowww/insights-bot/pkg/bots/discordbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/tgbot"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/redis/rueidis"
+ "github.com/samber/lo"
+ "github.com/sourcegraph/conc/pool"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Options(smrqueue.NewModules()),
+ fx.Provide(NewService()),
+ )
+}
+
+type NewServiceParam struct {
+ fx.In
+
+ LifeCycle fx.Lifecycle
+
+ Config *configs.Config
+ Logger *logger.Logger
+
+ RedisClient *datastore.Redis
+ Ent *datastore.Ent
+ Queue *smrqueue.Queue
+
+ Model *smr.Model
+
+ TgBot *tgbot.BotService
+ SlackBot *slackbot.BotService
+ DiscordBot *discordbot.BotService
+}
+
+type Service struct {
+ logger *logger.Logger
+ config *configs.Config
+
+ ent *datastore.Ent
+
+ model *smr.Model
+
+ tgBot *tgbot.BotService
+ slackBot *slackbot.BotService
+ discordBot *discordbot.BotService
+
+ started bool
+ closeChan chan struct{}
+ alreadyClosed bool
+
+ queue *smrqueue.Queue
+}
+
+func (s *Service) Check(ctx context.Context) error {
+ return lo.Ternary(s.started, nil, errors.New("smr service not started yet"))
+}
+
+func NewService() func(param NewServiceParam) (*Service, error) {
+ return func(param NewServiceParam) (*Service, error) {
+ s := &Service{
+ logger: param.Logger,
+ ent: param.Ent,
+ config: param.Config,
+ model: param.Model,
+ queue: param.Queue,
+ tgBot: param.TgBot,
+ slackBot: param.SlackBot,
+ discordBot: param.DiscordBot,
+ }
+
+ param.LifeCycle.Append(fx.Hook{OnStop: func(ctx context.Context) error {
+ s.stop()
+
+ return nil
+ }})
+
+ return s, nil
+ }
+}
+
+func (s *Service) run() {
+ s.closeChan = make(chan struct{})
+ s.started = true
+
+ s.logger.Info("smr service started")
+
+ needToClose := false
+
+ taskRunner := pool.New().WithMaxGoroutines(10)
+
+ for {
+ select {
+ case <-s.closeChan:
+ s.logger.WithField("last tasks count", s.queue.Count()).Info("smr service: received stop signal, waiting for all tasks done")
+
+ needToClose = true
+ default: | 会 busy loop 吗？ |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,55 @@
+package types
+
+import (
+ "sync"
+
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+)
+
+type TaskInfo struct {
+ Platform smr.FromPlatform `json:"platform"`
+ Url string `json:"url"` // url to summarize
+
+ ChatID int64 `json:"chatID"` // only for telegram
+ MessageID int `json:"messageID"` // used to edit the reply message of request, not work in slack or discordbot currently
+
+ ChannelID string `json:"channelID"` // for slack and discordbot
+
+ TeamID string `json:"teamID"` // only for slack, used to query access token and refresh token
+}
+
+type OngoingTaskPool struct {
+ tasks []TaskInfo
+ mu *sync.RWMutex
+}
+
+func NewOngoingTaskPool() *OngoingTaskPool {
+ return &OngoingTaskPool{
+ mu: &sync.RWMutex{},
+ }
+}
+
+func (t *OngoingTaskPool) Add(info TaskInfo) {
+ t.mu.Lock()
+ t.tasks = append(t.tasks, info)
+ t.mu.Unlock()
+}
+
+func (t *OngoingTaskPool) Remove() {
+ t.mu.Lock()
+ if len(t.tasks) == 0 {
+ t.mu.Unlock()
+ return
+ }
+
+ t.tasks = t.tasks[1:]
+ t.mu.Unlock()
+}
+
+func (t *OngoingTaskPool) Len() int {
+ t.mu.RLock()
+ l := len(t.tasks)
+ t.mu.RUnlock()
+
+ return l
+} | `internal/services/smr/smr.go` L100 又定义了一个 pool，和这个有啥区别？ |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,55 @@
+package types
+
+import (
+ "sync"
+
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+)
+
+type TaskInfo struct {
+ Platform smr.FromPlatform `json:"platform"`
+ Url string `json:"url"` // url to summarize
+
+ ChatID int64 `json:"chatID"` // only for telegram
+ MessageID int `json:"messageID"` // used to edit the reply message of request, not work in slack or discordbot currently
+
+ ChannelID string `json:"channelID"` // for slack and discordbot
+
+ TeamID string `json:"teamID"` // only for slack, used to query access token and refresh token | 能拆成三个附属结构体的吗？ |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,92 @@
+package discordbot
+
+import (
+ "context"
+ "crypto/ed25519"
+ "errors"
+ "net"
+
+ "github.com/disgoorg/disgo"
+ "github.com/disgoorg/disgo/bot"
+ "github.com/disgoorg/disgo/httpserver"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/samber/lo"
+)
+
+type BotService struct {
+ bot.Client
+
+ logger *logger.Logger
+
+ webhookStarted bool
+}
+
+func NewBotService[E bot.Event](
+ f func(e E),
+ cfg configs.SectionDiscord,
+ logger *logger.Logger,
+) *BotService {
+ discordBot := &BotService{
+ logger: logger,
+ }
+
+ port := lo.Ternary(cfg.Port == "", "7072", cfg.Port)
+
+ client, err := disgo.New(
+ cfg.Token,
+ bot.WithHTTPServerConfigOpts(
+ cfg.PublicKey,
+ httpserver.WithAddress(net.JoinHostPort("", port)),
+ httpserver.WithURL("/discord/command/smr"),
+ ),
+ bot.WithEventListenerFunc(f), | 这个泛型写的我有点懵 |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,29 @@
+package smrutils
+
+import (
+ "errors"
+ "github.com/nekomeowww/insights-bot/internal/services/smr"
+ "net/url"
+
+ "github.com/samber/lo"
+)
+
+func CheckUrl(urlString string) error {
+ if urlString == "" {
+ return smr.ErrNoLink
+ }
+
+ parsedURL, err2 := url.Parse(urlString)
+ if err2 != nil {
+ return smr.ErrParse
+ }
+ if parsedURL.Scheme == "" || !lo.Contains([]string{"http", "https"}, parsedURL.Scheme) {
+ return smr.ErrScheme
+ }
+
+ return nil | 能正确传递 err 链吗？写成这样的话外面怎么打日志呢？ |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,160 @@
+package smr
+
+import (
+ "context"
+ "errors"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrqueue"
+ "github.com/nekomeowww/insights-bot/pkg/bots/discordbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/tgbot"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/redis/rueidis"
+ "github.com/samber/lo"
+ "github.com/sourcegraph/conc/pool"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Options(smrqueue.NewModules()),
+ fx.Provide(NewService()),
+ )
+}
+
+type NewServiceParam struct {
+ fx.In
+
+ LifeCycle fx.Lifecycle
+
+ Config *configs.Config
+ Logger *logger.Logger
+
+ RedisClient *datastore.Redis
+ Ent *datastore.Ent
+ Queue *smrqueue.Queue
+
+ Model *smr.Model
+
+ TgBot *tgbot.BotService
+ SlackBot *slackbot.BotService
+ DiscordBot *discordbot.BotService
+}
+
+type Service struct {
+ logger *logger.Logger
+ config *configs.Config
+
+ ent *datastore.Ent
+
+ model *smr.Model
+
+ tgBot *tgbot.BotService
+ slackBot *slackbot.BotService
+ discordBot *discordbot.BotService
+
+ started bool
+ closeChan chan struct{}
+ alreadyClosed bool
+
+ queue *smrqueue.Queue
+}
+
+func (s *Service) Check(ctx context.Context) error {
+ return lo.Ternary(s.started, nil, errors.New("smr service not started yet"))
+}
+
+func NewService() func(param NewServiceParam) (*Service, error) {
+ return func(param NewServiceParam) (*Service, error) {
+ s := &Service{
+ logger: param.Logger,
+ ent: param.Ent,
+ config: param.Config,
+ model: param.Model,
+ queue: param.Queue,
+ tgBot: param.TgBot,
+ slackBot: param.SlackBot,
+ discordBot: param.DiscordBot,
+ }
+
+ param.LifeCycle.Append(fx.Hook{OnStop: func(ctx context.Context) error {
+ s.stop()
+
+ return nil
+ }})
+
+ return s, nil
+ }
+}
+
+func (s *Service) run() {
+ s.closeChan = make(chan struct{})
+ s.started = true
+
+ s.logger.Info("smr service started")
+
+ needToClose := false
+
+ taskRunner := pool.New().WithMaxGoroutines(10)
+
+ for {
+ select {
+ case <-s.closeChan:
+ s.logger.WithField("last tasks count", s.queue.Count()).Info("smr service: received stop signal, waiting for all tasks done")
+
+ needToClose = true
+ default:
+ }
+
+ info, err := s.queue.GetTask()
+ if err != nil {
+ if errors.Is(err, rueidis.Nil) || errors.Is(err, smrqueue.ErrQueueFull) {
+ continue
+ }
+
+ s.logger.WithError(err).Warn("smr service: failed to get task")
+
+ continue
+ }
+
+ taskRunner.Go(func() {
+ defer func() {
+ err2 := recover() | 用 if err := recover; err != nil { 不就不会影响到 scope 了？ |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,160 @@
+package smr
+
+import (
+ "context"
+ "errors"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrqueue"
+ "github.com/nekomeowww/insights-bot/pkg/bots/discordbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/tgbot"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/redis/rueidis"
+ "github.com/samber/lo"
+ "github.com/sourcegraph/conc/pool"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Options(smrqueue.NewModules()),
+ fx.Provide(NewService()),
+ )
+}
+
+type NewServiceParam struct {
+ fx.In
+
+ LifeCycle fx.Lifecycle
+
+ Config *configs.Config
+ Logger *logger.Logger
+
+ RedisClient *datastore.Redis
+ Ent *datastore.Ent
+ Queue *smrqueue.Queue
+
+ Model *smr.Model
+
+ TgBot *tgbot.BotService
+ SlackBot *slackbot.BotService
+ DiscordBot *discordbot.BotService
+}
+
+type Service struct {
+ logger *logger.Logger
+ config *configs.Config
+
+ ent *datastore.Ent
+
+ model *smr.Model
+
+ tgBot *tgbot.BotService
+ slackBot *slackbot.BotService
+ discordBot *discordbot.BotService
+
+ started bool
+ closeChan chan struct{}
+ alreadyClosed bool
+
+ queue *smrqueue.Queue
+}
+
+func (s *Service) Check(ctx context.Context) error {
+ return lo.Ternary(s.started, nil, errors.New("smr service not started yet"))
+}
+
+func NewService() func(param NewServiceParam) (*Service, error) {
+ return func(param NewServiceParam) (*Service, error) {
+ s := &Service{
+ logger: param.Logger,
+ ent: param.Ent,
+ config: param.Config,
+ model: param.Model,
+ queue: param.Queue,
+ tgBot: param.TgBot,
+ slackBot: param.SlackBot,
+ discordBot: param.DiscordBot,
+ }
+
+ param.LifeCycle.Append(fx.Hook{OnStop: func(ctx context.Context) error {
+ s.stop()
+
+ return nil
+ }})
+
+ return s, nil
+ }
+}
+
+func (s *Service) run() {
+ s.closeChan = make(chan struct{})
+ s.started = true
+
+ s.logger.Info("smr service started")
+
+ needToClose := false
+
+ taskRunner := pool.New().WithMaxGoroutines(10)
+
+ for {
+ select {
+ case <-s.closeChan:
+ s.logger.WithField("last tasks count", s.queue.Count()).Info("smr service: received stop signal, waiting for all tasks done")
+
+ needToClose = true
+ default:
+ }
+
+ info, err := s.queue.GetTask()
+ if err != nil {
+ if errors.Is(err, rueidis.Nil) || errors.Is(err, smrqueue.ErrQueueFull) {
+ continue
+ }
+
+ s.logger.WithError(err).Warn("smr service: failed to get task")
+
+ continue | 无论如何都要 continue 的话就把表达式反转一下把日志塞进去呗 |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,161 @@
+package handlers
+
+import (
+ "context"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrqueue"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrutils"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/ent"
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot/services"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/sirupsen/logrus"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewHandlers()),
+ )
+}
+
+type NewHandlersParam struct {
+ fx.In
+
+ Config *configs.Config
+ Logger *logger.Logger
+ Ent *datastore.Ent
+ SmrQueue *smrqueue.Queue
+ Services *services.Services
+}
+
+type Handlers struct {
+ config *configs.Config
+ logger *logger.Logger
+ ent *datastore.Ent
+ smrQueue *smrqueue.Queue
+ services *services.Services
+}
+
+func NewHandlers() func(param NewHandlersParam) *Handlers {
+ return func(param NewHandlersParam) *Handlers {
+ return &Handlers{
+ config: param.Config,
+ ent: param.Ent,
+ logger: param.Logger,
+ smrQueue: param.SmrQueue,
+ services: param.Services,
+ }
+ }
+}
+
+type receivedCommandInfo struct {
+ Command string `form:"command"`
+ Text string `form:"text"`
+ ResponseUrl string `form:"response_url"`
+ UserID string `form:"user_id"`
+ ChannelID string `form:"channel_id"`
+ TeamID string `form:"team_id"`
+}
+
+func (h *Handlers) PostCommandInfo(ctx *gin.Context) {
+ var body receivedCommandInfo
+ if err := ctx.Bind(&body); err != nil {
+ ctx.AbortWithStatus(http.StatusBadRequest)
+ h.logger.WithField("error", err.Error()).Warn("failed to bind request body, type definition of slack request body may have changed")
+
+ return
+ }
+
+ h.logger.WithFields(logrus.Fields{
+ "user_id": body.UserID,
+ "channel_id": body.ChannelID,
+ }).Tracef("slack: command received: /smr %s", body.Text)
+
+ urlString := body.Text
+
+ err, originErr := smrutils.CheckUrl(urlString)
+ if err != nil {
+ if smrutils.IsUrlCheckError(err) {
+ ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage(smrutils.FormatUrlCheckError(err, smr.FromPlatformSlack)))
+ return
+ }
+
+ ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage("出现了一些问题，可以再试试？")) | 能用 `ctx.AbortWithStatusJSON()` 么？ |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,161 @@
+package handlers
+
+import (
+ "context"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrqueue"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrutils"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/ent"
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot/services"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/sirupsen/logrus"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewHandlers()),
+ )
+}
+
+type NewHandlersParam struct {
+ fx.In
+
+ Config *configs.Config
+ Logger *logger.Logger
+ Ent *datastore.Ent
+ SmrQueue *smrqueue.Queue
+ Services *services.Services
+}
+
+type Handlers struct {
+ config *configs.Config
+ logger *logger.Logger
+ ent *datastore.Ent
+ smrQueue *smrqueue.Queue
+ services *services.Services
+}
+
+func NewHandlers() func(param NewHandlersParam) *Handlers {
+ return func(param NewHandlersParam) *Handlers {
+ return &Handlers{
+ config: param.Config,
+ ent: param.Ent,
+ logger: param.Logger,
+ smrQueue: param.SmrQueue,
+ services: param.Services,
+ }
+ }
+}
+
+type receivedCommandInfo struct {
+ Command string `form:"command"`
+ Text string `form:"text"`
+ ResponseUrl string `form:"response_url"`
+ UserID string `form:"user_id"`
+ ChannelID string `form:"channel_id"`
+ TeamID string `form:"team_id"`
+}
+
+func (h *Handlers) PostCommandInfo(ctx *gin.Context) {
+ var body receivedCommandInfo
+ if err := ctx.Bind(&body); err != nil {
+ ctx.AbortWithStatus(http.StatusBadRequest)
+ h.logger.WithField("error", err.Error()).Warn("failed to bind request body, type definition of slack request body may have changed")
+
+ return
+ }
+
+ h.logger.WithFields(logrus.Fields{
+ "user_id": body.UserID,
+ "channel_id": body.ChannelID,
+ }).Tracef("slack: command received: /smr %s", body.Text)
+
+ urlString := body.Text
+
+ err, originErr := smrutils.CheckUrl(urlString)
+ if err != nil {
+ if smrutils.IsUrlCheckError(err) {
+ ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage(smrutils.FormatUrlCheckError(err, smr.FromPlatformSlack)))
+ return
+ }
+
+ ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage("出现了一些问题，可以再试试？"))
+ h.logger.
+ WithError(err).
+ WithError(originErr).
+ Warn("discord: failed to send error message")
+
+ return
+ }
+
+ // check permissions
+ _, err = h.ent.SlackOAuthCredentials.Query().Where(
+ slackoauthcredentials.TeamID(body.TeamID),
+ ).First(context.Background())
+ if err != nil {
+ h.logger.WithField("error", err.Error()).Warn("slack: failed to get team's access token")
+ if ent.IsNotFound(err) {
+ ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage("本应用没有权限向这个频道发送消息，尝试重新安装一下？"))
+ return
+ }
+
+ ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage("出现了一些问题，可以再试试？")) | 能用 `ctx.AbortWithStatusJSON()` 么？ |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -0,0 +1,161 @@
+package handlers
+
+import (
+ "context"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrqueue"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/smrutils"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/ent"
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/internal/services/smr/types"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot"
+ "github.com/nekomeowww/insights-bot/pkg/bots/slackbot/services"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/sirupsen/logrus"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewHandlers()),
+ )
+}
+
+type NewHandlersParam struct {
+ fx.In
+
+ Config *configs.Config
+ Logger *logger.Logger
+ Ent *datastore.Ent
+ SmrQueue *smrqueue.Queue
+ Services *services.Services
+}
+
+type Handlers struct {
+ config *configs.Config
+ logger *logger.Logger
+ ent *datastore.Ent
+ smrQueue *smrqueue.Queue
+ services *services.Services
+}
+
+func NewHandlers() func(param NewHandlersParam) *Handlers {
+ return func(param NewHandlersParam) *Handlers {
+ return &Handlers{
+ config: param.Config,
+ ent: param.Ent,
+ logger: param.Logger,
+ smrQueue: param.SmrQueue,
+ services: param.Services,
+ }
+ }
+}
+
+type receivedCommandInfo struct {
+ Command string `form:"command"`
+ Text string `form:"text"`
+ ResponseUrl string `form:"response_url"`
+ UserID string `form:"user_id"`
+ ChannelID string `form:"channel_id"`
+ TeamID string `form:"team_id"`
+}
+
+func (h *Handlers) PostCommandInfo(ctx *gin.Context) {
+ var body receivedCommandInfo
+ if err := ctx.Bind(&body); err != nil {
+ ctx.AbortWithStatus(http.StatusBadRequest)
+ h.logger.WithField("error", err.Error()).Warn("failed to bind request body, type definition of slack request body may have changed")
+
+ return
+ }
+
+ h.logger.WithFields(logrus.Fields{
+ "user_id": body.UserID,
+ "channel_id": body.ChannelID,
+ }).Tracef("slack: command received: /smr %s", body.Text)
+
+ urlString := body.Text
+
+ err, originErr := smrutils.CheckUrl(urlString)
+ if err != nil {
+ if smrutils.IsUrlCheckError(err) {
+ ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage(smrutils.FormatUrlCheckError(err, smr.FromPlatformSlack)))
+ return
+ }
+
+ ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage("出现了一些问题，可以再试试？"))
+ h.logger.
+ WithError(err).
+ WithError(originErr).
+ Warn("discord: failed to send error message")
+
+ return
+ }
+
+ // check permissions
+ _, err = h.ent.SlackOAuthCredentials.Query().Where(
+ slackoauthcredentials.TeamID(body.TeamID),
+ ).First(context.Background())
+ if err != nil {
+ h.logger.WithField("error", err.Error()).Warn("slack: failed to get team's access token")
+ if ent.IsNotFound(err) {
+ ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage("本应用没有权限向这个频道发送消息，尝试重新安装一下？"))
+ return
+ }
+
+ ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage("出现了一些问题，可以再试试？"))
+
+ return
+ }
+
+ // add task
+ err = h.smrQueue.AddTask(types.TaskInfo{
+ Platform: smr.FromPlatformSlack,
+ URL: urlString,
+ ChannelID: body.ChannelID,
+ TeamID: body.TeamID,
+ })
+ if err != nil {
+ h.logger.WithError(err).Warn("slack: failed to add task")
+ ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage("量子速读请求发送失败了，可以再试试？")) | 能用 `ctx.AbortWithStatusJSON()` 么？ |
insights-bot | github_2023 | go | 119 | nekomeowww | nekomeowww | @@ -31,105 +29,43 @@ type NewSlackBotParam struct {
Config *configs.Config
Logger *logger.Logger
- SMR *smr.Model
-
- Ent *datastore.Ent
+ Handlers *handlers.Handlers
+ Services *services.Services
}
-var _ healthchecker.HealthChecker = (*Bot)(nil)
-
-type Bot struct {
- config *configs.Config
- logger *logger.Logger
-
- smrModel *smr.Model
-
- server *http.Server
-
- ent *datastore.Ent
-
- alreadyClosed bool
- closeChan chan struct{}
- started bool
-
- processChan chan smrRequestInfo
-}
-
-func NewSlackBot() func(param NewSlackBotParam) *Bot {
- return func(param NewSlackBotParam) *Bot {
+func NewSlackBot() func(param NewSlackBotParam) *slackbot.BotService {
+ return func(param NewSlackBotParam) *slackbot.BotService {
slackConfig := param.Config.Slack
if slackConfig.ClientID == "" || slackConfig.ClientSecret == "" {
param.Logger.Warn("slack client id or secret not provided, will not create bot instance")
return nil
}
- slackBot := &Bot{
- config: param.Config,
- logger: param.Logger,
- closeChan: make(chan struct{}, 1),
- processChan: make(chan smrRequestInfo, 10),
- smrModel: param.SMR,
- ent: param.Ent,
- }
-
- engine := gin.Default()
- engine.POST("/slack/command/smr", slackBot.postCommandInfo)
- engine.GET("/slack/install/auth", slackBot.getInstallAuth)
- slackBot.server = &http.Server{
- Addr: lo.Ternary(slackConfig.Port == "", ":7070", net.JoinHostPort("", slackConfig.Port)),
- Handler: engine,
- ReadHeaderTimeout: time.Second * 10,
- }
+ bot := slackbot.NewBotService(slackConfig)
+ bot.Handle(http.MethodPost, "/slack/command/smr", param.Handlers.PostCommandInfo)
+ bot.Handle(http.MethodGet, "/slack/install/auth", param.Handlers.GetInstallAuth)
+ bot.SetService(param.Services)
+ bot.SetLogger(param.Logger)
param.Lifecycle.Append(fx.Hook{
OnStop: func(ctx context.Context) error {
- err := slackBot.server.Shutdown(ctx)
-
- if !errors.Is(err, context.Canceled) {
- param.Logger.WithField("error", err.Error()).Error("slack bot server shutdown failed")
- return err
- }
- slackBot.logger.Info("stopped to receiving new requests")
-
- slackBot.alreadyClosed = true
- slackBot.closeChan <- struct{}{}
-
- return nil
+ ctx, cancel := context.WithTimeout(ctx, time.Second*5)
+ defer cancel() | Lifecycle 本身有 timeout 信号的，不用自己写 |
insights-bot | github_2023 | others | 91 | nekomeowww | nekomeowww | @@ -31,6 +31,7 @@ A bot works with OpenAI GPT models to provide insights for your info flows.
## Support IMs | 把 #78 完成了 |
insights-bot | github_2023 | others | 91 | nekomeowww | nekomeowww | @@ -176,19 +177,22 @@ docker buildx build --platform linux/arm64,linux/amd64 -t <tag> -f Dockerfile .
### Environment variables
-| Name | Required | Default | Description |
-| ---- | -------- | ------- | ----------- |
-| `TELEGRAM_BOT_TOKEN` | `true` | | Telegram Bot API token, you can create one and obtain the token through [@BotFather](https://t.me/BotFather) |
-| `TELEGRAM_BOT_WEBHOOK_URL` | `false` | | Telegram Bot webhook URL and port, you can use [https://ngrok.com/](https://ngrok.com/) or Cloudflare tunnel to expose your local server to the internet. |
-| `TELEGRAM_BOT_WEBHOOK_PORT` | `false` | `7071` | Telegram Bot Webhook server port, default is 7071 |
-| `OPENAI_API_SECRET` | `true` | | OpenAI API Secret Key that looks like `sk-************************************************`, you can obtain one by signing in to OpenAI platform and create one at [http://platform.openai.com/account/api-keys](http://platform.openai.com/account/api-keys). |
-| `OPENAI_API_HOST` | `false` | `https://api.openai.com` | OpenAI API Host, you can specify one if you have a relay or reversed proxy configured. Such as `https://openai.example.workers.dev` |
-| `DB_CONNECTION_STR` | `true` | | PostgreSQL database URL. Such as `postgres://postgres:postgres@localhost:5432/postgres`. You could also suffix with `?search_path=<schema name>` if you want to specify a schema |
-| `SLACK_CLIENT_ID` | `false` | | Slack app client id, you can create a slack app and get it, see: [tutorial](https://api.slack.com/tutorials/slack-apps-and-postman) |
-| `SLACK_CLIENT_SECRET` | `false` | | Slack app client secret, you can create a slack app and get it, see: [tutorial](https://api.slack.com/tutorials/slack-apps-and-postman) |
-| `SLACK_WEBHOOK_PORT` | `false` | `7070` | Port for Slack Bot/App Webhook server, default is 7070 |
-| `LOG_LEVEL` | `false` | `info` | Log level, available values are `trace`, `debug`, `info`, `warn`, `error` |
-| ~~`CLOVER_DB_PATH`~~ | ~~`false`~~ | ~~`insights_bot_clover_data.db`~~ | **Deprecated**. ~~Path to Clover database file, you can specify one if you want to specify a path to store data when executed and ran with binary. The default path is `/var/lib/insights-bot/insights_bot_clover_data.db` in Docker volume, you can override the defaults `-e CLOVER_DB_PATH=<path>` when executing `docker run` command or modify and prepend a new `CLOVER_DB_PATH` the `docker-compose.yml` file.~~ |
+| Name | Required | Default | Description |
+|-----------------------------|-------------|-----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `TELEGRAM_BOT_TOKEN` | `true` | | Telegram Bot API token, you can create one and obtain the token through [@BotFather](https://t.me/BotFather) |
+| `TELEGRAM_BOT_WEBHOOK_URL` | `false` | | Telegram Bot webhook URL and port, you can use [https://ngrok.com/](https://ngrok.com/) or Cloudflare tunnel to expose your local server to the internet. |
+| `TELEGRAM_BOT_WEBHOOK_PORT` | `false` | `7071` | Telegram Bot Webhook server port, default is 7071 |
+| `OPENAI_API_SECRET` | `true` | | OpenAI API Secret Key that looks like `sk-************************************************`, you can obtain one by signing in to OpenAI platform and create one at [http://platform.openai.com/account/api-keys](http://platform.openai.com/account/api-keys). |
+| `OPENAI_API_HOST` | `false` | `https://api.openai.com` | OpenAI API Host, you can specify one if you have a relay or reversed proxy configured. Such as `https://openai.example.workers.dev` |
+| `DB_CONNECTION_STR` | `true` | | PostgreSQL database URL. Such as `postgres://postgres:postgres@localhost:5432/postgres`. You could also suffix with `?search_path=<schema name>` if you want to specify a schema |
+| `SLACK_CLIENT_ID` | `false` | | Slack app client id, you can create a slack app and get it, see: [tutorial](https://api.slack.com/tutorials/slack-apps-and-postman) |
+| `SLACK_CLIENT_SECRET` | `false` | | Slack app client secret, you can create a slack app and get it, see: [tutorial](https://api.slack.com/tutorials/slack-apps-and-postman) |
+| `SLACK_WEBHOOK_PORT` | `false` | `7070` | Port for Slack Bot/App Webhook server, default is 7070 |
+| `DISCORD_BOT_TOKEN` | `false` | | Discord bot token, you can create a discord app and get it, see: [Get started document](https://discord.com/developers/docs/getting-started) |
+| `DISCORD_BOT_PUBLIC_KEY` | `false` | | Discord bot public key, you can create a discord app and get it, see: [Get started document](https://discord.com/developers/docs/getting-started), required if `DISCORD_BOT_TOKEN` provided. |
+| `DISCORD_BOT_WEBHOOK_PORT` | `false` | `6060` | Port for Discord Bot Webhook server, default is 6060 | | 必须是 6060 吗？能递增吗？ |
insights-bot | github_2023 | go | 91 | nekomeowww | nekomeowww | @@ -0,0 +1,107 @@
+package discord
+
+import (
+ "context"
+ "crypto/ed25519"
+ "github.com/samber/lo"
+ "net"
+
+ "github.com/disgoorg/disgo"
+ "github.com/disgoorg/disgo/bot"
+ "github.com/disgoorg/disgo/httpserver"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "go.uber.org/fx"
+)
+
+type DiscordBotParam struct {
+ fx.In
+ Lifecycle fx.Lifecycle
+
+ Logger *logger.Logger
+ Config *configs.Config
+
+ Smr *smr.Model
+}
+
+type DiscordBot struct {
+ logger *logger.Logger
+ config *configs.Config
+
+ smr *smr.Model
+ botClient bot.Client
+}
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewDiscordBot()),
+ )
+}
+
+func NewDiscordBot() func(p DiscordBotParam) *DiscordBot { | 实现一下 `pkg/healthchecker` 的 `healthchecker.HealthChecker`，并且增加 health check 模块到 `internal/services/health` 里面 |
insights-bot | github_2023 | go | 91 | nekomeowww | nekomeowww | @@ -30,11 +31,13 @@ func main() {
fx.Options(services.NewModules()),
fx.Options(telegram.NewModules()),
fx.Options(slack.NewModules()),
+ fx.Options(discord.NewModules()), | gofmt |
insights-bot | github_2023 | others | 91 | nekomeowww | nekomeowww | @@ -31,6 +34,9 @@ services:
- OPENAI_API_HOST
- SLACK_CLIENT_ID
- SLACK_CLIENT_SECRET
+ - DISCORD_BOT_TOKEN
+ - DISCORD_BOT_PUBLIC_KEY
+ - DISCORD_BOT_WEBHOOK_PORT | 加一下 ports mapping |
insights-bot | github_2023 | go | 91 | nekomeowww | nekomeowww | @@ -0,0 +1,107 @@
+package discord
+
+import (
+ "context"
+ "crypto/ed25519"
+ "github.com/samber/lo"
+ "net"
+
+ "github.com/disgoorg/disgo"
+ "github.com/disgoorg/disgo/bot"
+ "github.com/disgoorg/disgo/httpserver"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "go.uber.org/fx"
+)
+
+type DiscordBotParam struct {
+ fx.In
+ Lifecycle fx.Lifecycle | embedding 和其他的字段中间需要间隔一行 |
insights-bot | github_2023 | go | 91 | nekomeowww | nekomeowww | @@ -0,0 +1,107 @@
+package discord
+
+import (
+ "context"
+ "crypto/ed25519"
+ "github.com/samber/lo"
+ "net"
+
+ "github.com/disgoorg/disgo"
+ "github.com/disgoorg/disgo/bot"
+ "github.com/disgoorg/disgo/httpserver"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "go.uber.org/fx"
+)
+
+type DiscordBotParam struct { | 按照当前 repo 的规范的话应该叫 `NewXXXParam(s)` |
insights-bot | github_2023 | go | 91 | nekomeowww | nekomeowww | @@ -0,0 +1,92 @@
+package discord
+
+import (
+ "context"
+ "errors"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "net/url"
+
+ "github.com/disgoorg/disgo/discord"
+ "github.com/disgoorg/disgo/events"
+ "github.com/samber/lo"
+)
+
+func (b *DiscordBot) smrCmd(event *events.ApplicationCommandInteractionCreate, data discord.SlashCommandInteractionData) {
+ urlString := data.String("link")
+
+ b.logger.Infof("discord: command received: /smr %s", urlString)
+
+ var err error
+
+ // url check
+ if urlString == "" {
+ err = errors.New("没有找到链接，可以发送一个有效的链接吗？用法：/smr <链接>")
+ } else {
+ var parsedURL *url.URL
+ parsedURL, err = url.Parse(urlString)
+ if err != nil {
+ err = errors.New("你发来的链接无法被理解，可以重新发一个试试。用法：/smr <链接>")
+ }
+ if parsedURL.Scheme == "" || !lo.Contains([]string{"http", "https"}, parsedURL.Scheme) {
+ err = errors.New("你发来的链接无法被理解，可以重新发一个试试。用法：/smr <链接>")
+ }
+ } | 这段是之前也写过一遍吗？会需要封装么 |
insights-bot | github_2023 | others | 91 | nekomeowww | nekomeowww | @@ -10,9 +10,13 @@ services:
- OPENAI_API_HOST
- SLACK_CLIENT_ID
- SLACK_CLIENT_SECRET
+ - DISCORD_BOT_TOKEN
+ - DISCORD_BOT_PUBLIC_KEY
+ - DISCORD_BOT_WEBHOOK_PORT
- DB_CONNECTION_STR=postgresql://postgres:123456@db_local:5432/postgres?search_path=public&sslmode=disable
ports:
- 7070:7070
+ - ${DISCORD_BOT_WEBHOOK_PORT}:${DISCORD_BOT_WEBHOOK_PORT} | 草？这样可以的嘛？ |
insights-bot | github_2023 | go | 91 | nekomeowww | nekomeowww | @@ -0,0 +1,108 @@
+package discord
+
+import (
+ "context"
+ "crypto/ed25519"
+ "github.com/samber/lo"
+ "net"
+
+ "github.com/disgoorg/disgo"
+ "github.com/disgoorg/disgo/bot"
+ "github.com/disgoorg/disgo/httpserver"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "go.uber.org/fx"
+)
+
+type NewDiscordBotParam struct {
+ fx.In
+
+ Lifecycle fx.Lifecycle
+
+ Logger *logger.Logger
+ Config *configs.Config
+
+ Smr *smr.Model
+}
+
+type DiscordBot struct {
+ logger *logger.Logger
+ config *configs.Config
+
+ smr *smr.Model
+ botClient bot.Client
+}
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewDiscordBot()),
+ )
+}
+
+func NewDiscordBot() func(p NewDiscordBotParam) *DiscordBot {
+ return func(p NewDiscordBotParam) *DiscordBot {
+ cfg := p.Config.Discord
+
+ if cfg.PublicKey == "" || cfg.Token == "" {
+ p.Logger.Warn("discord: public key or bot token not provided, will not create bot instance")
+ return nil
+ }
+
+ discordBot := &DiscordBot{
+ logger: p.Logger,
+ config: p.Config,
+ smr: p.Smr,
+ }
+
+ port := lo.Ternary(cfg.Port == "", "7072", cfg.Port)
+
+ client, err := disgo.New(cfg.Token,
+ bot.WithHTTPServerConfigOpts(cfg.PublicKey, | 要换行的话就都换了 |
insights-bot | github_2023 | go | 91 | nekomeowww | nekomeowww | @@ -0,0 +1,108 @@
+package discord
+
+import (
+ "context"
+ "crypto/ed25519"
+ "github.com/samber/lo"
+ "net"
+
+ "github.com/disgoorg/disgo"
+ "github.com/disgoorg/disgo/bot"
+ "github.com/disgoorg/disgo/httpserver"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "go.uber.org/fx"
+)
+
+type NewDiscordBotParam struct {
+ fx.In
+
+ Lifecycle fx.Lifecycle
+
+ Logger *logger.Logger
+ Config *configs.Config
+
+ Smr *smr.Model
+}
+
+type DiscordBot struct {
+ logger *logger.Logger
+ config *configs.Config
+
+ smr *smr.Model
+ botClient bot.Client
+}
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewDiscordBot()),
+ )
+}
+
+func NewDiscordBot() func(p NewDiscordBotParam) *DiscordBot { | 实现一下 pkg/healthchecker 的 healthchecker.HealthChecker，并且增加 health check 模块到 internal/services/health 里面 |
insights-bot | github_2023 | go | 91 | nekomeowww | nekomeowww | @@ -44,6 +46,10 @@ func NewHealth() func(NewHealthParams) (*Health, error) {
Name: "telegram_bot",
Check: params.TelegramBot.Check,
}),
+ health.WithCheck(health.Check{
+ Name: "discord_bot",
+ Check: params.DiscordBot.Check,
+ }), | 得学 slack 那样 append？而且如果不启动 Discord 的话 .Check 会变成访问空指针的属性？ |
insights-bot | github_2023 | go | 72 | nekomeowww | nekomeowww | @@ -24,7 +24,7 @@ func checkTogglingRecapPermission(chatID, userID int64, update tgbotapi.Update,
telegram.MemberStatusCreator,
telegram.MemberStatusAdministrator,
}, telegram.MemberStatus(member.Status)) {
- return tgbot.NewMessageError("你没有权限关闭聊天记录回顾功能哦！").WithReply(update.Message)
+ return tgbot.NewMessageError("你没有权限开启聊天记录回顾功能哦！").WithReply(update.Message) | 不行，需要返回一下 true/false 让外部决定要返回什么...或者让外部穿参数进来 |
insights-bot | github_2023 | go | 61 | nekomeowww | nekomeowww | @@ -82,11 +86,49 @@ func FullNameFromFirstAndLastName(firstName, lastName string) string {
}
func ExtractTextFromMessage(message *tgbotapi.Message) string {
- if message.Caption != "" {
- return message.Caption
+ text := lo.Ternary(message.Caption != "", message.Caption, message.Text)
+ type MarkdownLink struct { | ```suggestion
type MarkdownLink struct {
``` |
insights-bot | github_2023 | go | 61 | nekomeowww | nekomeowww | @@ -82,11 +86,49 @@ func FullNameFromFirstAndLastName(firstName, lastName string) string {
}
func ExtractTextFromMessage(message *tgbotapi.Message) string {
- if message.Caption != "" {
- return message.Caption
+ text := lo.Ternary(message.Caption != "", message.Caption, message.Text)
+ type MarkdownLink struct {
+ Markdown []uint16
+ Start int
+ End int
}
- return message.Text
+ text_utf16 := utf16.Encode([]rune(text)) | snake_case is not idiomatic in Go, should change to camelCase |
insights-bot | github_2023 | go | 61 | nekomeowww | nekomeowww | @@ -4,12 +4,12 @@ import (
"fmt"
"testing"
+ tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
"github.com/stretchr/testify/assert"
)
func TestReplaceMarkdownTitlesToBoldTexts(t *testing.T) {
prefix := ""
-
for i := 0; i < 6; i++ { | ```suggestion
for i := 0; i < 6; i++ {
``` |
insights-bot | github_2023 | go | 61 | nekomeowww | nekomeowww | @@ -82,11 +86,51 @@ func FullNameFromFirstAndLastName(firstName, lastName string) string {
}
func ExtractTextFromMessage(message *tgbotapi.Message) string {
- if message.Caption != "" {
- return message.Caption
+ text := lo.Ternary(message.Caption != "", message.Caption, message.Text)
+
+ type MarkdownLink struct {
+ Markdown []uint16
+ Start int
+ End int
+ }
+
+ textUtf16 := utf16.Encode([]rune(text))
+ links := lop.Map(message.Entities, func(entity tgbotapi.MessageEntity, i int) MarkdownLink {
+ startIndex := entity.Offset
+ endIndex := startIndex + entity.Length
+ var title string
+ var href string
+ if entity.Type == "url" {
+ href = string(utf16.Decode(textUtf16[startIndex:endIndex]))
+ result, err := LinkPreview.PreviewLink(href, nil) | This err should be logged, but this err doesnt really matter... How about adding an err field to MarkdownLink to handle the outside functions? |
insights-bot | github_2023 | go | 61 | nekomeowww | nekomeowww | @@ -82,11 +86,51 @@ func FullNameFromFirstAndLastName(firstName, lastName string) string {
}
func ExtractTextFromMessage(message *tgbotapi.Message) string {
- if message.Caption != "" {
- return message.Caption
+ text := lo.Ternary(message.Caption != "", message.Caption, message.Text)
+
+ type MarkdownLink struct {
+ Markdown []uint16
+ Start int
+ End int
+ }
+
+ textUtf16 := utf16.Encode([]rune(text)) | According to the Go naming convention, Utf should be UTF. |
insights-bot | github_2023 | go | 61 | nekomeowww | nekomeowww | @@ -82,11 +86,51 @@ func FullNameFromFirstAndLastName(firstName, lastName string) string {
}
func ExtractTextFromMessage(message *tgbotapi.Message) string {
- if message.Caption != "" {
- return message.Caption
+ text := lo.Ternary(message.Caption != "", message.Caption, message.Text)
+
+ type MarkdownLink struct {
+ Markdown []uint16
+ Start int
+ End int
+ }
+
+ textUtf16 := utf16.Encode([]rune(text))
+ links := lop.Map(message.Entities, func(entity tgbotapi.MessageEntity, i int) MarkdownLink {
+ startIndex := entity.Offset
+ endIndex := startIndex + entity.Length
+ var title string
+ var href string
+ if entity.Type == "url" {
+ href = string(utf16.Decode(textUtf16[startIndex:endIndex]))
+ result, err := LinkPreview.PreviewLink(href, nil)
+ if err != nil {
+ return MarkdownLink{[]uint16{}, -1, -1}
+ }
+ title = result.Title
+ } else if entity.Type == "text_link" {
+ title = string(utf16.Decode(textUtf16[startIndex:endIndex]))
+ href = entity.URL
+ } else {
+ return MarkdownLink{[]uint16{}, -1, -1}
+ }
+ unescaped, err := url.QueryUnescape(href)
+ if err == nil { | What about err != nil? |
insights-bot | github_2023 | others | 61 | nekomeowww | nekomeowww | @@ -4,6 +4,7 @@ go 1.19
require (
entgo.io/ent v0.12.2
+ github.com/Junzki/link-preview v0.0.0-20190616153136-4d94cb3f9ebf | This package had a very ugly implementation and didn't quite follow the regulations and best practices in Go.
However, I think such logic is simple enough to wrap one by ourselves. I will make one for you. |
insights-bot | github_2023 | go | 65 | nekomeowww | nekomeowww | @@ -9,3 +13,64 @@ func NewSlackWebhookMessage(msg string) *slack.WebhookMessage {
ResponseType: slack.ResponseTypeInChannel,
}
}
+
+type HttpClientForSlack interface {
+ Do(req *http.Request) (*http.Response, error)
+}
+
+type SlackCli struct {
+ *slack.Client
+
+ httpclient HttpClientForSlack | httpclient -> httpClient |
insights-bot | github_2023 | go | 65 | nekomeowww | nekomeowww | @@ -9,3 +13,64 @@ func NewSlackWebhookMessage(msg string) *slack.WebhookMessage {
ResponseType: slack.ResponseTypeInChannel,
}
}
+
+type HttpClientForSlack interface {
+ Do(req *http.Request) (*http.Response, error)
+}
+
+type SlackCli struct {
+ *slack.Client
+
+ httpclient HttpClientForSlack
+ clientID string
+ clientSecret string
+ refreshToken string
+}
+
+func newOriginSlackCli(httpCli HttpClientForSlack, accessToken string) *slack.Client {
+ var opt []slack.Option
+ if httpCli != nil {
+ opt = append(opt, slack.OptionHTTPClient(httpCli))
+ }
+
+ return slack.New(accessToken, opt...)
+}
+
+func NewSlackCli(httpCli HttpClientForSlack, clientID, clientSecret, refreshToken, accessToken string) *SlackCli {
+ return &SlackCli{
+ Client: newOriginSlackCli(httpCli, accessToken),
+ clientID: clientID,
+ clientSecret: clientSecret,
+ refreshToken: refreshToken,
+ httpclient: httpCli,
+ }
+}
+
+type StoreNewTokenFunc func(accessToken string, refreshToken string) error
+
+// SendMessageWithTokenExpirationCheck will checks if the error is "token_expired" error,
+// if so, will get new token and try again.
+func (cli *SlackCli) SendMessageWithTokenExpirationCheck(channel string, storeFn StoreNewTokenFunc, options ...slack.MsgOption) (channelID string, msgTimestamp string, respText string, err error) {
+ channelID, msgTimestamp, respText, err = cli.SendMessage(channel, options...)
+
+ if err == nil {
+ return
+ }
+ if err.Error() != "token_expired" {
+ return
+ } | ```suggestion
channelID, msgTimestamp, respText, err = cli.SendMessage(channel, options...)
if err == nil || err.Error() != "token_expired" {
return
}
``` |
insights-bot | github_2023 | go | 65 | nekomeowww | nekomeowww | @@ -9,3 +13,64 @@ func NewSlackWebhookMessage(msg string) *slack.WebhookMessage {
ResponseType: slack.ResponseTypeInChannel,
}
}
+
+type HttpClientForSlack interface { | 就叫 HttpClient 就好吧？ |
insights-bot | github_2023 | go | 65 | nekomeowww | nekomeowww | @@ -9,3 +13,64 @@ func NewSlackWebhookMessage(msg string) *slack.WebhookMessage {
ResponseType: slack.ResponseTypeInChannel,
}
}
+
+type HttpClientForSlack interface {
+ Do(req *http.Request) (*http.Response, error)
+}
+
+type SlackCli struct { | 直接叫 Client 就好了 |
insights-bot | github_2023 | go | 54 | nekomeowww | OverflowCat | @@ -93,9 +93,9 @@ func (m *Model) SaveOneTelegramChatHistory(message *tgbotapi.Message) error {
return nil
}
if message.ForwardFrom != nil {
- telegramChatHistoryCreate.SetText("转发了来自" + tgbot.FullNameFromFirstAndLastName(message.ForwardFrom.FirstName, message.ForwardFrom.LastName) + "的消息：" + text)
+ telegramChatHistoryCreate.SetText(fmt.Sprintf("转发了来自 %s 的消息：%s", tgbot.FullNameFromFirstAndLastName(message.ForwardFrom.FirstName, message.ForwardFrom.LastName), text)) | `[forwarded from %s]: %s` |
insights-bot | github_2023 | go | 54 | nekomeowww | OverflowCat | @@ -234,16 +238,20 @@ func (m *Model) SummarizeChatHistories(chatID int64, histories []*ent.ChatHistor
"msgId:%d: %s 发送：%s", | `"msgId:%d: [%s sent]: %s",` |
insights-bot | github_2023 | go | 54 | nekomeowww | OverflowCat | @@ -234,16 +238,20 @@ func (m *Model) SummarizeChatHistories(chatID int64, histories []*ent.ChatHistor
"msgId:%d: %s 发送：%s",
message.MessageID,
formatFullNameAndUsername(message.FullName, message.Username),
- message.Text,
+ formatChatHistoryTextContent(message.Text),
))
} else {
- repliedToPartialContextMessage := fmt.Sprintf("%s 发送的 msgId:%d 的消息", formatFullNameAndUsername(message.RepliedToFullName, message.RepliedToUsername), message.RepliedToMessageID)
+ repliedToPartialContextMessage := fmt.Sprintf(
+ "%s 发送的 msgId:%d 消息",
+ formatFullNameAndUsername(message.RepliedToFullName, message.RepliedToUsername),
+ message.RepliedToMessageID,
+ )
historiesLLMFriendly = append(historiesLLMFriendly, fmt.Sprintf(
"msgId:%d: %s 回复 %s：%s", | ```go
"msgId:%d: [%s replying to %s]: %s",
``` |
insights-bot | github_2023 | go | 36 | nekomeowww | nekomeowww | @@ -0,0 +1,105 @@
+package slack
+
+import (
+ "context"
+ "errors"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewSlackBot()),
+ )
+}
+
+type NewSlackBotParam struct {
+ fx.In
+
+ Lifecycle fx.Lifecycle
+
+ Config *configs.Config
+ Logger *logger.Logger
+
+ SMR *smr.Model
+}
+
+type SlackBot struct {
+ Config *configs.Config
+ Logger *logger.Logger
+
+ smrModel *smr.Model
+
+ server *http.Server
+ slackCli *slack.Client
+
+ alreadyClosed bool
+ closeChan chan struct{}
+
+ processChan chan recivedCommandInfo
+}
+
+func NewSlackBot() func(param NewSlackBotParam) *SlackBot {
+ return func(param NewSlackBotParam) *SlackBot {
+ if param.Config.SlackBotToken == "" {
+ param.Logger.Warn("slack bot token not provided, will not create bot instance")
+ return nil
+ }
+
+ slackBot := &SlackBot{
+ Config: param.Config,
+ Logger: param.Logger,
+ closeChan: make(chan struct{}, 1),
+ processChan: make(chan recivedCommandInfo, 10),
+ slackCli: slack.New(param.Config.SlackBotToken),
+ smrModel: param.SMR,
+ }
+
+ _, err := slackBot.slackCli.AuthTest()
+ if err != nil {
+ param.Logger.WithError(err).Fatalf("slack bot token auth test failed") | ```suggestion
param.Logger.WithError(err).Fatalf("slack bot token auth test failed")
return
```
`return`? |
insights-bot | github_2023 | go | 36 | nekomeowww | nekomeowww | @@ -0,0 +1,105 @@
+package slack
+
+import (
+ "context"
+ "errors"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewSlackBot()),
+ )
+}
+
+type NewSlackBotParam struct {
+ fx.In
+
+ Lifecycle fx.Lifecycle
+
+ Config *configs.Config
+ Logger *logger.Logger
+
+ SMR *smr.Model
+}
+
+type SlackBot struct {
+ Config *configs.Config
+ Logger *logger.Logger
+
+ smrModel *smr.Model
+
+ server *http.Server
+ slackCli *slack.Client
+
+ alreadyClosed bool
+ closeChan chan struct{}
+
+ processChan chan recivedCommandInfo
+}
+
+func NewSlackBot() func(param NewSlackBotParam) *SlackBot {
+ return func(param NewSlackBotParam) *SlackBot {
+ if param.Config.SlackBotToken == "" {
+ param.Logger.Warn("slack bot token not provided, will not create bot instance")
+ return nil
+ }
+
+ slackBot := &SlackBot{
+ Config: param.Config,
+ Logger: param.Logger,
+ closeChan: make(chan struct{}, 1),
+ processChan: make(chan recivedCommandInfo, 10),
+ slackCli: slack.New(param.Config.SlackBotToken),
+ smrModel: param.SMR,
+ }
+
+ _, err := slackBot.slackCli.AuthTest()
+ if err != nil {
+ param.Logger.WithError(err).Fatalf("slack bot token auth test failed")
+ }
+
+ engine := gin.Default()
+ engine.POST("/slack/command/smr", slackBot.postCommandInfo)
+ slackBot.server = &http.Server{Addr: ":7070", Handler: engine}
+
+ param.Lifecycle.Append(fx.Hook{
+ OnStop: func(ctx context.Context) error {
+ err := slackBot.server.Shutdown(ctx)
+
+ if !errors.Is(err, context.Canceled) {
+ param.Logger.WithField("error", err.Error()).Error("slack bot server shutdown failed")
+ return err
+ }
+ slackBot.Logger.Info("stopped to receiving new requests")
+
+ slackBot.alreadyClosed = true
+ slackBot.closeChan <- struct{}{} | 所以这两个是做什么用的？ |
insights-bot | github_2023 | go | 36 | nekomeowww | nekomeowww | @@ -50,10 +50,24 @@ var (
ErrContentNotSupported = errors.New("content not supported")
)
-func (m *Model) SummarizeInputURL(url string) (string, error) {
+type URLSummarizationOutput struct {
+ URL string
+ Title string
+ Msg string
+}
+
+func (u *URLSummarizationOutput) FormatSummarizationAsHTML() string {
+ return fmt.Sprintf("<b><a href=\"%s\">%s</a></b>\n%s\n\n<em>🤖️ Generated by chatGPT</em>", u.URL, u.Title, u.Msg)
+}
+
+func (u *URLSummarizationOutput) FormatSummarizationAsMarkdown() string {
+ return fmt.Sprintf("*<%s|%s>*\n%s\n\n_🤖️ Generated by chatGPT_", u.URL, u.Title, u.Msg)
+} | 👍 |
insights-bot | github_2023 | go | 36 | nekomeowww | nekomeowww | @@ -0,0 +1,105 @@
+package slack
+
+import (
+ "context"
+ "errors"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewSlackBot()),
+ )
+}
+
+type NewSlackBotParam struct {
+ fx.In
+
+ Lifecycle fx.Lifecycle
+
+ Config *configs.Config
+ Logger *logger.Logger
+
+ SMR *smr.Model
+}
+
+type SlackBot struct {
+ Config *configs.Config
+ Logger *logger.Logger | 其实注入的都可以默认 unexported |
insights-bot | github_2023 | go | 36 | nekomeowww | nekomeowww | @@ -0,0 +1,105 @@
+package slack
+
+import (
+ "context"
+ "errors"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewSlackBot()),
+ )
+}
+
+type NewSlackBotParam struct {
+ fx.In
+
+ Lifecycle fx.Lifecycle
+
+ Config *configs.Config
+ Logger *logger.Logger
+
+ SMR *smr.Model
+}
+
+type SlackBot struct {
+ Config *configs.Config
+ Logger *logger.Logger
+
+ smrModel *smr.Model
+
+ server *http.Server
+ slackCli *slack.Client
+
+ alreadyClosed bool
+ closeChan chan struct{}
+
+ processChan chan recivedCommandInfo
+}
+
+func NewSlackBot() func(param NewSlackBotParam) *SlackBot {
+ return func(param NewSlackBotParam) *SlackBot {
+ if param.Config.SlackBotToken == "" {
+ param.Logger.Warn("slack bot token not provided, will not create bot instance")
+ return nil
+ }
+
+ slackBot := &SlackBot{
+ Config: param.Config,
+ Logger: param.Logger,
+ closeChan: make(chan struct{}, 1),
+ processChan: make(chan recivedCommandInfo, 10),
+ slackCli: slack.New(param.Config.SlackBotToken),
+ smrModel: param.SMR,
+ }
+
+ _, err := slackBot.slackCli.AuthTest()
+ if err != nil {
+ param.Logger.WithError(err).Fatalf("slack bot token auth test failed")
+ }
+
+ engine := gin.Default()
+ engine.POST("/slack/command/smr", slackBot.postCommandInfo)
+ slackBot.server = &http.Server{Addr: ":7070", Handler: engine} | 端口号是写死的吗？这个是 Slack 的要求么？ |
insights-bot | github_2023 | go | 36 | nekomeowww | nekomeowww | @@ -0,0 +1,105 @@
+package slack
+
+import (
+ "context"
+ "errors"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewSlackBot()),
+ )
+}
+
+type NewSlackBotParam struct {
+ fx.In
+
+ Lifecycle fx.Lifecycle
+
+ Config *configs.Config
+ Logger *logger.Logger
+
+ SMR *smr.Model
+}
+
+type SlackBot struct {
+ Config *configs.Config
+ Logger *logger.Logger
+
+ smrModel *smr.Model
+
+ server *http.Server
+ slackCli *slack.Client
+
+ alreadyClosed bool
+ closeChan chan struct{}
+
+ processChan chan recivedCommandInfo
+}
+
+func NewSlackBot() func(param NewSlackBotParam) *SlackBot {
+ return func(param NewSlackBotParam) *SlackBot {
+ if param.Config.SlackBotToken == "" {
+ param.Logger.Warn("slack bot token not provided, will not create bot instance")
+ return nil
+ }
+
+ slackBot := &SlackBot{
+ Config: param.Config,
+ Logger: param.Logger,
+ closeChan: make(chan struct{}, 1),
+ processChan: make(chan recivedCommandInfo, 10),
+ slackCli: slack.New(param.Config.SlackBotToken),
+ smrModel: param.SMR,
+ }
+
+ _, err := slackBot.slackCli.AuthTest()
+ if err != nil {
+ param.Logger.WithError(err).Fatalf("slack bot token auth test failed")
+ }
+
+ engine := gin.Default()
+ engine.POST("/slack/command/smr", slackBot.postCommandInfo)
+ slackBot.server = &http.Server{Addr: ":7070", Handler: engine}
+
+ param.Lifecycle.Append(fx.Hook{
+ OnStop: func(ctx context.Context) error {
+ err := slackBot.server.Shutdown(ctx)
+
+ if !errors.Is(err, context.Canceled) {
+ param.Logger.WithField("error", err.Error()).Error("slack bot server shutdown failed")
+ return err
+ }
+ slackBot.Logger.Info("stopped to receiving new requests")
+
+ slackBot.alreadyClosed = true
+ slackBot.closeChan <- struct{}{}
+
+ return nil
+ },
+ })
+
+ return slackBot
+ }
+}
+
+func Run() func(bot *SlackBot) {
+ return func(bot *SlackBot) {
+ if bot == nil { | 如果 NewSlackBot 的时候返回了 nil，这里 Run 的时候 `fx` 会报错说 not provided 吗？ |
insights-bot | github_2023 | go | 36 | nekomeowww | nekomeowww | @@ -0,0 +1,105 @@
+package slack
+
+import (
+ "context"
+ "errors"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewSlackBot()),
+ )
+}
+
+type NewSlackBotParam struct {
+ fx.In
+
+ Lifecycle fx.Lifecycle
+
+ Config *configs.Config
+ Logger *logger.Logger
+
+ SMR *smr.Model
+}
+
+type SlackBot struct {
+ Config *configs.Config
+ Logger *logger.Logger
+
+ smrModel *smr.Model
+
+ server *http.Server
+ slackCli *slack.Client
+
+ alreadyClosed bool
+ closeChan chan struct{}
+
+ processChan chan recivedCommandInfo
+}
+
+func NewSlackBot() func(param NewSlackBotParam) *SlackBot {
+ return func(param NewSlackBotParam) *SlackBot {
+ if param.Config.SlackBotToken == "" {
+ param.Logger.Warn("slack bot token not provided, will not create bot instance")
+ return nil
+ }
+
+ slackBot := &SlackBot{
+ Config: param.Config,
+ Logger: param.Logger,
+ closeChan: make(chan struct{}, 1),
+ processChan: make(chan recivedCommandInfo, 10),
+ slackCli: slack.New(param.Config.SlackBotToken),
+ smrModel: param.SMR,
+ }
+
+ _, err := slackBot.slackCli.AuthTest()
+ if err != nil {
+ param.Logger.WithError(err).Fatalf("slack bot token auth test failed")
+ }
+
+ engine := gin.Default()
+ engine.POST("/slack/command/smr", slackBot.postCommandInfo)
+ slackBot.server = &http.Server{Addr: ":7070", Handler: engine}
+
+ param.Lifecycle.Append(fx.Hook{
+ OnStop: func(ctx context.Context) error {
+ err := slackBot.server.Shutdown(ctx)
+
+ if !errors.Is(err, context.Canceled) {
+ param.Logger.WithField("error", err.Error()).Error("slack bot server shutdown failed")
+ return err
+ }
+ slackBot.Logger.Info("stopped to receiving new requests")
+
+ slackBot.alreadyClosed = true
+ slackBot.closeChan <- struct{}{}
+
+ return nil
+ },
+ })
+
+ return slackBot
+ }
+}
+
+func Run() func(bot *SlackBot) {
+ return func(bot *SlackBot) {
+ if bot == nil {
+ return
+ }
+ go bot.runSmr()
+
+ if err := bot.server.ListenAndServe(); !errors.Is(err, http.ErrServerClosed) {
+ bot.Logger.WithField("error", err.Error()).Error("slack bot server error")
+ }
+ }
+} | Listen 的时候如果出现端口冲突，应该告诉 `fx` 不要把整个 app boot 起来了。用 Listen then Serve 模式：
```suggestion
func Run() func(bot *SlackBot) error {
return func(bot *SlackBot) error {
if bot == nil {
return
}
listener, err := net.Listen("tcp", bot.server.Addr)
if err != nil {
return err
}
go func() {
err = bot.server.Serve(listener)
if err != nil && err != http.ErrServerClosed {
bot.Logger.WithField("error", err.Error()).Fatal("slack bot server error")
}
}()
go bot.runSmr()
}
}
``` |
insights-bot | github_2023 | go | 36 | nekomeowww | nekomeowww | @@ -0,0 +1,105 @@
+package slack
+
+import (
+ "context"
+ "errors"
+ "net/http" | 如果接受了 Listen and Serve 模式的修改的话记得也改一下 import
```suggestion
"net"
"net/http"
``` |
insights-bot | github_2023 | go | 36 | nekomeowww | nekomeowww | @@ -0,0 +1,105 @@
+package slack
+
+import (
+ "context"
+ "errors"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/models/smr"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/slack-go/slack"
+ "go.uber.org/fx"
+)
+
+func NewModules() fx.Option {
+ return fx.Options(
+ fx.Provide(NewSlackBot()),
+ )
+}
+
+type NewSlackBotParam struct {
+ fx.In
+
+ Lifecycle fx.Lifecycle
+
+ Config *configs.Config
+ Logger *logger.Logger
+
+ SMR *smr.Model
+}
+
+type SlackBot struct {
+ Config *configs.Config
+ Logger *logger.Logger
+
+ smrModel *smr.Model
+
+ server *http.Server
+ slackCli *slack.Client
+
+ alreadyClosed bool
+ closeChan chan struct{}
+
+ processChan chan recivedCommandInfo
+}
+
+func NewSlackBot() func(param NewSlackBotParam) *SlackBot {
+ return func(param NewSlackBotParam) *SlackBot {
+ if param.Config.SlackBotToken == "" {
+ param.Logger.Warn("slack bot token not provided, will not create bot instance")
+ return nil
+ }
+
+ slackBot := &SlackBot{
+ Config: param.Config,
+ Logger: param.Logger,
+ closeChan: make(chan struct{}, 1),
+ processChan: make(chan recivedCommandInfo, 10), | 用 10 个单位的 buffer channel 的用意是什么呢？smr model 本质上是协程安全的 |
insights-bot | github_2023 | go | 36 | nekomeowww | nekomeowww | @@ -0,0 +1,67 @@
+package slack
+
+import (
+ "errors"
+ "net/http"
+ "net/url"
+
+ "github.com/gin-gonic/gin"
+ "github.com/samber/lo"
+ "github.com/slack-go/slack"
+)
+
+type recivedCommandInfo struct {
+ Command string `form:"command"`
+ Text string `form:"text"`
+ ResponseUrl string `form:"response_url"`
+ UserId string `form:"user_id"`
+ ChannelId string `form:"channel_id"`
+}
+
+func (s *SlackBot) postCommandInfo(ctx *gin.Context) {
+ var body recivedCommandInfo
+ if err := ctx.Bind(&body); err != nil {
+ ctx.AbortWithStatus(http.StatusBadRequest)
+ s.Logger.WithField("error", err.Error()).Warn("failed to bind request body, maybe slack request definition changed")
+ return
+ }
+
+ s.Logger.WithFields(map[string]any{ | ```suggestion
s.Logger.WithFields(logrus.Fields{
``` |
insights-bot | github_2023 | go | 36 | nekomeowww | nekomeowww | @@ -0,0 +1,67 @@
+package slack
+
+import (
+ "errors"
+ "net/http"
+ "net/url"
+
+ "github.com/gin-gonic/gin"
+ "github.com/samber/lo"
+ "github.com/slack-go/slack"
+)
+
+type recivedCommandInfo struct {
+ Command string `form:"command"`
+ Text string `form:"text"`
+ ResponseUrl string `form:"response_url"`
+ UserId string `form:"user_id"`
+ ChannelId string `form:"channel_id"`
+}
+
+func (s *SlackBot) postCommandInfo(ctx *gin.Context) {
+ var body recivedCommandInfo
+ if err := ctx.Bind(&body); err != nil {
+ ctx.AbortWithStatus(http.StatusBadRequest)
+ s.Logger.WithField("error", err.Error()).Warn("failed to bind request body, maybe slack request definition changed")
+ return
+ }
+
+ s.Logger.WithFields(map[string]any{
+ "user_id": body.UserId,
+ "channel_id": body.ChannelId,
+ }).Infof("[Slack] Command received: /smr %s", body.Text) | 如果要加前缀就统一一下吧 |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -7,8 +7,9 @@ import (
const (
EnvTelegramBotToken = "TELEGRAM_BOT_TOKEN"
- EnvSlackBotToken = "SLACK_BOT_TOKEN"
- EnvSlackBotPort = "SLACK_BOT_PORT"
+ EnvSlackClientId = "SLACK_CLIENT_ID"
+ EnvSlackClientSecret = "SLACK_CLIENT_SECRET"
+ EnvSlackBotPort = "SLACK_BOT_PORT" | `README.md` 里面也同步更新一下？ |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -32,8 +33,9 @@ type SectionPinecone struct {
}
type SectionSlack struct {
- Port string
- BotToken string
+ Port string
+ ClientId string | `ClientId` -> `ClientID` |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -7,8 +7,9 @@ import (
const (
EnvTelegramBotToken = "TELEGRAM_BOT_TOKEN"
- EnvSlackBotToken = "SLACK_BOT_TOKEN"
- EnvSlackBotPort = "SLACK_BOT_PORT"
+ EnvSlackClientId = "SLACK_CLIENT_ID" | `EnvSlackClientId` -> `EnvSlackClientID` |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -0,0 +1,16 @@
+package slack
+
+type recivedCommandInfo struct {
+ Command string `form:"command"`
+ Text string `form:"text"`
+ ResponseUrl string `form:"response_url"`
+ UserId string `form:"user_id"`
+ ChannelId string `form:"channel_id"`
+ TeamId string `form:"team_id"` | 我发现这几个 ID 也没遵守 Go 命名规范。
顺便改一下吧，辛苦了。 |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -0,0 +1,16 @@
+package slack
+
+type recivedCommandInfo struct {
+ Command string `form:"command"`
+ Text string `form:"text"`
+ ResponseUrl string `form:"response_url"`
+ UserId string `form:"user_id"`
+ ChannelId string `form:"channel_id"`
+ TeamId string `form:"team_id"`
+}
+
+type smrRequestInfo struct {
+ inputUrl string
+ channelId string | 同上 |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -52,9 +47,67 @@ func (s *SlackBot) postCommandInfo(ctx *gin.Context) {
return
}
+ // get access token
+ token, err := s.ent.SlackOAuthCredentials.Query().Where(
+ slackoauthcredentials.TeamID(body.TeamId),
+ ).First(context.Background())
+ if err != nil {
+ s.logger.WithField("error", err.Error()).Warn("slack: failed to get team's access token")
+ ctx.AbortWithStatus(http.StatusUnauthorized)
+ return
+ }
+
// send to channel
- s.processChan <- body
+ s.processChan <- smrRequestInfo{
+ accessToken: token.AccessToken,
+ inputUrl: body.Text,
+ channelId: body.ChannelId,
+ }
// response
ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage("请稍等，量子速读中..."))
}
+
+// receive auth code and request for access token
+func (b *SlackBot) getInstallAuth(ctx *gin.Context) {
+ code := ctx.Query("code")
+ if code == "" {
+ ctx.AbortWithStatus(http.StatusBadRequest)
+ return
+ }
+
+ resp, err := slack.GetOAuthV2Response(&http.Client{}, b.config.Slack.ClientId, b.config.Slack.ClientSecret, code, "")
+ if err != nil {
+ b.logger.WithError(err).Error("slack: failed to get access token, interrupt")
+ ctx.AbortWithStatus(http.StatusServiceUnavailable)
+ return
+ }
+
+ affectRows, err := b.ent.SlackOAuthCredentials.Update().
+ Where(slackoauthcredentials.TeamID(resp.Team.ID)).
+ SetAccessToken(resp.AccessToken).
+ Save(context.Background())
+
+ if err != nil {
+ b.logger.WithError(err).Warn("slack: failed to update access token")
+ ctx.AbortWithStatus(http.StatusInternalServerError)
+ return
+ }
+
+ if affectRows == 0 {
+ // create | 先 check exist 再 create。 |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -52,9 +47,67 @@ func (s *SlackBot) postCommandInfo(ctx *gin.Context) {
return
}
+ // get access token
+ token, err := s.ent.SlackOAuthCredentials.Query().Where(
+ slackoauthcredentials.TeamID(body.TeamId),
+ ).First(context.Background())
+ if err != nil {
+ s.logger.WithField("error", err.Error()).Warn("slack: failed to get team's access token")
+ ctx.AbortWithStatus(http.StatusUnauthorized)
+ return
+ }
+
// send to channel
- s.processChan <- body
+ s.processChan <- smrRequestInfo{
+ accessToken: token.AccessToken,
+ inputUrl: body.Text,
+ channelId: body.ChannelId,
+ }
// response
ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage("请稍等，量子速读中..."))
}
+
+// receive auth code and request for access token
+func (b *SlackBot) getInstallAuth(ctx *gin.Context) {
+ code := ctx.Query("code")
+ if code == "" {
+ ctx.AbortWithStatus(http.StatusBadRequest)
+ return
+ }
+
+ resp, err := slack.GetOAuthV2Response(&http.Client{}, b.config.Slack.ClientId, b.config.Slack.ClientSecret, code, "")
+ if err != nil {
+ b.logger.WithError(err).Error("slack: failed to get access token, interrupt")
+ ctx.AbortWithStatus(http.StatusServiceUnavailable)
+ return
+ }
+
+ affectRows, err := b.ent.SlackOAuthCredentials.Update().
+ Where(slackoauthcredentials.TeamID(resp.Team.ID)).
+ SetAccessToken(resp.AccessToken).
+ Save(context.Background())
+
+ if err != nil {
+ b.logger.WithError(err).Warn("slack: failed to update access token")
+ ctx.AbortWithStatus(http.StatusInternalServerError)
+ return
+ }
+
+ if affectRows == 0 {
+ // create
+ err = b.ent.SlackOAuthCredentials.Create().
+ SetTeamID(resp.Team.ID).
+ SetAccessToken(resp.AccessToken).
+ Exec(context.Background()) | `Exec(...)` 和 `Save(...)` 的区别是啥？能换成 `Save(...)` 吗？ |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -52,9 +47,67 @@ func (s *SlackBot) postCommandInfo(ctx *gin.Context) {
return
}
+ // get access token
+ token, err := s.ent.SlackOAuthCredentials.Query().Where(
+ slackoauthcredentials.TeamID(body.TeamId),
+ ).First(context.Background())
+ if err != nil {
+ s.logger.WithField("error", err.Error()).Warn("slack: failed to get team's access token")
+ ctx.AbortWithStatus(http.StatusUnauthorized)
+ return
+ }
+
// send to channel
- s.processChan <- body
+ s.processChan <- smrRequestInfo{
+ accessToken: token.AccessToken,
+ inputUrl: body.Text,
+ channelId: body.ChannelId,
+ }
// response
ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage("请稍等，量子速读中..."))
}
+
+// receive auth code and request for access token
+func (b *SlackBot) getInstallAuth(ctx *gin.Context) {
+ code := ctx.Query("code")
+ if code == "" {
+ ctx.AbortWithStatus(http.StatusBadRequest)
+ return
+ }
+
+ resp, err := slack.GetOAuthV2Response(&http.Client{}, b.config.Slack.ClientId, b.config.Slack.ClientSecret, code, "")
+ if err != nil {
+ b.logger.WithError(err).Error("slack: failed to get access token, interrupt")
+ ctx.AbortWithStatus(http.StatusServiceUnavailable)
+ return
+ }
+
+ affectRows, err := b.ent.SlackOAuthCredentials.Update().
+ Where(slackoauthcredentials.TeamID(resp.Team.ID)).
+ SetAccessToken(resp.AccessToken).
+ Save(context.Background())
+
+ if err != nil {
+ b.logger.WithError(err).Warn("slack: failed to update access token")
+ ctx.AbortWithStatus(http.StatusInternalServerError)
+ return
+ }
+
+ if affectRows == 0 {
+ // create
+ err = b.ent.SlackOAuthCredentials.Create().
+ SetTeamID(resp.Team.ID).
+ SetAccessToken(resp.AccessToken).
+ Exec(context.Background())
+ if err != nil {
+ b.logger.WithError(err).Warn("slack: failed to save access token")
+ ctx.AbortWithStatus(http.StatusInternalServerError)
+ return
+ }
+ }
+
+ ctx.Header("content-type", "text/html")
+ ctx.Writer.Write([]byte("<h1 style=\"text-align:center\">Success! Now you can close this page<h1>")) | 这里应该有个 `err`？不判断的话显式地 omit assign 一下 |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -52,9 +47,67 @@ func (s *SlackBot) postCommandInfo(ctx *gin.Context) {
return
}
+ // get access token
+ token, err := s.ent.SlackOAuthCredentials.Query().Where(
+ slackoauthcredentials.TeamID(body.TeamId),
+ ).First(context.Background())
+ if err != nil {
+ s.logger.WithField("error", err.Error()).Warn("slack: failed to get team's access token")
+ ctx.AbortWithStatus(http.StatusUnauthorized)
+ return
+ }
+
// send to channel
- s.processChan <- body
+ s.processChan <- smrRequestInfo{
+ accessToken: token.AccessToken,
+ inputUrl: body.Text,
+ channelId: body.ChannelId,
+ }
// response
ctx.JSON(http.StatusOK, slackbot.NewSlackWebhookMessage("请稍等，量子速读中..."))
}
+
+// receive auth code and request for access token
+func (b *SlackBot) getInstallAuth(ctx *gin.Context) {
+ code := ctx.Query("code")
+ if code == "" {
+ ctx.AbortWithStatus(http.StatusBadRequest)
+ return
+ }
+
+ resp, err := slack.GetOAuthV2Response(&http.Client{}, b.config.Slack.ClientId, b.config.Slack.ClientSecret, code, "")
+ if err != nil {
+ b.logger.WithError(err).Error("slack: failed to get access token, interrupt")
+ ctx.AbortWithStatus(http.StatusServiceUnavailable)
+ return
+ }
+
+ affectRows, err := b.ent.SlackOAuthCredentials.Update().
+ Where(slackoauthcredentials.TeamID(resp.Team.ID)).
+ SetAccessToken(resp.AccessToken).
+ Save(context.Background())
+
+ if err != nil {
+ b.logger.WithError(err).Warn("slack: failed to update access token")
+ ctx.AbortWithStatus(http.StatusInternalServerError)
+ return
+ }
+
+ if affectRows == 0 {
+ // create
+ err = b.ent.SlackOAuthCredentials.Create().
+ SetTeamID(resp.Team.ID).
+ SetAccessToken(resp.AccessToken).
+ Exec(context.Background())
+ if err != nil {
+ b.logger.WithError(err).Warn("slack: failed to save access token")
+ ctx.AbortWithStatus(http.StatusInternalServerError)
+ return
+ }
+ } | 数据库相关的都补一下单测。 |
insights-bot | github_2023 | others | 39 | nekomeowww | Garfield550 | @@ -21,8 +22,9 @@ services:
environment:
- TELEGRAM_BOT_TOKEN=<Telegram Bot API Token>
- OPENAI_API_SECRET=<OpenAI API Secret Key>
- - DB_CONNECTION_STR=postgresql://postgres:123456@db_local:5432/postgres?search_path=public&sslmode=disable | 这里的 db 字符串被删掉了。 |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -38,42 +41,42 @@ type SlackBot struct {
smrModel *smr.Model
- server *http.Server
- slackCli *slack.Client
+ server *http.Server
+
+ ent *datastore.Ent
alreadyClosed bool
closeChan chan struct{}
- processChan chan recivedCommandInfo
+ processChan chan smrRequestInfo
}
func NewSlackBot() func(param NewSlackBotParam) *SlackBot {
return func(param NewSlackBotParam) *SlackBot {
slackConfig := param.Config.Slack
- if slackConfig.BotToken == "" {
- param.Logger.Warn("slack bot token not provided, will not create bot instance")
+ if slackConfig.ClientID == "" || slackConfig.ClientSecret == "" {
+ param.Logger.Warn("slack client id or secret not provided, will not create bot instance")
return nil
}
slackBot := &SlackBot{
config: param.Config,
logger: param.Logger,
closeChan: make(chan struct{}, 1),
- processChan: make(chan recivedCommandInfo, 10),
- slackCli: slack.New(slackConfig.BotToken),
+ processChan: make(chan smrRequestInfo, 10),
smrModel: param.SMR,
- }
-
- _, err := slackBot.slackCli.AuthTest()
- if err != nil {
- param.Logger.WithError(err).Fatalf("slack bot token auth test failed")
- return nil
+ ent: param.Ent,
}
engine := gin.Default()
engine.POST("/slack/command/smr", slackBot.postCommandInfo)
- slackBot.server = &http.Server{Addr: lo.Ternary(slackConfig.Port == "", ":7070", slackConfig.Port), Handler: engine}
+ engine.GET("/slack/install/auth", slackBot.getInstallAuth)
+ slackBot.server = &http.Server{
+ Addr: lo.Ternary(slackConfig.Port == "", ":7070", slackConfig.Port), | port 没有 : 会报错吧？ |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -0,0 +1,82 @@
+package slack
+
+import (
+ "context"
+ "log"
+ "testing"
+
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/sirupsen/logrus"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "go.uber.org/fx"
+)
+
+type lifeCycleMock struct{}
+
+func (lifeCycleMock) Append(hook fx.Hook) {}
+
+func newTestSlackBot() *SlackBot {
+ config := configs.NewTestConfig()()
+ ent, err := datastore.NewEnt()(datastore.NewEntParams{
+ Configs: config,
+ Lifecycle: lifeCycleMock{},
+ })
+
+ if err != nil {
+ log.Fatal("datastore init failed")
+ } | ```suggestion
config := configs.NewTestConfig()()
ent, err := datastore.NewEnt()(datastore.NewEntParams{
Configs: config,
Lifecycle: lifeCycleMock{},
})
if err != nil {
log.Fatal("datastore init failed")
}
``` |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -0,0 +1,33 @@
+package slack
+
+import (
+ "context"
+
+ "github.com/nekomeowww/insights-bot/ent/slackoauthcredentials"
+)
+
+func (b *SlackBot) createNewSlackCredential(teamID, accessToken string) error {
+ affectRows, err := b.ent.SlackOAuthCredentials.Update().
+ Where(slackoauthcredentials.TeamID(teamID)).
+ SetAccessToken(accessToken).
+ Save(context.Background())
+
+ if err != nil {
+ b.logger.WithError(err).Warn("slack: failed to update access token")
+ return err
+ } | ```suggestion
affectRows, err := b.ent.SlackOAuthCredentials.Update().
Where(slackoauthcredentials.TeamID(teamID)).
SetAccessToken(accessToken).
Save(context.Background())
if err != nil {
b.logger.WithError(err).Warn("slack: failed to update access token")
return err
}
```
中间没空行是会报错嘛？是的话这个算 false postive，我们可以先合然后我后面再研究研究 qwq |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -7,8 +7,9 @@ import (
const (
EnvTelegramBotToken = "TELEGRAM_BOT_TOKEN" //nolint:gosec
- EnvSlackBotToken = "SLACK_BOT_TOKEN" //nolint:gosec
- EnvSlackBotPort = "SLACK_BOT_PORT"
+ EnvSlackClientID = "SLACK_CLIENT_ID"
+ EnvSlackClientSecret = "SLACK_CLIENT_SECRET"
+ EnvSlackBotPort = "SLACK_BOT_PORT" | 可以叫 `SLACK_BOT_WEBHOOK_PORT` 吗？ |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -0,0 +1,82 @@
+package slack
+
+import (
+ "context"
+ "log"
+ "testing"
+
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/sirupsen/logrus"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "go.uber.org/fx"
+)
+
+type lifeCycleMock struct{}
+
+func (lifeCycleMock) Append(hook fx.Hook) {} | 哦，你知道我们有 `tutils.NewEmptyLifecycle` 可以用吗 |
insights-bot | github_2023 | go | 39 | nekomeowww | nekomeowww | @@ -0,0 +1,82 @@
+package slack
+
+import (
+ "context"
+ "log"
+ "testing"
+
+ "github.com/nekomeowww/insights-bot/internal/configs"
+ "github.com/nekomeowww/insights-bot/internal/datastore"
+ "github.com/nekomeowww/insights-bot/pkg/logger"
+ "github.com/sirupsen/logrus"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "go.uber.org/fx"
+)
+
+type lifeCycleMock struct{}
+
+func (lifeCycleMock) Append(hook fx.Hook) {}
+
+func newTestSlackBot() *SlackBot {
+ config := configs.NewTestConfig()()
+
+ ent, err := datastore.NewEnt()(datastore.NewEntParams{
+ Configs: config,
+ Lifecycle: lifeCycleMock{},
+ })
+ if err != nil {
+ log.Fatal("datastore init failed")
+ }
+
+ return &SlackBot{
+ ent: ent,
+ logger: logger.NewLogger(logrus.InfoLevel, "insights-bot", "", make([]logrus.Hook, 0)),
+ }
+} | 我突然意识到，你可以用 `TestMain` 初始化呀! |
insights-bot | github_2023 | others | 38 | nekomeowww | nekomeowww | @@ -31,3 +31,15 @@ services:
dockerfile: ./Dockerfile
profiles:
- local
+
+ db_local:
+ image: postgres:alpine
+ restart: unless-stopped
+ environment:
+ - POSTGRES_PASSWORD=123456
+ - POSTGRES_USER=postgres
+ - POSTGRES_DB=postgres | 这两个好像都是默认值？默认值的话也可以省略？ |
insights-bot | github_2023 | others | 38 | nekomeowww | nekomeowww | @@ -21,7 +21,7 @@ services:
environment:
- TELEGRAM_BOT_TOKEN=<Telegram Bot API Token>
- OPENAI_API_SECRET=<OpenAI API Secret Key>
- - DB_CONNECTION_STR=<PostgresSQL database URL>
+ - DB_CONNECTION_STR=postgresql://postgres:123456@db_local:5432/postgres?search_path=public&sslmode=disable | `search_path=public` 可以省略呢 |
insights-bot | github_2023 | others | 28 | nekomeowww | nekomeowww | @@ -36,6 +36,12 @@ Remember to replace your token and cookie in `docker-compose.yml`
docker-compose up -d
```
+If you prefer run docker image from local codes, | 👍 |
insights-bot | github_2023 | go | 24 | nekomeowww | nekomeowww | @@ -0,0 +1,23 @@
+package help
+
+import (
+ tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+
+ "github.com/nekomeowww/insights-bot/pkg/handler"
+)
+
+func (h *Handler) HandleHelpCommand(c *handler.Context) {
+ message := tgbotapi.NewMessage(c.Update.Message.Chat.ID, `
+你好，欢迎使用 Insights Bot！
+量子速读 用法：/smr <链接>
+聊天回顾 用法：/recap
+开启聊天记录回顾（群组） 用法：/enable_recap
+关闭聊天记录回顾（群组） 用法：/disable_recap
+ `)
+ message.ReplyToMessageID = c.Update.Message.MessageID
+ _, err := c.Bot.Request(message) | 可以直接用 `c.Bot.MustSend(message)` |
insights-bot | github_2023 | go | 24 | nekomeowww | nekomeowww | @@ -0,0 +1,23 @@
+package help
+
+import (
+ tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+
+ "github.com/nekomeowww/insights-bot/pkg/handler"
+)
+
+func (h *Handler) HandleHelpCommand(c *handler.Context) {
+ message := tgbotapi.NewMessage(c.Update.Message.Chat.ID, `
+你好，欢迎使用 Insights Bot！
+量子速读 用法：/smr <链接>
+聊天回顾 用法：/recap
+开启聊天记录回顾（群组） 用法：/enable_recap
+关闭聊天记录回顾（群组） 用法：/disable_recap
+ `)
+ message.ReplyToMessageID = c.Update.Message.MessageID
+ _, err := c.Bot.Request(message)
+ if err != nil {
+ h.Logger.Errorf("failed to send message to telegram... %v", err)
+ return
+ } | ```suggestion
c.Bot.MustSend(message)
``` |
insights-bot | github_2023 | go | 24 | nekomeowww | nekomeowww | @@ -0,0 +1,23 @@
+package help
+
+import (
+ tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+
+ "github.com/nekomeowww/insights-bot/pkg/handler"
+)
+
+func (h *Handler) HandleHelpCommand(c *handler.Context) {
+ message := tgbotapi.NewMessage(c.Update.Message.Chat.ID, `
+你好，欢迎使用 Insights Bot！
+量子速读 用法：/smr <链接>
+聊天回顾 用法：/recap
+开启聊天记录回顾（群组） 用法：/enable_recap
+关闭聊天记录回顾（群组） 用法：/disable_recap
+ `)
+ message.ReplyToMessageID = c.Update.Message.MessageID
+ err := c.Bot.MustSend(message)
+ if err != nil {
+ h.Logger.Errorf("failed to send message to telegram... %v", err)
+ return
+ } | MustSend 里面会处理好错误记录的，而且返回的也不是 `error`，是 `tgbotapi.Message`，所以这段可以省略了。
```suggestion
``` |
insights-bot | github_2023 | go | 17 | nekomeowww | nekomeowww | @@ -29,12 +28,25 @@ func NewClient(apiSecret string, apiHost string) *Client {
// truncateContentBasedOnTokens 基于 token 计算的方式截断文本
func (c *Client) TruncateContentBasedOnTokens(textContent string, limits int) (string, error) {
- tokens, err := tokenizer.CalToken(textContent)
+ r, err := tokenizer.Encode(textContent)
if err != nil {
return "", err
}
- if tokens > limits {
- return string([]rune(textContent)[:int(math.Min(float64(limits), float64(len([]rune(textContent)))))]), nil
+
+ if len(r.Bpe) > limits { | How about we early return `textContent, nil` when `len(r.Bpe) <= limits`? And then doing the truncate. |
insights-bot | github_2023 | go | 17 | nekomeowww | nekomeowww | @@ -29,12 +28,25 @@ func NewClient(apiSecret string, apiHost string) *Client {
// truncateContentBasedOnTokens 基于 token 计算的方式截断文本
func (c *Client) TruncateContentBasedOnTokens(textContent string, limits int) (string, error) {
- tokens, err := tokenizer.CalToken(textContent)
+ r, err := tokenizer.Encode(textContent)
if err != nil {
return "", err
}
- if tokens > limits {
- return string([]rune(textContent)[:int(math.Min(float64(limits), float64(len([]rune(textContent)))))]), nil
+
+ if len(r.Bpe) > limits {
+ truncatedText, err := tokenizer.Decode(r.Bpe[:limits])
+ if err != nil {
+ return "", err
+ }
+ origin := []rune(textContent)
+ truncated := []rune(truncatedText)
+
+ // 需要确保截断后最后一个字符不是半个汉字
+ if truncated[len(truncated)-1] != origin[len(truncated)-1] {
+ truncatedText = string(truncated[:len(truncated)-1]) | Could we have more comments by this line to say: `把解码后错位的汉字元素抛弃` (discard the wrong Chinese character elements after decoding).
For better understanding, you could also try to rewrite this line as: `string(lo.DropRight(truncated, 1))` |
insights-bot | github_2023 | go | 17 | nekomeowww | nekomeowww | @@ -97,7 +97,7 @@ func (s *ChatHistoryRecapService) SendChatHistoriesRecap() {
continue
}
- s.Logger.Info("sending chat histories recap for chat %d", chatID)
+ s.Logger.Infof("sending chat histories recap for chat %d", chatID) | Thanks! |
insights-bot | github_2023 | go | 17 | nekomeowww | nekomeowww | @@ -3,18 +3,23 @@ package openai
import (
"context"
"fmt"
- "math"
"net/url"
+ "unicode/utf8"
- "github.com/pandodao/tokenizer-go"
+ "github.com/pkoukk/tiktoken-go"
"github.com/sashabaranov/go-openai"
)
type Client struct {
- OpenAIClient *openai.Client
+ tiktokenEncoding *tiktoken.Tiktoken
+ OpenAIClient *openai.Client
}
-func NewClient(apiSecret string, apiHost string) *Client {
+func NewClient(apiSecret string, apiHost string) (*Client, error) {
+ tokenizer, err := tiktoken.EncodingForModel(openai.GPT3Dot5Turbo) | Is `*tiktoken.Tiktoken` concurrent-safe? |
insights-bot | github_2023 | go | 17 | nekomeowww | nekomeowww | @@ -15,9 +15,12 @@ var h *Handler
func TestMain(m *testing.M) {
logger := logger.NewLogger(logrus.DebugLevel, "insights-bot", "", nil)
config := configs.NewConfig()()
- openaiClient := thirdparty.NewOpenAIClient()(thirdparty.NewOpenAIClientParam{
+ openaiClient, err := thirdparty.NewOpenAIClient()(thirdparty.NewOpenAIClientParam{
Config: config,
})
+ if err != nil {
+ os.Exit(1) | ```suggestion
panic(err)
``` |
insights-bot | github_2023 | go | 17 | nekomeowww | nekomeowww | @@ -23,47 +28,47 @@ func NewClient(apiSecret string, apiHost string) *Client {
client := openai.NewClientWithConfig(config)
return &Client{
- OpenAIClient: client,
- }
+ OpenAIClient: client,
+ tiktokenEncoding: tokenizer,
+ }, nil
}
// truncateContentBasedOnTokens 基于 token 计算的方式截断文本
-func (c *Client) TruncateContentBasedOnTokens(textContent string, limits int) (string, error) {
- tokens, err := tokenizer.CalToken(textContent)
- if err != nil {
- return "", err
- }
- if tokens > limits {
- return string([]rune(textContent)[:int(math.Min(float64(limits), float64(len([]rune(textContent)))))]), nil
+func (c *Client) TruncateContentBasedOnTokens(textContent string, limits int) string {
+ tokens := c.tiktokenEncoding.Encode(textContent, nil, nil)
+ if len(tokens) <= limits {
+ return textContent
}
- return textContent, nil
-}
+ truncated := c.tiktokenEncoding.Decode(tokens[:limits])
-// SplitContentBasedByTokenLimitations 基于 token 计算的方式分割文本
-func (c *Client) SplitContentBasedByTokenLimitations(textContent string, limits int) ([]string, error) {
- slices := make([]string, 0)
- slices, err := appendSplitTextByTokenLimitations(slices, textContent, limits)
- if err != nil {
- return make([]string, 0), err
- }
+ for len(truncated) > 0 {
- return slices, nil
-}
+ // 假设 textContent = "小溪河水清澈见底", Encode 结果为 "[31809,36117,103,31106,111,53610,80866,162,122,230,90070,11795,243]" | Nice comments and explanations btw |
insights-bot | github_2023 | go | 2 | nekomeowww | nekomeowww | @@ -0,0 +1,44 @@
+package utils
+
+import (
+ "fmt"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestReplaceMarkdownTitlesToBoldTexts(t *testing.T) {
+ prefix := ""
+ for i := 0; i < 6; i++ {
+ t.Run(fmt.Sprintf("title level %d", i+1), func(t *testing.T) {
+ a := assert.New(t)
+
+ prefix += "#"
+ expect := "**Test**"
+ actual, err := ReplaceMarkdownTitlesToBoldTexts(fmt.Sprintf("%s Test", prefix))
+ a.Empty(err) | 使用 `a.NoError(err)` 来代替 `a.Empty(err)` |
insights-bot | github_2023 | go | 2 | nekomeowww | nekomeowww | @@ -0,0 +1,44 @@
+package utils
+
+import (
+ "fmt"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestReplaceMarkdownTitlesToBoldTexts(t *testing.T) {
+ prefix := ""
+ for i := 0; i < 6; i++ {
+ t.Run(fmt.Sprintf("title level %d", i+1), func(t *testing.T) {
+ a := assert.New(t)
+
+ prefix += "#"
+ expect := "**Test**"
+ actual, err := ReplaceMarkdownTitlesToBoldTexts(fmt.Sprintf("%s Test", prefix))
+ a.Empty(err)
+ a.Equal(expect, actual)
+ })
+ }
+
+ t.Run("more hash tags", func(t *testing.T) {
+ a := assert.New(t)
+
+ prefix += "#"
+ expect := "####### Test"
+ actual, err := ReplaceMarkdownTitlesToBoldTexts(fmt.Sprintf("%s Test", prefix))
+ a.Empty(err) | 使用 `a.NoError(err)` 来代替 `a.Empty(err)` |
insights-bot | github_2023 | go | 2 | nekomeowww | nekomeowww | @@ -0,0 +1,44 @@
+package utils
+
+import (
+ "fmt"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestReplaceMarkdownTitlesToBoldTexts(t *testing.T) {
+ prefix := ""
+ for i := 0; i < 6; i++ {
+ t.Run(fmt.Sprintf("title level %d", i+1), func(t *testing.T) { | 有空格的 sub test 的标题会出问题吗？ |
insights-bot | github_2023 | go | 2 | nekomeowww | nekomeowww | @@ -0,0 +1,44 @@
+package utils
+
+import (
+ "fmt"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestReplaceMarkdownTitlesToBoldTexts(t *testing.T) {
+ prefix := ""
+ for i := 0; i < 6; i++ {
+ t.Run(fmt.Sprintf("title level %d", i+1), func(t *testing.T) {
+ a := assert.New(t)
+
+ prefix += "#"
+ expect := "**Test**"
+ actual, err := ReplaceMarkdownTitlesToBoldTexts(fmt.Sprintf("%s Test", prefix))
+ a.Empty(err)
+ a.Equal(expect, actual)
+ })
+ }
+
+ t.Run("more hash tags", func(t *testing.T) {
+ a := assert.New(t)
+
+ prefix += "#"
+ expect := "####### Test"
+ actual, err := ReplaceMarkdownTitlesToBoldTexts(fmt.Sprintf("%s Test", prefix))
+ a.Empty(err)
+ a.Equal(expect, actual)
+ })
+
+ t.Run("multiple lines", func(t *testing.T) {
+ a := assert.New(t)
+
+ expect := `**there is a title**
+**there is a subtitle**`
+ actual, err := ReplaceMarkdownTitlesToBoldTexts(`# there is a title
+## there is a subtitle`)
+ a.Empty(err) | 使用 `a.NoError(err)` 来代替 `a.Empty(err)` |
insights-bot | github_2023 | go | 2 | nekomeowww | nekomeowww | @@ -53,3 +57,27 @@ func ContainsCJKChar(s string) bool {
return false
}
+
+// ReplaceMarkdownTitlesToBoldTexts
+func ReplaceMarkdownTitlesToBoldTexts(text string) (string, error) {
+ exp, err := regexp.Compile(`(?m)^(#){1,6} (.)*(\n)?`) | 把正则提升为包级 private 变量，然后使用 `regexp.MustCompile(...)` 来创建正则，这样可以在包第一次导入之后就能了解到 regexp 是否正确，也能让 regexp 能被重复利用（相当于缓存）。
关联阅读：[How to cache the compiled regex in Go - Stack Overflow](https://stackoverflow.com/a/72185182) |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.