-
Notifications
You must be signed in to change notification settings - Fork 33
Issue 23: Display public IP address #85
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ | |
from prompt_toolkit import print_formatted_text, HTML | ||
from websockets.exceptions import ConnectionClosedError | ||
from utils.helper_display import HelperDisplay | ||
from requests import get | ||
|
||
|
||
USERS = {} | ||
|
@@ -28,6 +29,10 @@ def getallus(chatroom): | |
return userlist | ||
|
||
|
||
def ipaddress(): | ||
return get('https://api64.ipify.org').text | ||
Comment on lines
+32
to
+33
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
||
|
||
async def notify_mesej(message): | ||
if USERS: await asyncio.wait([user.send(message) for user in USERS]) | ||
|
||
|
@@ -40,11 +45,13 @@ def chk_username_presence(mesg_json): | |
else: | ||
return False | ||
|
||
|
||
async def send_chatroommembers_list(websoc): | ||
chatroom_id = USERS[websoc][1] | ||
users_list = "SNCTRYZERO" + sepr + "USERSLIST" + sepr + str(getallus(chatroom_id)) + sepr + chatroom_id | ||
await websoc.send(users_list) | ||
|
||
|
||
async def chatroom(websocket, path): | ||
if not websocket in USERS: | ||
USERS[websocket] = "" | ||
|
@@ -107,9 +114,10 @@ def mainfunc(chatport, netprotc): | |
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() + "</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>")) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice touch with the corrected message. 😉 |
||
print_formatted_text(HTML("[" + obtntime() + "] " + "<b>SNCTRYZERO</b> > <red><b>The server could not be started</b></red>")) | ||
|
||
|
||
if __name__ == "__main__": | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
requests
is quite a heavy module to import for task as small as this. Also, we cannot just assume that the users havecurl
orwget
binaries installed on their distribution which makes it a difficult point to discuss about.