mirror of
https://github.com/usememos/memos.git
synced 2025-04-02 20:10:45 +02:00
refactor: change all Robot
to Bot
(#1767)
* Change all `Robot` to `Bot` * Change all `r` of `Bot` to `b` * Change `Robot` to `bot` in comments * Fix typo --------- Co-authored-by: Athurg Feng <athurg@gooth.org>
This commit is contained in:
parent
ddf4cae537
commit
845297ec03
@ -35,8 +35,8 @@ const (
|
|||||||
SystemSettingLocalStoragePathName SystemSettingName = "local-storage-path"
|
SystemSettingLocalStoragePathName SystemSettingName = "local-storage-path"
|
||||||
// SystemSettingOpenAIConfigName is the name of OpenAI config.
|
// SystemSettingOpenAIConfigName is the name of OpenAI config.
|
||||||
SystemSettingOpenAIConfigName SystemSettingName = "openai-config"
|
SystemSettingOpenAIConfigName SystemSettingName = "openai-config"
|
||||||
// SystemSettingTelegramRobotToken is the name of Telegram Robot Token.
|
// SystemSettingTelegramBotToken is the name of Telegram Bot Token.
|
||||||
SystemSettingTelegramRobotTokenName SystemSettingName = "telegram-robot-token"
|
SystemSettingTelegramBotTokenName SystemSettingName = "telegram-bot-token"
|
||||||
SystemSettingMemoDisplayWithUpdatedTsName SystemSettingName = "memo-display-with-updated-ts"
|
SystemSettingMemoDisplayWithUpdatedTsName SystemSettingName = "memo-display-with-updated-ts"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -87,8 +87,8 @@ func (key SystemSettingName) String() string {
|
|||||||
return "local-storage-path"
|
return "local-storage-path"
|
||||||
case SystemSettingOpenAIConfigName:
|
case SystemSettingOpenAIConfigName:
|
||||||
return "openai-config"
|
return "openai-config"
|
||||||
case SystemSettingTelegramRobotTokenName:
|
case SystemSettingTelegramBotTokenName:
|
||||||
return "telegram-robot-token"
|
return "telegram-bot-token"
|
||||||
case SystemSettingMemoDisplayWithUpdatedTsName:
|
case SystemSettingMemoDisplayWithUpdatedTsName:
|
||||||
return "memo-display-with-updated-ts"
|
return "memo-display-with-updated-ts"
|
||||||
}
|
}
|
||||||
@ -178,11 +178,11 @@ func (upsert SystemSettingUpsert) Validate() error {
|
|||||||
if err := json.Unmarshal([]byte(upsert.Value), &value); err != nil {
|
if err := json.Unmarshal([]byte(upsert.Value), &value); err != nil {
|
||||||
return fmt.Errorf(systemSettingUnmarshalError, settingName)
|
return fmt.Errorf(systemSettingUnmarshalError, settingName)
|
||||||
}
|
}
|
||||||
case SystemSettingTelegramRobotTokenName:
|
case SystemSettingTelegramBotTokenName:
|
||||||
if upsert.Value == "" {
|
if upsert.Value == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// Robot Token with Reverse Proxy shoule like `http.../bot<token>`
|
// Bot Token with Reverse Proxy shoule like `http.../bot<token>`
|
||||||
if strings.HasPrefix(upsert.Value, "http") {
|
if strings.HasPrefix(upsert.Value, "http") {
|
||||||
slashIndex := strings.LastIndexAny(upsert.Value, "/")
|
slashIndex := strings.LastIndexAny(upsert.Value, "/")
|
||||||
if strings.HasPrefix(upsert.Value[slashIndex:], "/bot") {
|
if strings.HasPrefix(upsert.Value[slashIndex:], "/bot") {
|
||||||
|
@ -7,7 +7,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// EditMessage make an editMessageText api request.
|
// EditMessage make an editMessageText api request.
|
||||||
func (r *Robot) EditMessage(ctx context.Context, chatID, messageID int, text string) (*Message, error) {
|
func (b *Bot) EditMessage(ctx context.Context, chatID, messageID int, text string) (*Message, error) {
|
||||||
formData := url.Values{
|
formData := url.Values{
|
||||||
"message_id": {strconv.Itoa(messageID)},
|
"message_id": {strconv.Itoa(messageID)},
|
||||||
"chat_id": {strconv.Itoa(chatID)},
|
"chat_id": {strconv.Itoa(chatID)},
|
||||||
@ -15,7 +15,7 @@ func (r *Robot) EditMessage(ctx context.Context, chatID, messageID int, text str
|
|||||||
}
|
}
|
||||||
|
|
||||||
var result Message
|
var result Message
|
||||||
err := r.postForm(ctx, "/editMessageText", formData, &result)
|
err := b.postForm(ctx, "/editMessageText", formData, &result)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -6,13 +6,13 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// GetFile get download info of File by fileID from Telegram.
|
// GetFile get download info of File by fileID from Telegram.
|
||||||
func (r *Robot) GetFile(ctx context.Context, fileID string) (*File, error) {
|
func (b *Bot) GetFile(ctx context.Context, fileID string) (*File, error) {
|
||||||
formData := url.Values{
|
formData := url.Values{
|
||||||
"file_id": {fileID},
|
"file_id": {fileID},
|
||||||
}
|
}
|
||||||
|
|
||||||
var result File
|
var result File
|
||||||
err := r.postForm(ctx, "/getFile", formData, &result)
|
err := b.postForm(ctx, "/getFile", formData, &result)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -7,14 +7,14 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// GetUpdates make a getUpdates api request.
|
// GetUpdates make a getUpdates api request.
|
||||||
func (r *Robot) GetUpdates(ctx context.Context, offset int) ([]Update, error) {
|
func (b *Bot) GetUpdates(ctx context.Context, offset int) ([]Update, error) {
|
||||||
formData := url.Values{
|
formData := url.Values{
|
||||||
"timeout": {"60"},
|
"timeout": {"60"},
|
||||||
"offset": {strconv.Itoa(offset)},
|
"offset": {strconv.Itoa(offset)},
|
||||||
}
|
}
|
||||||
|
|
||||||
var result []Update
|
var result []Update
|
||||||
err := r.postForm(ctx, "/getUpdates", formData, &result)
|
err := b.postForm(ctx, "/getUpdates", formData, &result)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// SendReplyMessage make a sendMessage api request.
|
// SendReplyMessage make a sendMessage api request.
|
||||||
func (r *Robot) SendReplyMessage(ctx context.Context, chatID, replyID int, text string) (*Message, error) {
|
func (b *Bot) SendReplyMessage(ctx context.Context, chatID, replyID int, text string) (*Message, error) {
|
||||||
formData := url.Values{
|
formData := url.Values{
|
||||||
"reply_to_message_id": {strconv.Itoa(replyID)},
|
"reply_to_message_id": {strconv.Itoa(replyID)},
|
||||||
"chat_id": {strconv.Itoa(chatID)},
|
"chat_id": {strconv.Itoa(chatID)},
|
||||||
@ -15,7 +15,7 @@ func (r *Robot) SendReplyMessage(ctx context.Context, chatID, replyID int, text
|
|||||||
}
|
}
|
||||||
|
|
||||||
var result Message
|
var result Message
|
||||||
err := r.postForm(ctx, "/sendMessage", formData, &result)
|
err := b.postForm(ctx, "/sendMessage", formData, &result)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -12,28 +12,28 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Handler interface {
|
type Handler interface {
|
||||||
RobotToken(ctx context.Context) string
|
BotToken(ctx context.Context) string
|
||||||
MessageHandle(ctx context.Context, message Message, blobs map[string][]byte) error
|
MessageHandle(ctx context.Context, message Message, blobs map[string][]byte) error
|
||||||
}
|
}
|
||||||
|
|
||||||
type Robot struct {
|
type Bot struct {
|
||||||
handler Handler
|
handler Handler
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewRobotWithHandler create a telegram robot with specified handler.
|
// NewBotWithHandler create a telegram bot with specified handler.
|
||||||
func NewRobotWithHandler(h Handler) *Robot {
|
func NewBotWithHandler(h Handler) *Bot {
|
||||||
return &Robot{handler: h}
|
return &Bot{handler: h}
|
||||||
}
|
}
|
||||||
|
|
||||||
const noTokenWait = 30 * time.Second
|
const noTokenWait = 30 * time.Second
|
||||||
const errRetryWait = 10 * time.Second
|
const errRetryWait = 10 * time.Second
|
||||||
|
|
||||||
// Start start an infinity call of getUpdates from Telegram, call r.MessageHandle while get new message updates.
|
// Start start an infinity call of getUpdates from Telegram, call r.MessageHandle while get new message updates.
|
||||||
func (r *Robot) Start(ctx context.Context) {
|
func (b *Bot) Start(ctx context.Context) {
|
||||||
var offset int
|
var offset int
|
||||||
|
|
||||||
for {
|
for {
|
||||||
updates, err := r.GetUpdates(ctx, offset)
|
updates, err := b.GetUpdates(ctx, offset)
|
||||||
if err == ErrInvalidToken {
|
if err == ErrInvalidToken {
|
||||||
time.Sleep(noTokenWait)
|
time.Sleep(noTokenWait)
|
||||||
continue
|
continue
|
||||||
@ -55,7 +55,7 @@ func (r *Robot) Start(ctx context.Context) {
|
|||||||
|
|
||||||
// skip message other than text or photo
|
// skip message other than text or photo
|
||||||
if message.Text == nil && message.Photo == nil {
|
if message.Text == nil && message.Photo == nil {
|
||||||
_, err := r.SendReplyMessage(ctx, message.Chat.ID, message.MessageID, "Only text or photo message be supported")
|
_, err := b.SendReplyMessage(ctx, message.Chat.ID, message.MessageID, "Only text or photo message be supported")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error(fmt.Sprintf("fail to telegram.SendReplyMessage for messageID=%d", message.MessageID), zap.Error(err))
|
log.Error(fmt.Sprintf("fail to telegram.SendReplyMessage for messageID=%d", message.MessageID), zap.Error(err))
|
||||||
}
|
}
|
||||||
@ -68,14 +68,14 @@ func (r *Robot) Start(ctx context.Context) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
err = r.handleSingleMessage(ctx, message)
|
err = b.handleSingleMessage(ctx, message)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error(fmt.Sprintf("fail to handleSingleMessage for messageID=%d", message.MessageID), zap.Error(err))
|
log.Error(fmt.Sprintf("fail to handleSingleMessage for messageID=%d", message.MessageID), zap.Error(err))
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
err = r.handleGroupMessages(ctx, groupMessages)
|
err = b.handleGroupMessages(ctx, groupMessages)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("fail to handle plain text message", zap.Error(err))
|
log.Error("fail to handle plain text message", zap.Error(err))
|
||||||
}
|
}
|
||||||
@ -84,8 +84,8 @@ func (r *Robot) Start(ctx context.Context) {
|
|||||||
|
|
||||||
var ErrInvalidToken = errors.New("token is invalid")
|
var ErrInvalidToken = errors.New("token is invalid")
|
||||||
|
|
||||||
func (r *Robot) apiURL(ctx context.Context) (string, error) {
|
func (b *Bot) apiURL(ctx context.Context) (string, error) {
|
||||||
token := r.handler.RobotToken(ctx)
|
token := b.handler.BotToken(ctx)
|
||||||
if token == "" {
|
if token == "" {
|
||||||
return "", ErrInvalidToken
|
return "", ErrInvalidToken
|
||||||
}
|
}
|
@ -9,12 +9,12 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// downloadFileId download file with fileID, return the filepath and blob.
|
// downloadFileId download file with fileID, return the filepath and blob.
|
||||||
func (r *Robot) downloadFileID(ctx context.Context, fileID string) (string, []byte, error) {
|
func (b *Bot) downloadFileID(ctx context.Context, fileID string) (string, []byte, error) {
|
||||||
file, err := r.GetFile(ctx, fileID)
|
file, err := b.GetFile(ctx, fileID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", nil, err
|
return "", nil, err
|
||||||
}
|
}
|
||||||
blob, err := r.downloadFilepath(ctx, file.FilePath)
|
blob, err := b.downloadFilepath(ctx, file.FilePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", nil, err
|
return "", nil, err
|
||||||
}
|
}
|
||||||
@ -23,8 +23,8 @@ func (r *Robot) downloadFileID(ctx context.Context, fileID string) (string, []by
|
|||||||
}
|
}
|
||||||
|
|
||||||
// downloadFilepath download file with filepath, you can get filepath by calling GetFile.
|
// downloadFilepath download file with filepath, you can get filepath by calling GetFile.
|
||||||
func (r *Robot) downloadFilepath(ctx context.Context, filePath string) ([]byte, error) {
|
func (b *Bot) downloadFilepath(ctx context.Context, filePath string) ([]byte, error) {
|
||||||
apiURL, err := r.apiURL(ctx)
|
apiURL, err := b.apiURL(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -15,8 +15,8 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// handleSingleMessage handle a message not belongs to group.
|
// handleSingleMessage handle a message not belongs to group.
|
||||||
func (r *Robot) handleSingleMessage(ctx context.Context, message Message) error {
|
func (b *Bot) handleSingleMessage(ctx context.Context, message Message) error {
|
||||||
reply, err := r.SendReplyMessage(ctx, message.Chat.ID, message.MessageID, workingMessage)
|
reply, err := b.SendReplyMessage(ctx, message.Chat.ID, message.MessageID, workingMessage)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("fail to SendReplyMessage: %s", err)
|
return fmt.Errorf("fail to SendReplyMessage: %s", err)
|
||||||
}
|
}
|
||||||
@ -25,10 +25,10 @@ func (r *Robot) handleSingleMessage(ctx context.Context, message Message) error
|
|||||||
|
|
||||||
// download blob if need
|
// download blob if need
|
||||||
if len(message.Photo) > 0 {
|
if len(message.Photo) > 0 {
|
||||||
filepath, blob, err := r.downloadFileID(ctx, message.GetMaxPhotoFileID())
|
filepath, blob, err := b.downloadFileID(ctx, message.GetMaxPhotoFileID())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("fail to downloadFileID", zap.Error(err))
|
log.Error("fail to downloadFileID", zap.Error(err))
|
||||||
_, err = r.EditMessage(ctx, message.Chat.ID, reply.MessageID, err.Error())
|
_, err = b.EditMessage(ctx, message.Chat.ID, reply.MessageID, err.Error())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("fail to EditMessage: %s", err)
|
return fmt.Errorf("fail to EditMessage: %s", err)
|
||||||
}
|
}
|
||||||
@ -37,15 +37,15 @@ func (r *Robot) handleSingleMessage(ctx context.Context, message Message) error
|
|||||||
blobs = map[string][]byte{filepath: blob}
|
blobs = map[string][]byte{filepath: blob}
|
||||||
}
|
}
|
||||||
|
|
||||||
err = r.handler.MessageHandle(ctx, message, blobs)
|
err = b.handler.MessageHandle(ctx, message, blobs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if _, err := r.EditMessage(ctx, message.Chat.ID, reply.MessageID, err.Error()); err != nil {
|
if _, err := b.EditMessage(ctx, message.Chat.ID, reply.MessageID, err.Error()); err != nil {
|
||||||
return fmt.Errorf("fail to EditMessage: %s", err)
|
return fmt.Errorf("fail to EditMessage: %s", err)
|
||||||
}
|
}
|
||||||
return fmt.Errorf("fail to MessageHandle: %s", err)
|
return fmt.Errorf("fail to MessageHandle: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := r.EditMessage(ctx, message.Chat.ID, reply.MessageID, successMessage); err != nil {
|
if _, err := b.EditMessage(ctx, message.Chat.ID, reply.MessageID, successMessage); err != nil {
|
||||||
return fmt.Errorf("fail to EditMessage: %s", err)
|
return fmt.Errorf("fail to EditMessage: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ func (r *Robot) handleSingleMessage(ctx context.Context, message Message) error
|
|||||||
}
|
}
|
||||||
|
|
||||||
// handleGroupMessages handle a message belongs to group.
|
// handleGroupMessages handle a message belongs to group.
|
||||||
func (r *Robot) handleGroupMessages(ctx context.Context, groupMessages []Message) error {
|
func (b *Bot) handleGroupMessages(ctx context.Context, groupMessages []Message) error {
|
||||||
captions := make(map[string]string, len(groupMessages))
|
captions := make(map[string]string, len(groupMessages))
|
||||||
messages := make(map[string]Message, len(groupMessages))
|
messages := make(map[string]Message, len(groupMessages))
|
||||||
blobs := make(map[string]map[string][]byte, len(groupMessages))
|
blobs := make(map[string]map[string][]byte, len(groupMessages))
|
||||||
@ -68,7 +68,7 @@ func (r *Robot) handleGroupMessages(ctx context.Context, groupMessages []Message
|
|||||||
captions[groupID] += *message.Caption
|
captions[groupID] += *message.Caption
|
||||||
}
|
}
|
||||||
|
|
||||||
filepath, blob, err := r.downloadFileID(ctx, message.GetMaxPhotoFileID())
|
filepath, blob, err := b.downloadFileID(ctx, message.GetMaxPhotoFileID())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("fail to downloadFileID")
|
return fmt.Errorf("fail to downloadFileID")
|
||||||
}
|
}
|
||||||
@ -80,7 +80,7 @@ func (r *Robot) handleGroupMessages(ctx context.Context, groupMessages []Message
|
|||||||
|
|
||||||
// Handle each group message
|
// Handle each group message
|
||||||
for groupID, message := range messages {
|
for groupID, message := range messages {
|
||||||
reply, err := r.SendReplyMessage(ctx, message.Chat.ID, message.MessageID, workingMessage)
|
reply, err := b.SendReplyMessage(ctx, message.Chat.ID, message.MessageID, workingMessage)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("fail to SendReplyMessage: %s", err)
|
return fmt.Errorf("fail to SendReplyMessage: %s", err)
|
||||||
}
|
}
|
||||||
@ -88,14 +88,14 @@ func (r *Robot) handleGroupMessages(ctx context.Context, groupMessages []Message
|
|||||||
// replace Caption with all Caption in the group
|
// replace Caption with all Caption in the group
|
||||||
caption := captions[groupID]
|
caption := captions[groupID]
|
||||||
message.Caption = &caption
|
message.Caption = &caption
|
||||||
if err := r.handler.MessageHandle(ctx, message, blobs[groupID]); err != nil {
|
if err := b.handler.MessageHandle(ctx, message, blobs[groupID]); err != nil {
|
||||||
if _, err = r.EditMessage(ctx, message.Chat.ID, reply.MessageID, err.Error()); err != nil {
|
if _, err = b.EditMessage(ctx, message.Chat.ID, reply.MessageID, err.Error()); err != nil {
|
||||||
return fmt.Errorf("fail to EditMessage: %s", err)
|
return fmt.Errorf("fail to EditMessage: %s", err)
|
||||||
}
|
}
|
||||||
return fmt.Errorf("fail to MessageHandle: %s", err)
|
return fmt.Errorf("fail to MessageHandle: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := r.EditMessage(ctx, message.Chat.ID, reply.MessageID, successMessage); err != nil {
|
if _, err := b.EditMessage(ctx, message.Chat.ID, reply.MessageID, successMessage); err != nil {
|
||||||
return fmt.Errorf("fail to EditMessage: %s", err)
|
return fmt.Errorf("fail to EditMessage: %s", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,8 +9,8 @@ import (
|
|||||||
"net/url"
|
"net/url"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (r *Robot) postForm(ctx context.Context, apiPath string, formData url.Values, result any) error {
|
func (b *Bot) postForm(ctx context.Context, apiPath string, formData url.Values, result any) error {
|
||||||
apiURL, err := r.apiURL(ctx)
|
apiURL, err := b.apiURL(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@ type Server struct {
|
|||||||
Profile *profile.Profile
|
Profile *profile.Profile
|
||||||
Store *store.Store
|
Store *store.Store
|
||||||
|
|
||||||
telegramRobot *telegram.Robot
|
telegramBot *telegram.Bot
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewServer(ctx context.Context, profile *profile.Profile) (*Server, error) {
|
func NewServer(ctx context.Context, profile *profile.Profile) (*Server, error) {
|
||||||
@ -48,8 +48,8 @@ func NewServer(ctx context.Context, profile *profile.Profile) (*Server, error) {
|
|||||||
storeInstance := store.New(db.DBInstance, profile)
|
storeInstance := store.New(db.DBInstance, profile)
|
||||||
s.Store = storeInstance
|
s.Store = storeInstance
|
||||||
|
|
||||||
telegramRobotHandler := newTelegramHandler(storeInstance)
|
telegramBotHandler := newTelegramHandler(storeInstance)
|
||||||
s.telegramRobot = telegram.NewRobotWithHandler(telegramRobotHandler)
|
s.telegramBot = telegram.NewBotWithHandler(telegramBotHandler)
|
||||||
|
|
||||||
e.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{
|
e.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{
|
||||||
Format: `{"time":"${time_rfc3339}",` +
|
Format: `{"time":"${time_rfc3339}",` +
|
||||||
@ -125,7 +125,7 @@ func (s *Server) Start(ctx context.Context) error {
|
|||||||
return errors.Wrap(err, "failed to create activity")
|
return errors.Wrap(err, "failed to create activity")
|
||||||
}
|
}
|
||||||
|
|
||||||
go s.telegramRobot.Start(ctx)
|
go s.telegramBot.Start(ctx)
|
||||||
|
|
||||||
return s.e.Start(fmt.Sprintf(":%d", s.Profile.Port))
|
return s.e.Start(fmt.Sprintf(":%d", s.Profile.Port))
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,7 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
|
|||||||
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find system setting list").SetInternal(err)
|
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find system setting list").SetInternal(err)
|
||||||
}
|
}
|
||||||
for _, systemSetting := range systemSettingList {
|
for _, systemSetting := range systemSettingList {
|
||||||
if systemSetting.Name == api.SystemSettingServerIDName || systemSetting.Name == api.SystemSettingSecretSessionName || systemSetting.Name == api.SystemSettingOpenAIConfigName || systemSetting.Name == api.SystemSettingTelegramRobotTokenName {
|
if systemSetting.Name == api.SystemSettingServerIDName || systemSetting.Name == api.SystemSettingSecretSessionName || systemSetting.Name == api.SystemSettingOpenAIConfigName || systemSetting.Name == api.SystemSettingTelegramBotTokenName {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,8 +21,8 @@ func newTelegramHandler(store *store.Store) *telegramHandler {
|
|||||||
return &telegramHandler{store: store}
|
return &telegramHandler{store: store}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *telegramHandler) RobotToken(ctx context.Context) string {
|
func (t *telegramHandler) BotToken(ctx context.Context) string {
|
||||||
return t.store.GetSystemSettingValueOrDefault(&ctx, api.SystemSettingTelegramRobotTokenName, "")
|
return t.store.GetSystemSettingValueOrDefault(&ctx, api.SystemSettingTelegramBotTokenName, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *telegramHandler) MessageHandle(ctx context.Context, message telegram.Message, blobs map[string][]byte) error {
|
func (t *telegramHandler) MessageHandle(ctx context.Context, message telegram.Message, blobs map[string][]byte) error {
|
||||||
|
@ -34,7 +34,7 @@ const SystemSection = () => {
|
|||||||
maxUploadSizeMiB: systemStatus.maxUploadSizeMiB,
|
maxUploadSizeMiB: systemStatus.maxUploadSizeMiB,
|
||||||
memoDisplayWithUpdatedTs: systemStatus.memoDisplayWithUpdatedTs,
|
memoDisplayWithUpdatedTs: systemStatus.memoDisplayWithUpdatedTs,
|
||||||
});
|
});
|
||||||
const [telegramRobotToken, setTelegramRobotToken] = useState<string>("");
|
const [telegramBotToken, setTelegramBotToken] = useState<string>("");
|
||||||
const [openAIConfig, setOpenAIConfig] = useState<OpenAIConfig>({
|
const [openAIConfig, setOpenAIConfig] = useState<OpenAIConfig>({
|
||||||
key: "",
|
key: "",
|
||||||
host: "",
|
host: "",
|
||||||
@ -51,9 +51,9 @@ const SystemSection = () => {
|
|||||||
setOpenAIConfig(JSON.parse(openAIConfigSetting.value));
|
setOpenAIConfig(JSON.parse(openAIConfigSetting.value));
|
||||||
}
|
}
|
||||||
|
|
||||||
const telegramRobotSetting = systemSettings.find((setting) => setting.name === "telegram-robot-token");
|
const telegramBotSetting = systemSettings.find((setting) => setting.name === "telegram-bot-token");
|
||||||
if (telegramRobotSetting) {
|
if (telegramBotSetting) {
|
||||||
setTelegramRobotToken(telegramRobotSetting.value);
|
setTelegramBotToken(telegramBotSetting.value);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}, []);
|
}, []);
|
||||||
@ -135,22 +135,22 @@ const SystemSection = () => {
|
|||||||
toast.success("OpenAI Config updated");
|
toast.success("OpenAI Config updated");
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleTelegramRobotTokenChanged = (value: string) => {
|
const handleTelegramBotTokenChanged = (value: string) => {
|
||||||
setTelegramRobotToken(value);
|
setTelegramBotToken(value);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleSaveTelegramRobotToken = async () => {
|
const handleSaveTelegramBotToken = async () => {
|
||||||
try {
|
try {
|
||||||
await api.upsertSystemSetting({
|
await api.upsertSystemSetting({
|
||||||
name: "telegram-robot-token",
|
name: "telegram-bot-token",
|
||||||
value: telegramRobotToken,
|
value: telegramBotToken,
|
||||||
});
|
});
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
toast.error(error.response.data.message);
|
toast.error(error.response.data.message);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
toast.success("OpenAI Config updated");
|
toast.success("Telegram Bot Token updated");
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleAdditionalStyleChanged = (value: string) => {
|
const handleAdditionalStyleChanged = (value: string) => {
|
||||||
@ -292,14 +292,14 @@ const SystemSection = () => {
|
|||||||
<div className="form-label">
|
<div className="form-label">
|
||||||
<div className="flex flex-row items-center">
|
<div className="flex flex-row items-center">
|
||||||
<div className="w-auto flex items-center">
|
<div className="w-auto flex items-center">
|
||||||
<span className="text-sm mr-1">{t("setting.system-section.telegram-robot-token")}</span>
|
<span className="text-sm mr-1">{t("setting.system-section.telegram-bot-token")}</span>
|
||||||
<HelpButton
|
<HelpButton
|
||||||
hint={t("setting.system-section.telegram-robot-token-description")}
|
hint={t("setting.system-section.telegram-bot-token-description")}
|
||||||
url="https://usememos.com/docs/integration/telegram-bot"
|
url="https://usememos.com/docs/integration/telegram-bot"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Button onClick={handleSaveTelegramRobotToken}>{t("common.save")}</Button>
|
<Button onClick={handleSaveTelegramBotToken}>{t("common.save")}</Button>
|
||||||
</div>
|
</div>
|
||||||
<Input
|
<Input
|
||||||
className="w-full"
|
className="w-full"
|
||||||
@ -307,9 +307,9 @@ const SystemSection = () => {
|
|||||||
fontFamily: "monospace",
|
fontFamily: "monospace",
|
||||||
fontSize: "14px",
|
fontSize: "14px",
|
||||||
}}
|
}}
|
||||||
placeholder={t("setting.system-section.telegram-robot-token-placeholder")}
|
placeholder={t("setting.system-section.telegram-bot-token-placeholder")}
|
||||||
value={telegramRobotToken}
|
value={telegramBotToken}
|
||||||
onChange={(event) => handleTelegramRobotTokenChanged(event.target.value)}
|
onChange={(event) => handleTelegramBotTokenChanged(event.target.value)}
|
||||||
/>
|
/>
|
||||||
<Divider className="!mt-3 !my-4" />
|
<Divider className="!mt-3 !my-4" />
|
||||||
<div className="form-label">
|
<div className="form-label">
|
||||||
|
@ -193,7 +193,7 @@
|
|||||||
"mobile-editor-style": "Mobile editor style",
|
"mobile-editor-style": "Mobile editor style",
|
||||||
"default-memo-sort-option": "Memo display time",
|
"default-memo-sort-option": "Memo display time",
|
||||||
"telegram-user-id": "Telegram UserID",
|
"telegram-user-id": "Telegram UserID",
|
||||||
"telegram-user-id-placeholder": "Send any words to Your Telegram Robot to get",
|
"telegram-user-id-placeholder": "Send any words to Your Telegram Bot to get",
|
||||||
"created_ts": "Created Time",
|
"created_ts": "Created Time",
|
||||||
"updated_ts": "Updated Time",
|
"updated_ts": "Updated Time",
|
||||||
"daily-review-time-offset": "Daily Review Time Offset",
|
"daily-review-time-offset": "Daily Review Time Offset",
|
||||||
@ -258,9 +258,9 @@
|
|||||||
"additional-script": "Additional script",
|
"additional-script": "Additional script",
|
||||||
"additional-style-placeholder": "Additional CSS code",
|
"additional-style-placeholder": "Additional CSS code",
|
||||||
"additional-script-placeholder": "Additional JavaScript code",
|
"additional-script-placeholder": "Additional JavaScript code",
|
||||||
"telegram-robot-token": "Telegram Robot Token",
|
"telegram-bot-token": "Telegram Bot Token",
|
||||||
"telegram-robot-token-description": "Telegram Robot Token or API Proxy like `http.../bot<token>`",
|
"telegram-bot-token-description": "Telegram Bot Token or API Proxy like `http.../bot<token>`",
|
||||||
"telegram-robot-token-placeholder": "Your Telegram Robot token",
|
"telegram-bot-token-placeholder": "Your Telegram Bot token",
|
||||||
"openai-api-key": "OpenAI: API Key",
|
"openai-api-key": "OpenAI: API Key",
|
||||||
"openai-api-key-description": "Get API key",
|
"openai-api-key-description": "Get API key",
|
||||||
"openai-api-key-placeholder": "Your OpenAI API Key",
|
"openai-api-key-placeholder": "Your OpenAI API Key",
|
||||||
|
@ -258,9 +258,9 @@
|
|||||||
"additional-script": "추가적인 스크립트",
|
"additional-script": "추가적인 스크립트",
|
||||||
"additional-style-placeholder": "추가적인 CSS 코드",
|
"additional-style-placeholder": "추가적인 CSS 코드",
|
||||||
"additional-script-placeholder": "추가적인 JavaScript 코드",
|
"additional-script-placeholder": "추가적인 JavaScript 코드",
|
||||||
"telegram-robot-token": "텔레그램 봇 연동",
|
"telegram-bot-token": "텔레그램 봇 연동",
|
||||||
"telegram-robot-token-description": "텔레그램 @BotFather 에서 얻을 수 있습니다",
|
"telegram-bot-token-description": "텔레그램 @BotFather 에서 얻을 수 있습니다",
|
||||||
"telegram-robot-token-placeholder": "서버의 텔레그램 봇 토큰",
|
"telegram-bot-token-placeholder": "서버의 텔레그램 봇 토큰",
|
||||||
"openai-api-key": "OpenAI: API 키",
|
"openai-api-key": "OpenAI: API 키",
|
||||||
"openai-api-key-description": "API 키 받아오기",
|
"openai-api-key-description": "API 키 받아오기",
|
||||||
"openai-api-key-placeholder": "내 OpenAI API 키",
|
"openai-api-key-placeholder": "내 OpenAI API 키",
|
||||||
|
@ -410,10 +410,10 @@
|
|||||||
"database-file-size": "数据库文件大小",
|
"database-file-size": "数据库文件大小",
|
||||||
"disable-public-memos": "禁用公共备忘录",
|
"disable-public-memos": "禁用公共备忘录",
|
||||||
"ignore-version-upgrade": "忽略版本升级",
|
"ignore-version-upgrade": "忽略版本升级",
|
||||||
"telegram-robot-token": "Telegram 机器人 Token",
|
"telegram-bot-token": "Telegram 机器人 Token",
|
||||||
"telegram-robot-token-description": "从 Telegram 的 @BotFather 处获取",
|
"telegram-bot-token-description": "从 Telegram 的 @BotFather 处获取",
|
||||||
"telegram-robot-token-description": "Telegram 机器人Token或`http.../bot<token>`格式的代理地址",
|
"telegram-bot-token-description": "Telegram 机器人Token或`http.../bot<token>`格式的代理地址",
|
||||||
"telegram-robot-token-placeholder": "Telegram 的机器人 Token",
|
"telegram-bot-token-placeholder": "Telegram 的机器人 Token",
|
||||||
"openai-api-host": "OpenAI:API Host",
|
"openai-api-host": "OpenAI:API Host",
|
||||||
"openai-api-host-placeholder": "默认:https://api.openai.com/",
|
"openai-api-host-placeholder": "默认:https://api.openai.com/",
|
||||||
"openai-api-key": "OpenAI:API 密钥",
|
"openai-api-key": "OpenAI:API 密钥",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user