Improve examples/dual.go

Author: codedust

examples/dual.go

@@ -4,8 +4,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"github.com/codedust/go-tox"
-	"os"
-	"os/signal"
 	"time"
 )
 
@@ -15,6 +13,8 @@ type Server struct {
 	PublicKey []byte
 }
 
+var counter int = 0
+
 func main() {
 	alice, err := gotox.New(nil)
 	if err != nil {
@@ -29,10 +29,10 @@ func main() {
 	bob.SelfSetName("BobBot")
 
 	aliceAddr, _ := alice.SelfGetAddress()
-	fmt.Println("ID alice: ", hex.EncodeToString(aliceAddr))
+	fmt.Println("[ID alice]", hex.EncodeToString(aliceAddr))
 
 	bobAddr, _ := bob.SelfGetAddress()
-	fmt.Println("ID bob: ", hex.EncodeToString(bobAddr))
+	fmt.Println("[ID bob]", hex.EncodeToString(bobAddr))
 
 	// We can set the same callback function for both *Tox instances
 	bob.CallbackFriendRequest(onFriendRequest)
@@ -49,8 +49,8 @@ func main() {
 	 * Use more than one node in a real world szenario. This example relies one
 	 * the following node to be up.
 	 */
-	pubkey, _ := hex.DecodeString("04119E835DF3E78BACF0F84235B300546AF8B936F035185E2A8E9E0A67C8924F")
-	server := &Server{"144.76.60.215", 33445, pubkey}
+	pubkey, _ := hex.DecodeString("B75583B6D967DB8AD7C6D3B6F9318194BCC79B2FEF18F69E2DF275B779E7AA30")
+	server := &Server{"maggie.prok.pw", 33445, pubkey}
 
 	err = alice.Bootstrap(server.Address, server.Port, server.PublicKey)
 	if err != nil {
@@ -63,39 +63,40 @@ func main() {
 
 	isRunning := true
 
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt)
 	ticker := time.NewTicker(25 * time.Millisecond)
 
-	times := 0
 	for isRunning {
 		select {
-		case <-c:
-			// Press ^C to trigger those events
-			if times == 0 {
+		case <-ticker.C:
+			if counter == 2 {
+				time.Sleep(2 * time.Second)
 				// First Bob adds Alice
 				bob.FriendAdd(aliceAddr, "Hey Alice, wanna be my friend. ;)")
-				fmt.Printf("[BobBot] Friend request send. Waiting for Alice to response.\n")
-			} else if times == 1 {
+				fmt.Printf("[BobBot] Friend request send. Waiting for Alice to respond.\n")
+				counter++
+			} else if counter == 6 {
+				time.Sleep(2 * time.Second)
 				// Then Bob sends a message to Alice
 				friendnumbers, _ := bob.SelfGetFriendlist()
 				_, err := bob.FriendSendMessage(friendnumbers[0], gotox.TOX_MESSAGE_TYPE_NORMAL, "HELLO ALICE")
 				fmt.Printf("[BobBot] Sending message to Alice (friendnumber: %d, error: %v)\n", friendnumbers[0], err)
-			} else if times == 2 {
+				counter++
+			} else if counter == 8 {
+				time.Sleep(2 * time.Second)
 				// Alice responds to Bob
 				friendnumbers, _ := alice.SelfGetFriendlist()
 				_, err := alice.FriendSendMessage(friendnumbers[0], gotox.TOX_MESSAGE_TYPE_NORMAL, "Hey Bob!")
 				fmt.Printf("[AliceBot] Sending message to Bob (friendnumber: %d, error: %v)\n", friendnumbers[0], err)
-			} else {
+				counter++
+			} else if counter == 10 {
+				time.Sleep(2 * time.Second)
 				// We then put an end to their love
-				fmt.Println("Killing")
+				fmt.Println("\\o/ It worked! Killing...")
 				isRunning = false
 				alice.Kill()
 				bob.Kill()
+				break
 			}
-			times += 1
-			break
-		case <-ticker.C:
 			alice.Iterate()
 			bob.Iterate()
 			break
@@ -104,6 +105,7 @@ func main() {
 }
 
 func onFriendRequest(t *gotox.Tox, publicKey []byte, message string) {
+	counter++
 	name, _ := t.SelfGetName()
 	fmt.Printf("[%s] New friend request from %s\n", name, hex.EncodeToString(publicKey))
 
@@ -113,17 +115,20 @@ func onFriendRequest(t *gotox.Tox, publicKey []byte, message string) {
 }
 
 func onFriendMessage(t *gotox.Tox, friendnumber uint32, messageType gotox.ToxMessageType, message string) {
+	counter++
 	name, _ := t.SelfGetName()
 	friend, _ := t.FriendGetName(friendnumber)
 	fmt.Printf("[%s] New message from %s : %s\n", name, friend, message)
 }
 
 func onFriendConnectionStatusChanges(t *gotox.Tox, friendnumber uint32, connectionstatus gotox.ToxConnection) {
+	counter++
 	name, _ := t.SelfGetName()
 	fmt.Printf("[%s] Connection status of friend changed to %v\n", name, connectionstatus)
 }
 
 func onSelfConnectionStatusChanges(t *gotox.Tox, connectionstatus gotox.ToxConnection) {
+	counter++
 	name, _ := t.SelfGetName()
 	fmt.Printf("[%s] Connection status changed to %v\n", name, connectionstatus)
 }