Add nsfw flag and marked some commands as nsfw. (botlabs-gg#1371)

* added nsfw flag

* remove roast command

Co-authored-by: Ashish Jhanwar <[email protected]>

Author: ashishjh-bst

antiphishing/antiphishing.go

@@ -181,7 +181,7 @@ func checkRemoteForPhishingUrl(input []string) (*BitFlowAntiFishResponse, error)
 	req.Header.Add("Content-Type", "application/json")
 	req.Header.Add("Accept", "*/*")
 	req.Header.Add("Content-Length", strconv.Itoa(len(queryString)))
-	req.Header.Add("User-Agent", "YAGPDB")
+	req.Header.Add("User-Agent", "YAGPDB.xyz (https://github.com/botlabs-gg/yagpdb)")
 
 	resp, err := client.Do(req)
 	if err != nil {

aylien/aylien.go

@@ -67,8 +67,8 @@ func (p *Plugin) AddCommands() {
 		Arguments: []*dcmd.ArgDef{
 			{Name: "text", Type: dcmd.String},
 		},
-		SlashCommandEnabled: true,
-		DefaultEnabled:      true,
+		SlashCommandEnabled: false,
+		DefaultEnabled:      false,
 		RunFunc: func(cmd *dcmd.Data) (interface{}, error) {
 			var responses []*textapi.SentimentResponse
 			if cmd.Args[0].Value != nil {

commands/slashcommands.go

@@ -170,6 +170,7 @@ func (p *Plugin) yagCommandToSlashCommand(cmd *dcmd.RegisteredCommand) *discordg
 		Description:       common.CutStringShort(cast.Description, 100),
 		DefaultPermission: &t,
 		Options:           opts,
+		NSFW:              cast.NSFW,
 	}
 }
 

commands/yagcommmand.go

@@ -146,6 +146,7 @@ type YAGCommand struct {
 	slashCommandID int64
 
 	IsResponseEphemeral bool
+	NSFW                bool
 }
 
 // CmdWithCategory puts the command in a category, mostly used for the help generation
@@ -175,6 +176,13 @@ func (yc *YAGCommand) Run(data *dcmd.Data) (interface{}, error) {
 		return nil, nil
 	}
 
+	if yc.NSFW {
+		channel := data.GuildData.GS.GetChannelOrThread(data.ChannelID)
+		if !channel.NSFW {
+			return "This command can be used only in age-restricted channels", nil
+		}
+	}
+
 	// Send typing to indicate the bot's working
 	if confSetTyping.GetBool() && data.TriggerType != dcmd.TriggerTypeSlashCommands {
 		common.BotSession.ChannelTyping(data.ChannelID)

go.mod

@@ -4,6 +4,7 @@ go 1.17
 
 require (
 	emperror.dev/errors v0.4.3
+  golang.org/x/text v0.3.7
 	github.com/AYLIEN/aylien_textapi_go v0.6.0
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/PuerkitoBio/goquery v1.5.0
@@ -161,7 +162,6 @@ require (
 	go.opencensus.io v0.22.5 // indirect
 	go.uber.org/atomic v1.4.0 // indirect
 	go.uber.org/multierr v1.1.0 // indirect
-	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d // indirect
 	google.golang.org/grpc v1.34.0 // indirect

lib/discordgo/gateway.go

@@ -35,7 +35,7 @@ import (
 )
 
 var (
-	ErrAlreadyOpen = errors.New("Connection already open")
+	ErrAlreadyOpen = errors.New("connection already open")
 )
 
 type GatewayIntent int
@@ -247,10 +247,10 @@ func (s *Session) Open() error {
 }
 
 var (
-	ErrBadAuth        = errors.New("Authentication failed")
-	ErrInvalidIntent  = errors.New("One of the gateway intents passed was invalid")
-	ErrDisabledIntent = errors.New("A intent you specified has not been enabled or not been whitelisted for")
-	ErrInvalidShard   = errors.New("You specified a invalid sharding setup")
+	ErrBadAuth        = errors.New("authentication failed")
+	ErrInvalidIntent  = errors.New("one of the gateway intents passed was invalid")
+	ErrDisabledIntent = errors.New("an intent you specified has not been enabled or not been whitelisted for")
+	ErrInvalidShard   = errors.New("you specified a invalid sharding setup")
 )
 
 func (g *GatewayConnectionManager) Open() error {
@@ -408,7 +408,7 @@ func (g *GatewayConnectionManager) ChannelVoiceJoin(gID, cID int64, mute, deaf b
 	debug.PrintStack()
 
 	g.mu.Lock()
-	voice, _ = g.voiceConnections[gID]
+	voice = g.voiceConnections[gID]
 
 	if voice == nil {
 		voice = &VoiceConnection{

lib/discordgo/interactions.go

@@ -43,6 +43,7 @@ type ApplicationCommand struct {
 	Description              string                      `json:"description,omitempty"`
 	DescriptionLocalizations *map[Locale]string          `json:"description_localizations,omitempty"`
 	Options                  []*ApplicationCommandOption `json:"options"`
+	NSFW                     bool                        `json:"nsfw,omitempty"`
 }
 
 // ApplicationCommandOptionType indicates the type of a slash command's option.

lib/discordgo/message.go

@@ -346,7 +346,7 @@ func (e *MessageEmbed) GetMarshalNil() bool {
 }
 
 func (e *MessageEmbed) MarshalJSON() ([]byte, error) {
-	if e.marshalnil == true {
+	if e.marshalnil {
 		return json.Marshal(nil)
 	}
 	type EmbedAlias MessageEmbed

lib/discordgo/oauth2_test.go

@@ -52,6 +52,4 @@ func ExampleApplication() {
 	// Delete the application we created.
 	err = dg.ApplicationDelete(ap.ID)
 	log.Printf("Delete: err: %+v\n", err)
-
-	return
 }

lib/discordgo/restapi.go

@@ -220,10 +220,8 @@ func (s *Session) innerDoRequest(method, urlStr, contentType string, b []byte, h
 	}
 
 	// we may need to send a request with extra headers
-	if headers != nil {
-		for k, v := range headers {
-			req.Header.Set(k, v)
-		}
+	for k, v := range headers {
+		req.Header.Set(k, v)
 	}
 
 	// Not used on initial login..
@@ -656,7 +654,7 @@ func (s *Session) GuildEdit(guildID int64, g GuildParams) (st *Guild, err error)
 			for _, r := range regions {
 				valid = append(valid, r.ID)
 			}
-			err = fmt.Errorf("Region not a valid region (%q)", valid)
+			err = fmt.Errorf("region not a valid region (%q)", valid)
 			return
 		}
 	}