repo: fishbowl
action: commit
revision: 
path_from: 
revision_from: 13d57f04e238812dc1d7b7312f08c08b30de62ed:
path_to: 
revision_to: 

commit 13d57f04e238812dc1d7b7312f08c08b30de62ed
Author: epoch 
Date:   Wed May 11 20:33:41 2022 +0000

    added variables for bot nick and channel. do join and modes on 004 instead of init. pong was borked.

diff --git a/fishbowl.py b/fishbowl.py

--- a/fishbowl.py
+++ b/fishbowl.py
@@ -6,14 +6,13 @@ import ssl

 stand_limit=3

+my_nick=b"fishbowl"
+my_chan=b"#fishbowl"
+
 s=socket.create_connection(("batou",6697))
 ss=ssl.wrap_socket(s)
-ss.send(b"NICK fish\r\n")
+ss.send(b"NICK " + my_nick + b"\r\n")
 ss.send(b"USER f f f :f\r\n")
-ss.send(b"OPER g0d WAFFLEIRON\r\n")
-ss.send(b"JOIN #fishbowl\r\n")
-ss.send(b"MODE #fishbowl +o fish\r\n")
-ss.send(b"MODE #fishbowl +m\r\n")
 q=queue.Queue()
 voiced=[]
 buf=b""
@@ -29,26 +28,29 @@ while connected:
         buf=b"\r\n".join(a[1:])
         line=a[0]
         b=line.split(b" ")
+        if b[1] == b"004":
+            ss.send(b"JOIN " + my_chan + b"\r\n")
+            ss.send(b"MODE " + my_chan + b" +o " + my_nick + b"\r\n")
+            ss.send(b"MODE " + my_chan + b" +m\r\n")
         if b[0] == b"PING":
             b[0]=b"PONG"
-            ss.send(b" ".join(b))
+            ss.send(b" ".join(b) + b"\r\n")
         elif b[1] == b"PRIVMSG":
             nick=b[0].split(b"!")[0][1:]
             user=b[0].split(b"!")[1].split(b"@")[0]
             host=b[0].split(b"@")[1]
             print(b)
-            if b[2] == b"#fishbowl" or b[2] == b"fish":
+            if b[2] == my_chan or b[2] == my_nick:
                 if b[3] == b":stand":
-                    #ss.send(b"NOTICE #fishbowl :" + str(list(q.queue)).encode() + b"\r\n")
                     if(nick in list(q.queue) ):
-                        ss.send(b"NOTICE #fishbowl :yo dawg, " + nick + b" tried to stand up while standing up.\r\n")
+                        ss.send(b"NOTICE " + my_chan + b" :yo dawg, " + nick + b" tried to stand up while standing up.\r\n")
                     else:
                         q.put(nick)
-                        ss.send(b"NOTICE #fishbowl :" + nick + b" has stood up\r\n")
+                        ss.send(b"NOTICE " + my_chan + b" :" + nick + b" has stood up\r\n")
                 if b[3] == b":look":
-                    ss.send(b"PRIVMSG #fishbowl :" + b" ".join(list(q.queue)) + b"\r\n")
+                    ss.send(b"PRIVMSG " + my_chan + b" :" + b" ".join(list(q.queue)) + b"\r\n")
                 if b[3] == b":sit":
-                    ss.send(b"MODE #fishbowl -v " + nick + b"\r\n")
+                    ss.send(b"MODE " + my_chan + b" -v " + nick + b"\r\n")
                     try:
                         voiced.remove(nick)
                     except:
@@ -58,4 +60,4 @@ while connected:
         while len(voiced) < stand_limit and len(list(q.queue)) > 0:
             speaker=q.get()
             voiced.append(speaker)
-            ss.send(b"MODE #fishbowl +v " + speaker + b"\r\n")
+            ss.send(b"MODE " + my_chan + b" +v " + speaker + b"\r\n")

-----END OF PAGE-----