Skip to content
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

Nuke em all #10

Open
wants to merge 64 commits into
base: main
Choose a base branch
from
Open

Nuke em all #10

wants to merge 64 commits into from

Conversation

potatoeggy
Copy link
Contributor

This PR effectively adds #8, #7, #4, and #1 and merges them all. Instead of os.startfile, it relies on sys.exit(1) to kill itself and use an external service manager such as systemd to restart the script.

@potatoeggy
Copy link
Contributor Author

Zoom support has been changed in that it is more flexible and only checks for the string zoom.us during addition and not "meet.google.com" in driver searching. This makes links easier to handle and move around in the future.

main.py Outdated Show resolved Hide resolved
main.py Outdated
print(running)
if running:
dropLinks[key].append(link)
await msgCh("<:pingo:822111531063836712> <@&"+str(link[0])+"> "+link[2]+" is online now !1!!\nBreak is Over! Stop playing games! Stop watching youtube!\n<"+link[1]+">",int(key))
await msgCh("<:blushylakshy:814288474010025994>",int(key))
await msgCh(f"<:pingo:822111531063836712> <@&{link[0]}>, {link[2]} is now online at <{link[1]}>",int(key))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you change all the user feedback so that the bot's messages are not different?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left you a pingo man

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In any case, as a bot cannot use emoji from servers it is not part in, this significantly reduces portability if custom emoji are used, which is not quite in line with claims on the README or negatively impacts those who wish to run the software themselves.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would dropping all emoji but retaining older messages do?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this significantly reduces portability

I don't care keep the emojis and don't change the messages >:(

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, this is one area I am not willing to budge in. The pingos must die.

main.py Show resolved Hide resolved
main.py Outdated Show resolved Hide resolved
Co-authored-by: NoYouNotUrUncle <[email protected]>
@@ -74,7 +82,7 @@ async def startDriver(): #start a new driver and log in to gapps
driver = webdriver.Chrome(options=browser_options)
driver.set_page_load_timeout(10) #restart driver after 5s of monkeying (cus google block prolly!)
#go to google.yrdsb.ca and log in
driver.get("https://google.yrdsb.ca/EasyConnect/SSO/Redirect.aspx?SAMLRequest=fVLLTuswEN0j8Q%2BR93myqawmqBeEbiUeEQ0s7s51pqlvbE%2FwOC38PW5KBSxge3zmPMYzv3w1OtqBI4W2ZHmSsQisxFbZrmRPzU08Y5fV%2BdmchNEDX4x%2Bax%2FhZQTyUZi0xKeHko3OchSkiFthgLiXfLW4u%2BVFkvHBoUeJmkXL65Jtdata0KIfuu1GGAM9ygGtlbJfYw92bdD0%2F9vAfj7FKg6xlkQjLC15YX2AsiKPs4s4nzVZxosLXsz%2Bsaj%2BcPqj7LHBb7HWRxLxv01Tx%2FXDqpkEdiGduw%2FsknWInYZEojnY14JI7QK8EZqARQsicD4EvEJLowG3ArdTEp4eb0NL7wfiabrf75NPmVSknRgGSt5cS%2BtEilRIYtW0XT4VdF%2FW%2Bnt8cbJn1afBPP0iVX382qHM8rpGreRbtNAa91cOhA9NvBtDkRt0Rvif3fIknxDVxpuJykdLA0i1UdCyKK2Ort%2FPIxzNOw%3D%3D&RelayState=https%3A%2F%2Fwww.google.com%2Fa%2Fgapps.yrdsb.ca%2FServiceLogin%3Fservice%3Dwise%26passive%3Dtrue%26continue%3Dhttps%253A%252F%252Fdrive.google.com%252Fa%252Fgapps.yrdsb.ca%252F%26followup%3Dhttps%253A%252F%252Fdrive.google.com%252Fa%252Fgapps.yrdsb.ca%252F%26faa%3D1")
driver.get("https://google.yrdsb.ca")
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't work don't change this line.

Suggested change
driver.get("https://google.yrdsb.ca")
driver.get("https://google.yrdsb.ca/EasyConnect/SSO/Redirect.aspx?SAMLRequest=fVLLTuswEN0j8Q%2BR93myqawmqBeEbiUeEQ0s7s51pqlvbE%2FwOC38PW5KBSxge3zmPMYzv3w1OtqBI4W2ZHmSsQisxFbZrmRPzU08Y5fV%2BdmchNEDX4x%2Bax%2FhZQTyUZi0xKeHko3OchSkiFthgLiXfLW4u%2BVFkvHBoUeJmkXL65Jtdata0KIfuu1GGAM9ygGtlbJfYw92bdD0%2F9vAfj7FKg6xlkQjLC15YX2AsiKPs4s4nzVZxosLXsz%2Bsaj%2BcPqj7LHBb7HWRxLxv01Tx%2FXDqpkEdiGduw%2FsknWInYZEojnY14JI7QK8EZqARQsicD4EvEJLowG3ArdTEp4eb0NL7wfiabrf75NPmVSknRgGSt5cS%2BtEilRIYtW0XT4VdF%2FW%2Bnt8cbJn1afBPP0iVX382qHM8rpGreRbtNAa91cOhA9NvBtDkRt0Rvif3fIknxDVxpuJykdLA0i1UdCyKK2Ort%2FPIxzNOw%3D%3D&RelayState=https%3A%2F%2Fwww.google.com%2Fa%2Fgapps.yrdsb.ca%2FServiceLogin%3Fservice%3Dwise%26passive%3Dtrue%26continue%3Dhttps%253A%252F%252Fdrive.google.com%252Fa%252Fgapps.yrdsb.ca%252F%26followup%3Dhttps%253A%252F%252Fdrive.google.com%252Fa%252Fgapps.yrdsb.ca%252F%26faa%3D1")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you tested it? I've run many trials on my end and I've not had a single issue with either this or the initial proposed change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be clear, have you tested it in isolation? It should be fairly easy to test this yourself and if you can determine that something breaks I'll revert it.

main.py Show resolved Hide resolved
main.py Outdated Show resolved Hide resolved
Co-authored-by: NoYouNotUrUncle <[email protected]>
main.py Outdated Show resolved Hide resolved
Co-authored-by: NoYouNotUrUncle <[email protected]>
main.py Outdated Show resolved Hide resolved
Co-authored-by: NoYouNotUrUncle <[email protected]>
@potatoeggy
Copy link
Contributor Author

When requesting changes, please make every change you would like to see before requesting them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants