8000 Bump github.com/sabafly/sabafly-lib from 1.1.0 to 1.4.0 by dependabot[bot] · Pull Request #101 · sabafly/gobot · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Bump github.com/sabafly/sabafly-lib from 1.1.0 to 1.4.0 #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 15, 2023
Merged

Bump github.com/sabafly/sabafly-lib from 1.1.0 to 1.4.0 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0e6ef9
Bump github.com/sabafly/sabafly-lib from 1.1.0 to 1.4.0
dependabot[bot] May 15, 2023
1f76230
Bump github.com/sabafly/sabafly-lib from 1.1.0 to 1.4.0
dependabot[bot] May 15, 2023
4a202a8
depend: 依存関係を更新
ikafly144 May 15, 2023
ce615cc
Merge branch 'dependabot/go_modules/github.com/sabafly/sabafly-lib-1.…
ikafly144 May 15, 2023
daf0998
fix: 非推奨の関数を使わないように
ikafly144 May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bot/commands/poll.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func Poll(b *botlib.Bot[db.DB]) handler.Command {
if ctx.Member() != nil && ctx.Member().Permissions.Has(permission) {
return true
}
_ = botlib.ReturnErrMessage(ctx, "error_no_permission", "", "", map[string]any{"Name": permission.String()})
_ = botlib.ReturnErrMessage(ctx, "error_no_permission", botlib.WithTranslateData(map[string]any{"Name": permission.String()}))
return false
},
CommandHandlers: map[string]handler.CommandHandler{
Expand Down
14 changes: 7 additions & 7 deletions bot/commands/role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func Role(b *botlib.Bot[db.DB]) handler.Command {
if ctx.Member() != nil && ctx.Member().Permissions.Has(permission) {
return true
}
_ = botlib.ReturnErrMessage(ctx, "error_no_permission", "", "", map[string]any{"Name": permission.String()})
_ = botlib.ReturnErrMessage(ctx, "error_no_permission", botlib.WithTranslateData(map[string]any{"Name": permission.String()}))
return false
},
CommandHandlers: map[string]handler.CommandHandler{
Expand All @@ -70,7 +70,7 @@ func rolePanelDeleteHandler(b *botlib.Bot[db.DB]) func(event *events.Application
return func(event *events.ApplicationCommandInteractionCreate) error {
gData, err := b.DB.GuildData().Get(*event.GuildID())
if err != nil {
return botlib.ReturnErrMessage(event, "error_has_no_data", "", "")
return botlib.ReturnErrMessage(event, "error_has_no_data")
}
options := []discord.StringSelectMenuOption{}
for u := range gData.RolePanel {
Expand Down Expand Up @@ -121,7 +121,7 @@ func rolePanelListHandler(b *botlib.Bot[db.DB]) func(event *events.ApplicationCo
return func(event *events.ApplicationCommandInteractionCreate) error {
gData, err := b.DB.GuildData().Get(*event.GuildID())
if err != nil {
return botlib.ReturnErrMessage(event, "error_has_no_data", "", "")
return botlib.ReturnErrMessage(event, "error_has_no_data")
}
fields := []discord.EmbedField{}
for u, gdrp := range gData.RolePanel {
Expand Down Expand Up @@ -467,7 +467,7 @@ func roleComponentCreateHandler(b *botlib.Bot[db.DB]) func(event *events.Compone
}
gData.RolePanel[r.UUID()] = db.GuildDataRolePanel{OnList: false}
if gData.RolePanelLimit > 25 || len(gData.RolePanel) > gData.RolePanelLimit {
return botlib.ReturnErrMessage(event, "error_guild_max_count_limit_has_reached", "", "")
return botlib.ReturnErrMessage(event, "error_guild_max_count_limit_has_reached")
}
err = b.DB.GuildData().Set(gData.ID, gData)
if err != nil {
Expand Down Expand Up @@ -528,7 +528,7 @@ func roleComponentCreateHandler(b *botlib.Bot[db.DB]) func(event *events.Compone
}
gData.RolePanel[r.UUID()] = db.GuildDataRolePanel{OnList: true}
if gData.RolePanelLimit > 25 || len(gData.RolePanel) > gData.RolePanelLimit {
return botlib.ReturnErrMessage(event, "error_guild_max_count_limit_has_reached", "", "")
return botlib.ReturnErrMessage(event, "error_guild_max_count_limit_has_reached")
}
err = b.DB.GuildData().Set(gData.ID, gData)
if err != nil {
Expand Down Expand Up @@ -835,7 +835,7 @@ func roleComponentAddRoleSelectMenuHandler(b *botlib.Bot[db.DB]) func(event *eve

self, valid := event.Client().Caches().SelfMember(*event.GuildID())
if !valid {
return botlib.ReturnErrMessage(event, "error_bot_member_not_found", "", "")
return botlib.ReturnErrMessage(event, "error_bot_member_not_found")
}
roleMap := make(map[snowflake.ID]discord.Role)
for _, i2 := range self.RoleIDs {
Expand Down Expand Up @@ -992,7 +992,7 @@ func roleModalChangeSettingsHandler(b *botlib.Bot[db.DB]) func(event *events.Mod
}
value, err := strconv.ParseInt(event.ModalSubmitInteraction.Data.Text("value"), 10, 64)
if err != nil || value < 1 || value > 25 {
return botlib.ReturnErrMessage(event, "error_out_of_range_select_menu", "", "")
return botlib.ReturnErrMessage(event, "error_out_of_range_select_menu")
}
switch args[4] {
case "max":
Expand Down
4 changes: 2 additions & 2 deletions bot/commands/role_panel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func rolePanelHandler(b *botlib.Bot[db.DB]) func(event *events.ApplicationComman
return func(event *events.ApplicationCommandInteractionCreate) error {
gData, err := b.DB.GuildData().Get(*event.GuildID())
if err != nil {
return botlib.ReturnErrMessage(event, "error_has_no_data", "", "")
return botlib.ReturnErrMessage(event, "error_has_no_data")
}
options := []discord.StringSelectMenuOption{}
for u, gdrp := range gData.RolePanel {
Expand All @@ -44,7 +44,7 @@ func rolePanelHandler(b *botlib.Bot[db.DB]) func(event *events.ApplicationComman
})
}
if len(options) == 0 {
return botlib.ReturnErrMessage(event, "error_has_no_panel", "", "")
return botlib.ReturnErrMessage(event, "error_has_no_panel")
}
embeds := []discord.Embed{
{
Expand Down
36 changes: 18 additions & 18 deletions bot/commands/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ func utilCalcComponentBackHandler(b *botlib.Bot[db.DB]) func(event *events.Compo
calcID := uuid.MustParse(args[3])
calc, err := b.DB.Calc().Get(calcID)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
token, err := b.DB.Interactions().Get(calcID)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
calc.Back()
mes, err := calc.Message(botlib.SetEmbedsProperties)
Expand All @@ -97,7 +97,7 @@ func utilCalcComponentBackHandler(b *botlib.Bot[db.DB]) func(event *events.Compo
}
err = b.DB.Calc().Set(calc.ID(), calc)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
_, err = event.Client().Rest().UpdateInteractionResponse(event.ApplicationID(), token, discord.MessageUpdate{
Content: &mes.Content,
Expand All @@ -116,11 +116,11 @@ func utilCalcComponentCEHandler(b *botlib.Bot[db.DB]) func(event *events.Compone
calcID := uuid.MustParse(args[3])
calc, err := b.DB.Calc().Get(calcID)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
token, err := b.DB.Interactions().Get(calcID)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
calc.CE()
mes, err := calc.Message(botlib.SetEmbedsProperties)
Expand All @@ -129,7 +129,7 @@ func utilCalcComponentCEHandler(b *botlib.Bot[db.DB]) func(event *events.Compone
}
err = b.DB.Calc().Set(calc.ID(), calc)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
_, err = event.Client().Rest().UpdateInteractionResponse(event.ApplicationID(), token, discord.MessageUpdate{
Content: &mes.Content,
Expand All @@ -148,11 +148,11 @@ func utilCalcComponentCHandler(b *botlib.Bot[db.DB]) func(event *events.Componen
calcID := uuid.MustParse(args[3])
calc, err := b.DB.Calc().Get(calcID)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
token, err := b.DB.Interactions().Get(calcID)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
calc.Reset()
mes, err := calc.Message(botlib.SetEmbedsProperties)
Expand All @@ -161,7 +161,7 @@ func utilCalcComponentCHandler(b *botlib.Bot[db.DB]) func(event *events.Componen
}
err = b.DB.Calc().Set(calc.ID(), calc)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
_, err = event.Client().Rest().UpdateInteractionResponse(event.ApplicationID(), token, discord.MessageUpdate{
Content: &mes.Content,
Expand All @@ -180,11 +180,11 @@ func utilCalcComponentDoHandler(b *botlib.Bot[db.DB]) func(event *events.Compone
calcID := uuid.MustParse(args[3])
calc, err := b.DB.Calc().Get(calcID)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
token, err := b.DB.Interactions().Get(calcID)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}

calc.Do()
Expand All @@ -195,7 +195,7 @@ func utilCalcComponentDoHandler(b *botlib.Bot[db.DB]) func(event *events.Compone
}
err = b.DB.Calc().Set(calc.ID(), calc)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
_, err = event.Client().Rest().UpdateInteractionResponse(event.ApplicationID(), token, discord.MessageUpdate{
Content: &mes.Content,
Expand All @@ -214,11 +214,11 @@ func utilCalcComponentActHandler(b *botlib.Bot[db.DB]) func(event *events.Compon
calcID := uuid.MustParse(args[4])
calc, err := b.DB.Calc().Get(calcID)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
token, err := b.DB.Interactions().Get(calcID)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
switch args[3] {
case "plus":
Expand All @@ -236,7 +236,7 @@ func utilCalcComponentActHandler(b *botlib.Bot[db.DB]) func(event *events.Compon
}
err = b.DB.Calc().Set(calc.ID(), calc)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
_, err = event.Client().Rest().UpdateInteractionResponse(event.ApplicationID(), token, discord.MessageUpdate{
Content: &mes.Content,
Expand All @@ -255,11 +255,11 @@ func utilCalcComponentNumHandler(b *botlib.Bot[db.DB]) func(event *events.Compon
calcID := uuid.MustParse(args[4])
calc, err := b.DB.Calc().Get(calcID)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
token, err := b.DB.Interactions().Get(calcID)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
switch args[3] {
case "±":
Expand Down Expand Up @@ -290,7 +290,7 @@ func utilCalcComponentNumHandler(b *botlib.Bot[db.DB]) func(event *events.Compon
}
err = b.DB.Calc().Set(calc.ID(), calc)
if err != nil {
return botlib.ReturnErrMessageEphemeral(event, "error_time_out", "", "", true)
return botlib.ReturnErrMessage(event, "error_time_out", botlib.WithEphemeral(true))
}
_, err = event.Client().Rest().UpdateInteractionResponse(event.ApplicationID(), token, discord.MessageUpdate{
Content: &mes.Content,
Expand Down
4 changes: 2 additions & 2 deletions bot/db/role_panel_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,11 @@ func (r *RolePanelCreate) EditPanelSettingsEmbed() []discord.Embed {
Fields: []discord.EmbedField{
{
Name: translate.Message(r.locale, "command_text_role_panel_create_edit_panel_config_fields_max_name"),
Value: fmt.Sprintf("%d %s", r.Max, translate.Translates(r.locale, "role", nil, r.Max, "role")),
Value: fmt.Sprintf("%d %s", r.Max, translate.Translates(r.locale, "role", nil, r.Max, translate.WithFallback("role"))),
},
{
Name: translate.Message(r.locale, "command_text_role_panel_create_edit_panel_config_fields_min_name"),
Value: fmt.Sprintf("%d %s", r.Min, translate.Translates(r.locale, "role", nil, r.Min, "role")),
Value: fmt.Sprintf("%d %s", r.Min, translate.Translates(r.locale, "role", nil, r.Min, translate.WithFallback("role"))),
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/go-redis/redis/v8 v8.11.5
github.com/google/uuid v1.3.0
github.com/mattn/go-colorable v0.1.13
github.com/sabafly/sabafly-lib v1.1.0
github.com/sabafly/sabafly-lib v1.5.0
github.com/sirupsen/logrus v1.9.0
github.com/spf13/cobra v1.7.0
)
Expand All @@ -29,7 +29,7 @@ require (
github.com/rivo/uniseg v0.4.4 // indirect
github.com/sasha-s/go-csync v0.0.0-20210812194225-61421b77c44b // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/crypto v0.8.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
Expand Down
10 changes: 5 additions & 5 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sabafly/sabafly-lib v1.1.0 h1:CRkRTZyJtxB71nwErydaIubCP/FHJLf+eskXC34psI4=
github.com/sabafly/sabafly-lib v1.1.0/go.mod h1:OcTKKunmrhAGc+sWyLJkRwWGhJE4aGcAYgSH/9+OoeE=
github.com/sabafly/sabafly-lib v1.5.0 h1:L210Vmzr5MRBW464nCNNd8FrowFeam/u7okox66Q1Fo=
github.com/sabafly/sabafly-lib v1.5.0/go.mod h1:T8GLVoK7q7mpvOQQ/GRy4ed5CtPrKnhDQ9tapEFb+fs=
github.com/sasha-s/go-csync v0.0.0-20210812194225-61421b77c44b h1:qYTY2tN72LhgDj2rtWG+LI6TXFl2ygFQQ4YezfVaGQE=
github.com/sasha-s/go-csync v0.0.0-20210812194225-61421b77c44b/go.mod h1:/pA7k3zsXKdjjAiUhB5CjuKib9KJGCaLvZwtxGC8U0s=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
Expand All @@ -69,15 +69,15 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 h1:5llv2sWeaMSnA3w2kS57ouQQ4pudlXrR0dCgw51QK9o=
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down
0