chup logic fixed chdown pending

clientcommands.go

@@ -378,38 +378,47 @@ func (b *Talkkonnect) ChannelUp() {
 	if !(IsConnected) {
 		return
 	}
-
+	ChannelAction = "channelup"
 	TTSEvent("channelup")
 	Channel := b.Client.Channels.Find()
 	currentIndex := b.findChannelIndex(b.Client.Self.Channel.ID)
+	NextIndex := currentIndex
 
 	if currentIndex+1 < len(b.Client.Channels) {
 		Channel = b.Client.Channels.Find(ChannelsList[currentIndex+1].chanName)
+		NextIndex = currentIndex + 1
 	}
 
-	if Channel != nil {
-		b.Client.Self.Move(Channel)
+	if ChannelsList[NextIndex].chanenterPermissions {
+		if Channel != nil {
+			b.Client.Self.Move(Channel)
+		}
+	} else {
+		for i := NextIndex + 1; i < len(b.Client.Channels); i++ {
+			log.Println("info: Skipping Channel")
+			Channel = b.Client.Channels.Find(ChannelsList[i].chanName)
+			if ChannelsList[i].chanenterPermissions {
+				b.Client.Self.Move(Channel)
+				break
+			}
+		}
 	}
 }
 
 func (b *Talkkonnect) ChannelDown() {
 	if !(IsConnected) {
 		return
 	}
-
+	ChannelAction = "channeldown"
 	TTSEvent("channeldown")
-	Channel := b.Client.Channels.Find()
+	Channel := b.Client.Channels.Find(ChannelsList[len(b.Client.Channels)-1].chanName)
 	currentIndex := b.findChannelIndex(b.Client.Self.Channel.ID)
 	log.Println("alert: Current Index in Channel Down Func ", currentIndex)
 
 	if currentIndex > 0 {
 		Channel = b.Client.Channels.Find(ChannelsList[currentIndex-1].chanName)
 	}
 
-	if currentIndex == 0 {
-		Channel = b.Client.Channels.Find(ChannelsList[len(b.Client.Channels)-1].chanName)
-	}
-
 	if currentIndex == 1 {
 		Channel = b.Client.Channels.Find()
 	}

onevent.go

@@ -269,6 +269,9 @@ func (b *Talkkonnect) OnPermissionDenied(e *gumble.PermissionDeniedEvent) {
 		for index, ch := range ChannelsList {
 			if ch.chanID == int(e.Channel.ID) {
 				ChannelsList[index].chanenterPermissions = false
+				if ChannelAction == "channelup" {
+					b.ChannelUp()
+				}
 				break
 			}
 		}

version.go

@@ -31,7 +31,7 @@
 package talkkonnect
 
 const (
-	talkkonnectVersion  string = "2.12.01"
+	talkkonnectVersion  string = "2.12.02"
 	talkkonnectReleased string = "Mar 5 2022"
 )
 

xmlparser.go

@@ -655,8 +655,8 @@ var (
 	ConnectAttempts int
 	AccountIndex    int
 	GenericCounter  int
-	ChannelIndex    int
 	CurrentIndex    int
+	ChannelAction   string
 )
 
 // Generic Global Timer Variables
@@ -678,22 +678,20 @@ var (
 
 //Mumble Account Settings Global Variables
 var (
-	Default             []bool
-	Name                []string
-	Server              []string
-	Username            []string
-	Password            []string
-	Insecure            []bool
-	Register            []bool
-	Certificate         []string
-	Channel             []string
-	Ident               []string
-	Tokens              []gumble.AccessTokens
-	VT                  []VTStruct
-	Accounts            int
-	MaxTokensInAccounts int
-	ChannelsIndexMax    int
-	ChannelsList        []ChannelsListStruct
+	Default      []bool
+	Name         []string
+	Server       []string
+	Username     []string
+	Password     []string
+	Insecure     []bool
+	Register     []bool
+	Certificate  []string
+	Channel      []string
+	Ident        []string
+	Tokens       []gumble.AccessTokens
+	VT           []VTStruct
+	Accounts     int
+	ChannelsList []ChannelsListStruct
 )
 
 //HD44780 LCD Screen Settings Golbal Variables