merged from gramsrv upstream
This commit is contained in:
parent
79c64ee916
commit
21a0856587
651 changed files with 54774 additions and 4590 deletions
|
|
@ -338,9 +338,13 @@ func (r *Router) mentionedUserIDsFromDomainMessage(ctx context.Context, currentU
|
|||
}
|
||||
}
|
||||
if identity != nil {
|
||||
for _, username := range extractMentionUsernames(message, domain.MaxChannelMentionRecipients-len(out)) {
|
||||
blocked := mentionScanBlockedSpansFromDomainEntities(message, entities)
|
||||
for _, username := range extractMentionUsernames(message, domain.MaxChannelMentionRecipients-len(out), blocked) {
|
||||
user, found, err := identity.ResolveUsername(ctx, currentUserID, username)
|
||||
if err != nil {
|
||||
if isMentionResolveMiss(err) {
|
||||
continue
|
||||
}
|
||||
return nil, internalErr()
|
||||
}
|
||||
if found {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue