Cynosphere/comcord
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix issues with empty perms

Browse source
This commit is contained in:
Cynthia Foxwell 2023-07-29 21:14:49 -06:00
parent 81ac111e71
commit 7fa6c35a31
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
commands/guild.go
View file

@ -109,6 +109,9 @@ func GetSortedChannels(guildId string, withCategories bool, withPrivate bool) []
perms := discord.CalcOverwrites(*guild, channel, *selfMember)
private := !perms.Has(discord.PermissionViewChannel)
if perms == 0 {
private = false
}
if private && !withPrivate {
continue
}
@ -192,6 +195,9 @@ func GetSortedChannels(guildId string, withCategories bool, withPrivate bool) []
perms := discord.CalcOverwrites(*guild, channel, *selfMember)
private := !perms.Has(discord.PermissionViewChannel)
if perms == 0 {
private = false
}
if private && !withPrivate {
continue
}
@ -247,6 +253,10 @@ func ListChannelsCommand() {
perms := discord.CalcOverwrites(*guild, channel, *selfMember)
private := !perms.Has(discord.PermissionViewChannel)
if perms == 0 {
private = false
}
category := channel.Type == discord.GuildCategory
catLen := 0
@ -272,6 +282,9 @@ func ListChannelsCommand() {
perms := discord.CalcOverwrites(*guild, channel, *selfMember)
private := !perms.Has(discord.PermissionViewChannel)
if perms == 0 {
private = false
}
category := channel.Type == discord.GuildCategory
topic := REGEX_EMOTE.ReplaceAllString(channel.Topic, ":$1:")
topic = strings.ReplaceAll(topic, "\n", " ")
@ -368,7 +381,11 @@ func ListUsersCommand() {
}
perms := discord.CalcOverwrites(*guild, *channel, *member)
if !perms.Has(discord.PermissionViewChannel) {
private := !perms.Has(discord.PermissionViewChannel)
if perms == 0 {
private = false
}
if private {
continue
}

6
commands/send.go
View file

@ -50,8 +50,12 @@ func SendMode() {
}
perms := discord.CalcOverwrites(*guild, *channel, *selfMember)
cannotSend := !perms.Has(discord.PermissionSendMessages)
if perms == 0 {
cannotSend = false
}
if !perms.Has(discord.PermissionSendMessages) {
if cannotSend {
fmt.Print("<you do not have permission to send messages here>\n\r")
return
}