Spaces:
Sleeping
Sleeping
Upload 113 files
Browse files- internal/bot/workers.go +6 -62
- internal/commands/add_token.go +11 -5
- internal/commands/commands.go +1 -1
internal/bot/workers.go
CHANGED
|
@@ -2,7 +2,6 @@ package bot
|
|
| 2 |
|
| 3 |
import (
|
| 4 |
"EverythingSuckz/fsb/config"
|
| 5 |
-
"EverythingSuckz/fsb/internal/utils"
|
| 6 |
"context"
|
| 7 |
"fmt"
|
| 8 |
"os"
|
|
@@ -72,12 +71,12 @@ func (w *BotWorkers) incStarting() {
|
|
| 72 |
w.starting++
|
| 73 |
}
|
| 74 |
|
| 75 |
-
func (w *BotWorkers) Add(token string) (
|
| 76 |
w.mut.Lock()
|
| 77 |
for _, b := range w.Bots {
|
| 78 |
if b.Token == token {
|
| 79 |
w.mut.Unlock()
|
| 80 |
-
return fmt.Errorf("el token ya existe en la lista de workers")
|
| 81 |
}
|
| 82 |
}
|
| 83 |
w.mut.Unlock()
|
|
@@ -86,7 +85,7 @@ func (w *BotWorkers) Add(token string) (err error) {
|
|
| 86 |
var botID int = w.starting
|
| 87 |
client, err := startWorker(w.log, token, botID)
|
| 88 |
if err != nil {
|
| 89 |
-
return err
|
| 90 |
}
|
| 91 |
w.log.Sugar().Infof("Bot @%s loaded with ID %d", client.Self.Username, botID)
|
| 92 |
w.mut.Lock()
|
|
@@ -98,64 +97,9 @@ func (w *BotWorkers) Add(token string) (err error) {
|
|
| 98 |
log: w.log,
|
| 99 |
})
|
| 100 |
|
| 101 |
-
var mainBot *gotgproto.Client
|
| 102 |
-
if len(w.Bots) > 0 {
|
| 103 |
-
mainBot = w.Bots[0].Client
|
| 104 |
-
}
|
| 105 |
w.mut.Unlock()
|
| 106 |
-
|
| 107 |
-
|
| 108 |
-
if mainBot != nil && token != config.ValueOf.BotToken {
|
| 109 |
-
go func(username string) {
|
| 110 |
-
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
|
| 111 |
-
defer cancel()
|
| 112 |
-
|
| 113 |
-
resolved, err := mainBot.API().ContactsResolveUsername(ctx, &tg.ContactsResolveUsernameRequest{Username: username})
|
| 114 |
-
if err != nil {
|
| 115 |
-
w.log.Sugar().Warnf("Auto-promote: no se pudo resolver @%s - %v", username, err)
|
| 116 |
-
return
|
| 117 |
-
}
|
| 118 |
-
|
| 119 |
-
var targetUser *tg.InputUser
|
| 120 |
-
if len(resolved.Users) > 0 {
|
| 121 |
-
if u, ok := resolved.Users[0].(*tg.User); ok {
|
| 122 |
-
targetUser = &tg.InputUser{
|
| 123 |
-
UserID: u.ID,
|
| 124 |
-
AccessHash: u.AccessHash,
|
| 125 |
-
}
|
| 126 |
-
}
|
| 127 |
-
}
|
| 128 |
-
if targetUser == nil {
|
| 129 |
-
return
|
| 130 |
-
}
|
| 131 |
-
|
| 132 |
-
channel, err := utils.GetLogChannelPeer(ctx, mainBot.API(), mainBot.PeerStorage)
|
| 133 |
-
if err != nil {
|
| 134 |
-
w.log.Sugar().Warnf("Auto-promote: error obteniendo Log Channel - %v", err)
|
| 135 |
-
return
|
| 136 |
-
}
|
| 137 |
-
|
| 138 |
-
_, err = mainBot.API().ChannelsEditAdmin(ctx, &tg.ChannelsEditAdminRequest{
|
| 139 |
-
Channel: channel,
|
| 140 |
-
UserID: targetUser,
|
| 141 |
-
AdminRights: tg.ChatAdminRights{
|
| 142 |
-
// ¡REQUISITO DE TELEGRAM!: Para añadir un bot a un canal, DEBE tener al menos un permiso de administrador en "true".
|
| 143 |
-
// Si todos son "false", Telegram asume que intentas añadirlo como miembro normal (lo cual está prohibido para bots),
|
| 144 |
-
// y arroja el error CHAT_ADMIN_REQUIRED. Le daremos el permiso inofensivo de invitar usuarios.
|
| 145 |
-
InviteUsers: true,
|
| 146 |
-
},
|
| 147 |
-
Rank: "Worker Bot",
|
| 148 |
-
})
|
| 149 |
-
|
| 150 |
-
if err != nil {
|
| 151 |
-
w.log.Sugar().Warnf("⚠️ Falló auto-promover a @%s en el canal. Asegúrate de que el Bot Principal tenga permiso de 'Añadir nuevos admins': %v", username, err)
|
| 152 |
-
} else {
|
| 153 |
-
w.log.Sugar().Infof("✅ ¡Bot @%s fue promovido a Administrador en el canal automáticamente!", username)
|
| 154 |
-
}
|
| 155 |
-
}(client.Self.Username)
|
| 156 |
-
}
|
| 157 |
-
|
| 158 |
-
return nil
|
| 159 |
}
|
| 160 |
|
| 161 |
func GetNextWorker() *Worker {
|
|
@@ -207,7 +151,7 @@ func StartWorkers(log *zap.Logger) (*BotWorkers, error) {
|
|
| 207 |
|
| 208 |
done := make(chan error, 1)
|
| 209 |
go func() {
|
| 210 |
-
err := Workers.Add(allTokens[i])
|
| 211 |
done <- err
|
| 212 |
}()
|
| 213 |
|
|
|
|
| 2 |
|
| 3 |
import (
|
| 4 |
"EverythingSuckz/fsb/config"
|
|
|
|
| 5 |
"context"
|
| 6 |
"fmt"
|
| 7 |
"os"
|
|
|
|
| 71 |
w.starting++
|
| 72 |
}
|
| 73 |
|
| 74 |
+
func (w *BotWorkers) Add(token string) (string, error) {
|
| 75 |
w.mut.Lock()
|
| 76 |
for _, b := range w.Bots {
|
| 77 |
if b.Token == token {
|
| 78 |
w.mut.Unlock()
|
| 79 |
+
return "", fmt.Errorf("el token ya existe en la lista de workers")
|
| 80 |
}
|
| 81 |
}
|
| 82 |
w.mut.Unlock()
|
|
|
|
| 85 |
var botID int = w.starting
|
| 86 |
client, err := startWorker(w.log, token, botID)
|
| 87 |
if err != nil {
|
| 88 |
+
return "", err
|
| 89 |
}
|
| 90 |
w.log.Sugar().Infof("Bot @%s loaded with ID %d", client.Self.Username, botID)
|
| 91 |
w.mut.Lock()
|
|
|
|
| 97 |
log: w.log,
|
| 98 |
})
|
| 99 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 100 |
w.mut.Unlock()
|
| 101 |
+
|
| 102 |
+
return client.Self.Username, nil
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 103 |
}
|
| 104 |
|
| 105 |
func GetNextWorker() *Worker {
|
|
|
|
| 151 |
|
| 152 |
done := make(chan error, 1)
|
| 153 |
go func() {
|
| 154 |
+
_, err := Workers.Add(allTokens[i])
|
| 155 |
done <- err
|
| 156 |
}()
|
| 157 |
|
internal/commands/add_token.go
CHANGED
|
@@ -1,6 +1,7 @@
|
|
| 1 |
package commands
|
| 2 |
|
| 3 |
import (
|
|
|
|
| 4 |
"regexp"
|
| 5 |
"strings"
|
| 6 |
|
|
@@ -78,9 +79,13 @@ func (c *command) HandleBotTokenMessage(d dispatcher.Dispatcher) {
|
|
| 78 |
// 1. Save it to Firebase
|
| 79 |
err := SaveTokenFunc(token)
|
| 80 |
if err != nil {
|
| 81 |
-
|
| 82 |
-
|
| 83 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 84 |
}
|
| 85 |
|
| 86 |
// Respond immediately to stop the webhook from retrying and causing duplicates
|
|
@@ -88,12 +93,13 @@ func (c *command) HandleBotTokenMessage(d dispatcher.Dispatcher) {
|
|
| 88 |
|
| 89 |
// 2. Add it to the dynamic worker pool in the background
|
| 90 |
go func(t string) {
|
| 91 |
-
startErr := StartWorkerFunc(t)
|
| 92 |
if startErr != nil {
|
| 93 |
c.log.Error("Failed to start worker with new token", zap.Error(startErr))
|
| 94 |
_, _ = ctx.Reply(u, ext.ReplyTextString("⚠️ El bot se guardó, pero falló al unirse (¿Token inválido?): "+startErr.Error()), nil)
|
| 95 |
} else {
|
| 96 |
-
|
|
|
|
| 97 |
}
|
| 98 |
}(token)
|
| 99 |
|
|
|
|
| 1 |
package commands
|
| 2 |
|
| 3 |
import (
|
| 4 |
+
"fmt"
|
| 5 |
"regexp"
|
| 6 |
"strings"
|
| 7 |
|
|
|
|
| 79 |
// 1. Save it to Firebase
|
| 80 |
err := SaveTokenFunc(token)
|
| 81 |
if err != nil {
|
| 82 |
+
if strings.Contains(err.Error(), "ya existe") {
|
| 83 |
+
_, _ = ctx.Reply(u, ext.ReplyTextString("⚠️ Este token ya está registrado en Firebase."), nil)
|
| 84 |
+
} else {
|
| 85 |
+
c.log.Error("Failed to save token to firebase", zap.Error(err))
|
| 86 |
+
_, _ = ctx.Reply(u, ext.ReplyTextString("❌ Error al guardar el token en Firebase: "+err.Error()), nil)
|
| 87 |
+
}
|
| 88 |
+
return nil
|
| 89 |
}
|
| 90 |
|
| 91 |
// Respond immediately to stop the webhook from retrying and causing duplicates
|
|
|
|
| 93 |
|
| 94 |
// 2. Add it to the dynamic worker pool in the background
|
| 95 |
go func(t string) {
|
| 96 |
+
username, startErr := StartWorkerFunc(t)
|
| 97 |
if startErr != nil {
|
| 98 |
c.log.Error("Failed to start worker with new token", zap.Error(startErr))
|
| 99 |
_, _ = ctx.Reply(u, ext.ReplyTextString("⚠️ El bot se guardó, pero falló al unirse (¿Token inválido?): "+startErr.Error()), nil)
|
| 100 |
} else {
|
| 101 |
+
successText := fmt.Sprintf("@%s\n`%s`\n\nse agrego correctamente al fire base", username, t)
|
| 102 |
+
_, _ = ctx.Reply(u, ext.ReplyTextString(successText), nil)
|
| 103 |
}
|
| 104 |
}(token)
|
| 105 |
|
internal/commands/commands.go
CHANGED
|
@@ -14,7 +14,7 @@ import (
|
|
| 14 |
|
| 15 |
var (
|
| 16 |
SaveTokenFunc func(string) error
|
| 17 |
-
StartWorkerFunc func(string) error
|
| 18 |
LoadTokensFunc func() ([]string, error)
|
| 19 |
GetWorkerListFunc func(bool) string
|
| 20 |
)
|
|
|
|
| 14 |
|
| 15 |
var (
|
| 16 |
SaveTokenFunc func(string) error
|
| 17 |
+
StartWorkerFunc func(token string) (string, error)
|
| 18 |
LoadTokensFunc func() ([]string, error)
|
| 19 |
GetWorkerListFunc func(bool) string
|
| 20 |
)
|