Skip to content

Commit

Permalink
Use only chat system message to get newbies.
Browse files Browse the repository at this point in the history
It is preferred method by telegram developers.
This also remove duplicate messages from irma.
  • Loading branch information
kak-tus committed Jan 14, 2024
1 parent 1bdd2f5 commit 2a25187
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 18 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2024-01-14 v1.9.0
- Use only chat system message to get newbies.
- Remove duplicate messages.

2024-01-02 v1.8.2
- Fix group, not exists in db, get after switch to native pgx.

Expand Down
14 changes: 0 additions & 14 deletions telegram/newbie.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,6 @@ func (hdl *InstanceObj) messageFromNewbie(ctx context.Context, log zerolog.Logge
return nil
}

func (hdl *InstanceObj) newMembersInMessage(ctx context.Context, log zerolog.Logger, msg *tgbotapi.Message) error {
isAdm, err := hdl.isAdmin(msg.Chat.ID, msg.From.ID)
if err != nil {
return err
}

if isAdm {
log.Info().Int64("admin", msg.From.ID).Msg("newbie added by admin, it is normal")
return nil
}

return hdl.newMembers(ctx, log, msg.Chat.ID, msg.NewChatMembers, msg.MessageID)
}

func (hdl *InstanceObj) newMembers(
ctx context.Context,
log zerolog.Logger,
Expand Down
4 changes: 0 additions & 4 deletions telegram/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@ func (hdl *InstanceObj) processMsg(ctx context.Context, msg *tgbotapi.Message) e
return hdl.messageFromNewbie(ctx, log, msg)
}

if msg.NewChatMembers != nil {
return hdl.newMembersInMessage(ctx, log, msg)
}

name := fmt.Sprintf("@%s", hdl.cnf.BotName)

if strings.HasPrefix(msg.Text, name) {
Expand Down

0 comments on commit 2a25187

Please sign in to comment.