From 427f0067d51dbe727d3cc81cf26186fa15961a8a Mon Sep 17 00:00:00 2001 From: imAETHER <36291026+imAETHER@users.noreply.github.com> Date: Tue, 20 Jun 2023 14:14:58 -0300 Subject: [PATCH] Webhook Owner + vertical stacking --- README.md | 10 +++----- go.mod | 29 +++++++++++++----------- go.sum | 68 +++++++++++++++++++++++-------------------------------- main.go | 50 +++++++++++++++++++++++++++++----------- 4 files changed, 84 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index 197deec..96a7b21 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,7 @@ My multi-webhook spammer now made in Go with a simple UI! - 🟣 ratelimited - 🟢 valid and alive -## TODO +# Usage -- [ ] Dynamic alignment -- [x] Spam Message customization - -## Known bugs - -- Webhooks are only stacked horizontally, will overflow if the window size is too small +Either input the tokens manually or add them each on a new line in `webhooks.txt` +You can also customize the spam message by editing `message.json` diff --git a/go.mod b/go.mod index 54b9c1d..2a2e607 100644 --- a/go.mod +++ b/go.mod @@ -3,26 +3,29 @@ module im.aether/multiwebhookspammer go 1.19 require ( - github.com/charmbracelet/bubbletea v0.23.1 - github.com/charmbracelet/lipgloss v0.5.0 + github.com/charmbracelet/bubbletea v0.24.1 + github.com/charmbracelet/lipgloss v0.7.1 ) -require github.com/atotto/clipboard v0.1.4 // indirect +require ( + github.com/atotto/clipboard v0.1.4 // indirect + github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect + golang.org/x/sync v0.2.0 // indirect +) require ( - github.com/aymanbagabas/go-osc52 v1.0.3 // indirect - github.com/charmbracelet/bubbles v0.14.0 - github.com/containerd/console v1.0.3 // indirect + github.com/charmbracelet/bubbles v0.16.1 + github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/mattn/go-localereader v0.0.1 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect - github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect + github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect github.com/muesli/cancelreader v0.2.2 // indirect github.com/muesli/reflow v0.3.0 // indirect - github.com/muesli/termenv v0.13.0 - github.com/rivo/uniseg v0.2.0 // indirect - golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/text v0.3.7 // indirect + github.com/muesli/termenv v0.15.1 + github.com/rivo/uniseg v0.4.4 // indirect + golang.org/x/sys v0.8.0 // indirect + golang.org/x/term v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect ) diff --git a/go.sum b/go.sum index 8d28489..7007c37 100644 --- a/go.sum +++ b/go.sum @@ -1,55 +1,43 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= -github.com/aymanbagabas/go-osc52 v1.0.3 h1:DTwqENW7X9arYimJrPeGZcV0ln14sGMt3pHZspWD+Mg= -github.com/aymanbagabas/go-osc52 v1.0.3/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4= -github.com/charmbracelet/bubbles v0.14.0 h1:DJfCwnARfWjZLvMglhSQzo76UZ2gucuHPy9jLWX45Og= -github.com/charmbracelet/bubbles v0.14.0/go.mod h1:bbeTiXwPww4M031aGi8UK2HT9RDWoiNibae+1yCMtcc= -github.com/charmbracelet/bubbletea v0.21.0/go.mod h1:GgmJMec61d08zXsOhqRC/AiOx4K4pmz+VIcRIm1FKr4= -github.com/charmbracelet/bubbletea v0.23.1 h1:CYdteX1wCiCzKNUlwm25ZHBIc1GXlYFyUIte8WPvhck= -github.com/charmbracelet/bubbletea v0.23.1/go.mod h1:JAfGK/3/pPKHTnAS8JIE2u9f61BjWTQY57RbT25aMXU= -github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao= -github.com/charmbracelet/lipgloss v0.5.0 h1:lulQHuVeodSgDez+3rGiuxlPVXSnhth442DATR2/8t8= -github.com/charmbracelet/lipgloss v0.5.0/go.mod h1:EZLha/HbzEt7cYqdFPovlqy5FZPj0xFhg5SaqxScmgs= -github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= -github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= +github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= +github.com/charmbracelet/bubbles v0.16.1 h1:6uzpAAaT9ZqKssntbvZMlksWHruQLNxg49H5WdeuYSY= +github.com/charmbracelet/bubbles v0.16.1/go.mod h1:2QCp9LFlEsBQMvIYERr7Ww2H2bA7xen1idUDIzm/+Xc= +github.com/charmbracelet/bubbletea v0.24.1 h1:LpdYfnu+Qc6XtvMz6d/6rRY71yttHTP5HtrjMgWvixc= +github.com/charmbracelet/bubbletea v0.24.1/go.mod h1:rK3g/2+T8vOSEkNHvtq40umJpeVYDn6bLaqbgzhL/hg= +github.com/charmbracelet/lipgloss v0.7.1 h1:17WMwi7N1b1rVWOjMT+rCh7sQkvDU75B2hbZpc5Kc1E= +github.com/charmbracelet/lipgloss v0.7.1/go.mod h1:yG0k3giv8Qj8edTCbbg6AlQ5e8KNWpFujkNawKNhE2c= +github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY= +github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= -github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= -github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34= -github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= -github.com/muesli/cancelreader v0.2.0/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= +github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI= +github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo= github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= -github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ= github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= -github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs= -github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs= -github.com/muesli/termenv v0.13.0 h1:wK20DRpJdDX8b7Ek2QfhvqhRQFZ237RGRO0RQ/Iqdy0= -github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc= +github.com/muesli/termenv v0.15.1 h1:UzuTb/+hhlBugQz28rpzey4ZuKcZ03MeKsoG7IJZIxs= +github.com/muesli/termenv v0.15.1/go.mod h1:HeAQPTzpfs016yGtA4g00CsdYnVLJvxsS4ANqrZs2sQ= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= +github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= +golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= diff --git a/main.go b/main.go index d581300..a7bfc67 100644 --- a/main.go +++ b/main.go @@ -23,6 +23,8 @@ const ( ScreenMain = iota ScreenManual ScreenSpam + + maxColumns int = 4 ) var ( @@ -55,21 +57,21 @@ var ( // Green whAliveModel = lipgloss.NewStyle(). - Width(15). + Width(20). Height(5). Align(lipgloss.Center). BorderStyle(lipgloss.DoubleBorder()). BorderForeground(lipgloss.Color("#3ba55c")) // Red whDeadModel = lipgloss.NewStyle(). - Width(15). + Width(20). Height(5). Align(lipgloss.Center). BorderStyle(lipgloss.DoubleBorder()). BorderForeground(lipgloss.Color("#ab0c25")) // Purple-ish whRatelimitModel = lipgloss.NewStyle(). - Width(15). + Width(20). Height(5). Align(lipgloss.Center). BorderStyle(lipgloss.DoubleBorder()). @@ -79,8 +81,15 @@ var ( shouldSpam = false ) +type WOwner struct { + Id string `json:"id"` + Username string `json:"username"` + Discrim string `json:"discriminator"` +} + type Webhook struct { Name string + Owner WOwner Alive bool Url string TotalSent int @@ -113,6 +122,7 @@ type WebhookData struct { type WebhookInfo struct { After float64 `json:"retry_after"` Name string `json:"name"` + Owner WOwner `json:"user"` } type PModel struct { @@ -263,6 +273,7 @@ func executeWebhooks() { } webhook.Name = whinfo.Name + webhook.Owner = whinfo.Owner } postBody, err := json.Marshal(spamMessage) @@ -364,7 +375,7 @@ func (m PModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { for _, v := range strings.Split(whFileData, "\n") { webhooks = append(webhooks, Webhook{ Alive: true, - Url: v, + Url: strings.Trim(v, "\n\t\r"), TotalSent: 0, TotalMissed: 0, }) @@ -464,30 +475,43 @@ func (m PModel) View() string { executeWebhooks() } - var secondary []string + // I feel like I could do a simple calculation to avoid having to grow it in the loop + displayRows := make([][]string, 1) aliveHooks := 0 deadHooks := 0 limitedHooks := 0 + + totalRows := 0 + tempIndex := 0 for _, wh := range webhooks { - // I feel like I could simplify this a bit if wh.Alive { aliveHooks++ if wh.Ratelimit > 0 { - secondary = append(secondary, whRatelimitModel.Render(fmt.Sprintf("%s\n\n%s\nSent: %d\nMissed: %d\nTimeout: %.2f", m.spinner.View(), wh.Name, wh.TotalSent, wh.TotalMissed, wh.Ratelimit))) + displayRows[totalRows] = append(displayRows[totalRows], whRatelimitModel.Render(fmt.Sprintf("%s\n\n%s\n\nOwner: %s#%s\n\nSent: %d\nTimeout: %.2f", m.spinner.View(), wh.Name, wh.Owner.Username, wh.Owner.Discrim, wh.TotalSent, wh.Ratelimit))) limitedHooks++ } else { - secondary = append(secondary, whAliveModel.Render(fmt.Sprintf("%s\n\n%s\nSent: %d\nMissed: %d", m.spinner.View(), wh.Name, wh.TotalSent, wh.TotalMissed))) + displayRows[totalRows] = append(displayRows[totalRows], whAliveModel.Render(fmt.Sprintf("%s\n\n%s\n\nOwner: %s#%s\n\nSent: %d", m.spinner.View(), wh.Name, wh.Owner.Username, wh.Owner.Discrim, wh.TotalSent))) } } else { deadHooks++ - secondary = append(secondary, whDeadModel.Render(fmt.Sprintf("%s\n\n%s\nSent: %d\nMissed: %d", "DELETED", wh.Name, wh.TotalSent, wh.TotalMissed))) + displayRows[totalRows] = append(displayRows[totalRows], whDeadModel.Render(fmt.Sprintf("%s\n\n%s\n\nOwner: %s#%s\n\nSent: %d", "DELETED", wh.Name, wh.Owner.Username, wh.Owner.Discrim, wh.TotalSent))) } - } - body := colBanner(fmt.Sprintf("[!] Spamming | %d total | %d alive | %d dead | %d ratelimited\n\n", len(webhooks), aliveHooks, deadHooks, limitedHooks)) + if tempIndex >= maxColumns { + displayRows = append(displayRows, make([]string, maxColumns)) + tempIndex = 0 + totalRows++ + continue + } + tempIndex++ + } + body := colBanner(fmt.Sprintf("[!] Spamming | %d total | %d alive | %d dead/deleted | %d ratelimited\n\n", len(webhooks), aliveHooks, deadHooks, limitedHooks)) - body += lipgloss.JoinHorizontal(lipgloss.Top, secondary...) + for _, row := range displayRows { + body += lipgloss.JoinHorizontal(lipgloss.Top, row...) + body += "\n" + } body += "\n\n" + colInfo("(i) Press ESCAPE to exit.") return body @@ -505,7 +529,7 @@ func main() { } defer restoreConsole() - termenv.DefaultOutput().SetWindowTitle("Aether's MultiWebhook Spammer v2") + termenv.DefaultOutput().SetWindowTitle("Aether's MultiWebhook Spammer v2.2") p := tea.NewProgram(setupOptions(), tea.WithAltScreen()) if _, err := p.Run(); err != nil {