Skip to content

Support Cloudflare #11

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.

Sign up for GitHub

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

Open
GAMBRUSH wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support Cloudflare #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions hackbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
import re
import json
import datetime
import requests
import cfscrape
import threading
import wikipedia
from bs4 import BeautifulSoup
from urllib2 import urlopen
import youtube_dl

scraper = cfscrape.create_scraper()
def handle(msg):
chat_id = msg['chat']['id']
command = msg['text']
Expand All @@ -40,7 +40,7 @@ def handle(msg):

#automatic hackerone notifier
def notifyh1():
site = requests.get('https://hackerone.com/hacktivity.json?sort_type=latest_disclosable_activity_at&filter=type%3Apublic')
site = scraper.get('https://hackerone.com/hacktivity.json?sort_type=latest_disclosable_activity_at&filter=type%3Apublic')
json_data = json.loads(site.text)
rep_id = json_data['reports'][0]['id']
rep_str = str(rep_id)
Expand Down Expand Up @@ -124,7 +124,7 @@ def notifyh1():
if program:
bot.sendMessage(chat_id,'\xF0\x9F\x9A\x80 Loading HackerOne Disclosed Bugs! \xF0\x9F\x9A\x80')
bot.sendMessage(chat_id, 'Program: '+program)
site = requests.get('https://hackerone.com/hacktivity.json?filter=type%3Apublic%20to%3A'+program)
site = scraper.get('https://hackerone.com/hacktivity.json?filter=type%3Apublic%20to%3A'+program)
json_data = json.loads(site.text)
for i in range(10):
try:
Expand All @@ -140,7 +140,7 @@ def notifyh1():
#common hacktivity
else:
bot.sendMessage(chat_id,'\xF0\x9F\x9A\x80 Loading HackerOne Disclosed Bugs! \xF0\x9F\x9A\x80')
site = requests.get('https://hackerone.com/hacktivity.json?sort_type=latest_disclosable_activity_at&filter=type%3Apublic')
site = scraper.get('https://hackerone.com/hacktivity.json?sort_type=latest_disclosable_activity_at&filter=type%3Apublic')
json_data = json.loads(site.text)
for i in range(10):
try:
Expand Down Expand Up @@ -197,7 +197,7 @@ def notifyh1():

#coin
elif command.startswith('coin') or command.startswith('Coin'):
res = requests.get('https://api.coinsecure.in/v1/exchange/ticker')
res = scraper.get('https://api.coinsecure.in/v1/exchange/ticker')
#print(res.text)
j = json.loads(res.text)
sell = j['message']['bid']
Expand All @@ -209,7 +209,7 @@ def notifyh1():
elif command.startswith('#'):
repnum=command[1:]
bot.sendMessage(chat_id,'\xF0\x9F\x9A\x80 Loading report \xF0\x9F\x9A\x80')
site = requests.get('https://hackerone.com/reports/'+repnum+'.json')
site = scraper.get('https://hackerone.com/reports/'+repnum+'.json')
json_data = json.loads(site .text)
if json_data['has_bounty?'] != 0:
bounty='Bounty: '+json_data['formatted_bounty']
Expand Down