Revert "Merge remote-tracking branch 'upstream/master' into upstream"

This reverts commit 44b453d, reversing
changes made to 84d1f88.

Author: Shivang P Swain

main.py

@@ -1,4 +1,4 @@
-import asyncio, websockets, sys, click, time, os
+import asyncio, websockets, sys, click, http.client, time
 from prompt_toolkit import print_formatted_text, HTML
 from websockets.exceptions import ConnectionClosedError
 from utils.helper_display import HelperDisplay
@@ -20,6 +20,21 @@ def obtntime():
     return timehour + ":" + timemint + ":" + timesecs
 
 
+def ipaddress(v):
+    url = "api64.ipify.org"
+    if v == 4:
+        url = "api.ipify.org"
+    elif v == 6:
+        url = "api6.ipify.org"
+    try:
+        connection = http.client.HTTPSConnection(url)
+        connection.request("GET", "/")
+        response = connection.getresponse()
+        return response.read().decode("UTF-8")
+    except:
+        return "Error getting IP address."
+
+
 def getallus(chatroom):
     userlist = []
     for indx in USERS:
@@ -104,9 +119,11 @@ def mainfunc(chatport, netprotc):
         if netprotc == "ipprotv6":
             print_formatted_text(HTML("[" + obtntime() + "] " + "<b>SNCTRYZERO</b> > <green>IP version : 6</green>"))
             netpdata = "::"
+            print_formatted_text(HTML("[" + obtntime() + "] " + "<b>SNCTRYZERO</b> > <green>IP address : " + ipaddress(6) + "</green>"))
         elif netprotc == "ipprotv4":
             print_formatted_text(HTML("[" + obtntime() + "] " + "<b>SNCTRYZERO</b> > <green>IP version : 4</green>"))
             netpdata = "0.0.0.0"
+            print_formatted_text(HTML("[" + obtntime() + "] " + "<b>SNCTRYZERO</b> > <green>IP address : " + ipaddress(4) + "</green>"))
         servenow(netpdata, chatport)
     except OSError:
         print_formatted_text(HTML("[" + obtntime() + "] " + "<b>SNCTRYZERO</b> > <red><b>The server could not be started up</b></red>"))

requirements.txt

@@ -1,8 +1,8 @@
-cffi==1.14.3
+cffi==1.14.2
 click==7.1.2
-cryptography==3.2.1
-prompt-toolkit==3.0.8
+cryptography==3.0
+prompt-toolkit==3.0.6
 pycparser==2.20
 six==1.15.0
 wcwidth==0.2.5
-websockets==8.1
+websockets==8.1