astra/owpengram-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

merged from gramsrv upstream

Browse source
This commit is contained in:
onysd 2026-09-01 12:06:31 +03:00
parent 79c64ee916
commit 21a0856587
651 changed files with 54774 additions and 4590 deletions
Download patch file Download diff file Expand all files Collapse all files

24
internal/rpc/send_media.go
View file

@ -134,10 +134,21 @@ func (r *Router) sendOutgoing(ctx context.Context, userID int64, peer domain.Pee
if err := r.ensureVoiceMessagesAllowed(ctx, userID, peer, p.media != nil && p.media.HasUnreadPayload()); err != nil {
return nil, false, err
}
if r.deps.Users != nil && peer.ID != userID {
if _, found, err := r.deps.Users.ByID(ctx, userID, peer.ID); err != nil {
var projectedUsers []domain.User
if r.deps.Users != nil {
loaded, err := r.deps.Users.ByIDs(ctx, userID, []int64{userID, peer.ID})
if err != nil {
return nil, false, internalErr()
} else if !found {
}
projectedUsers = loaded
peerFound := peer.ID == userID
for _, user := range projectedUsers {
if user.ID == peer.ID {
peerFound = true
break
}
}
if !peerFound {
return nil, false, peerIDInvalidErr()
}
}
@ -170,6 +181,7 @@ func (r *Router) sendOutgoing(ctx context.Context, userID int64, peer domain.Pee
Date: int(r.clock.Now().Unix()),
OriginAuthKeyID: authKeyID,
OriginSessionID: sessionID,
OriginClientSession: clientSessionMetadataFromContext(ctx),
RecipientBlocked: recipientBlocked,
IdempotencyFingerprint: p.idempotencyFingerprint,
IdempotencyPreflighted: p.idempotencyPreflighted,
@ -198,11 +210,11 @@ func (r *Router) sendOutgoing(ctx context.Context, userID int64, peer domain.Pee
var users []tg.UserClass
var chats []tg.ChatClass
if !res.Duplicate {
users = r.usersForMessageUpdate(ctx, userID, res.SenderMessage)
users = r.usersForMessageUpdateWithPreloaded(ctx, userID, res.SenderMessage, projectedUsers)
chats = r.chatsForMessageUpdate(ctx, userID, res.SenderMessage)
}
if p.clearDraft && !res.Duplicate {
r.clearDraftAfterSend(ctx, userID, peer, replyTo)
r.clearDraftAfterSendWithPeerObjects(ctx, userID, peer, replyTo, users, chats)
}
if !res.Duplicate {
// 链接预览 pending 占位：带外解析并就地替换（异步，不阻塞发送 echo）。
@ -328,7 +340,7 @@ func (r *Router) onMessagesSendMedia(ctx context.Context, req *tg.MessagesSendMe
if req.ClearDraft {
r.clearDraftAfterSend(ctx, userID, peer, replyTo)
}
return r.monoforumSendUpdates(ctx, userID, replay.channel.Channel, savedPeer, replay.channel), nil
return r.monoforumSendUpdatesStrict(ctx, userID, replay.channel.Channel, savedPeer, replay.channel)
}
if r.messageEffectInvalid(ctx, req.Effect) {
return nil, effectIDInvalidErr()