fix: offset

This commit is contained in:
Rogee
2024-09-04 18:57:58 +08:00
parent c34547a3f1
commit e6d808934d
4 changed files with 19 additions and 32 deletions

View File

@@ -11,36 +11,35 @@ import (
"github.com/gotd/td/telegram/downloader"
"github.com/gotd/td/tg"
"github.com/pkg/errors"
"github.com/samber/lo"
"go.uber.org/zap"
)
func (t *TClient) Channel(ctx context.Context, channel *tg.Channel, cfg *DBChannel, modeHistory bool) error {
func (t *TClient) Channel(ctx context.Context, channel *tg.Channel, cfg *DBChannel) error {
inputPeer := &tg.InputPeerChannel{ChannelID: channel.ID, AccessHash: channel.AccessHash}
limit := 50
request := &tg.MessagesGetHistoryRequest{
Peer: inputPeer,
Limit: 10,
Limit: limit,
}
if modeHistory { // 提供此ID供遍历历史消息
request.OffsetID = cfg.Offset
} else {
request.MinID = cfg.MinID // 提供此ID供新增加的消息
}
request.OffsetID = cfg.MinID + limit
request.MinID = cfg.MinID
// request.OffsetID = 1339
// request.Limit = 1
messages, err := t.Client.API().MessagesGetHistory(ctx, request)
history, err := t.Client.API().MessagesGetHistory(ctx, request)
if err != nil {
return errors.Wrap(err, "messages.getHistory")
}
if len(messages.(*tg.MessagesChannelMessages).GetMessages()) == 0 {
if len(history.(*tg.MessagesChannelMessages).GetMessages()) == 0 {
logger.Info("no new message", zap.Int64("channel", channel.ID))
return errorx.ErrNoNewMessage
}
for _, item := range messages.(*tg.MessagesChannelMessages).GetMessages() {
messages := history.(*tg.MessagesChannelMessages).GetMessages()
messages = lo.Reverse(messages)
for _, item := range messages {
switch item.(type) {
case *tg.MessageEmpty:
continue
@@ -82,6 +81,7 @@ func (t *TClient) Channel(ctx context.Context, channel *tg.Channel, cfg *DBChann
zap.Int64("channel", channel.ID),
zap.Int64("size", doc.GetSize()),
zap.String("SizeHuman", humanize.Bytes(uint64(doc.GetSize()))),
zap.String("Limit", t.Config.MaxSize),
)
break
}
@@ -120,7 +120,7 @@ func (t *TClient) Channel(ctx context.Context, channel *tg.Channel, cfg *DBChann
return err
}
logger.Info("update config", zap.Int("offset", cfg.Offset), zap.Int64("channel", channel.ID))
logger.Info("update config", zap.Int64("channel", channel.ID), zap.Int("msg_id", item.GetID()))
if err := cfg.Update(ctx, item.GetID()); err != nil {
logger.Error("update config failed", zap.Error(err), zap.Int64("channel", channel.ID))
return err