From 3330d37cc2670faaaaf4d3e14c7c2b20712f0853 Mon Sep 17 00:00:00 2001 From: XronoZ-create <70958549+XronoZ-create@users.noreply.github.com> Date: Tue, 15 Sep 2020 00:12:13 +0300 Subject: [PATCH 1/5] BrowserRequests Added new class BrowserRequests. It is planned to add the functionality of the steam site to it. Added now "get_avatar_url" and "set_avatar" --- steam/webauth.py | 5 ++- steam/webrequests.py | 75 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 steam/webrequests.py diff --git a/steam/webauth.py b/steam/webauth.py index d81ce13..dd128c9 100644 --- a/steam/webauth.py +++ b/steam/webauth.py @@ -66,6 +66,8 @@ from steam.steamid import SteamID from steam.utils.web import make_requests_session, generate_session_id from steam.core.crypto import rsa_publickey, pkcs1v15_encrypt +from steam.webrequests import BrowserRequests + if six.PY2: intBase = long _cli_input = raw_input @@ -74,7 +76,7 @@ else: _cli_input = input -class WebAuth(object): +class WebAuth(BrowserRequests): key = None logged_on = False #: whether authentication has been completed successfully session = None #: :class:`requests.Session` (with auth cookies after auth is completed) @@ -85,6 +87,7 @@ class WebAuth(object): def __init__(self, username, password=''): self.__dict__.update(locals()) + super().__init__() self.session = make_requests_session() self._session_setup() diff --git a/steam/webrequests.py b/steam/webrequests.py new file mode 100644 index 0000000..c9ea825 --- /dev/null +++ b/steam/webrequests.py @@ -0,0 +1,75 @@ +import requests +from bs4 import BeautifulSoup + +class BrowserRequests(object): + def __init__(self): + self.session = None + self.steam_id = None + self.session_id = None + + def get_avatar_url(self, size=2): + """Get URL to avatar picture + + :param size: possible values are ``0``, ``1``, or ``2`` corresponding to small, medium, large + :type size: :class:`int` + :return: url to avatar + :rtype: :class:`str` + :raises HTTPError: any problem with http request, timeouts, 5xx, 4xx etc + """ + self.url = "https://steamcommunity.com/profiles/%s/edit/avatar" + try: + self.resp = self.session.get(self.url % self.steam_id, + timeout=15, + ) + self.req_bs = BeautifulSoup(self.resp.text) + self.avatar_url = str(self.req_bs.find('div', {'class':'playerAvatar'}).find('img')['src'].split('.jpg')[0]) + sizes = { # размеры картинок + 0: '', + 1: '_medium', + 2: '_full', + } + except requests.exceptions.RequestException as e: + raise HTTPError(str(e)) + + return self.avatar_url+sizes[size]+'.jpg' + + def set_avatar(self, avatar): + """Set image to avatar picture + + :param avatar: bytes image + :type avatar: :class:`bytes` + :return: json response + :rtype: :class:`dict` + :raises HTTPError: any problem with http request, timeouts, 5xx, 4xx etc + :raises AvatarRequiredNoSend: any problem with the format of the file being sent + """ + self.url = "https://steamcommunity.com/actions/FileUploader/" + try: + self.resp = self.session.post(self.url, + timeout=15, + data={ + 'type': 'player_avatar_image', + 'sId': self.steam_id, + 'sessionid': self.session_id, + 'doSub': 1, + 'json': 1 + }, + files={'avatar':avatar} + ).json() + except requests.exceptions.RequestException as e: + raise HTTPError(str(e)) + if self.resp['success'] != True: + raise AvatarRequiredNoSend + return self.resp + +class WebAuthException(Exception): + pass + +class HTTPError(WebAuthException): + pass + +class AvatarRequired(Exception): + pass + +class AvatarRequiredNoSend(AvatarRequired): + pass \ No newline at end of file From 8fb69d2e4689c1507d40b803d3ee8f511e408b4f Mon Sep 17 00:00:00 2001 From: XronoZ-create Date: Tue, 21 Jun 2022 18:15:18 +0300 Subject: [PATCH 2/5] Remove old architecture --- steam/webrequests.py | 75 -------------------------------------------- 1 file changed, 75 deletions(-) delete mode 100644 steam/webrequests.py diff --git a/steam/webrequests.py b/steam/webrequests.py deleted file mode 100644 index c9ea825..0000000 --- a/steam/webrequests.py +++ /dev/null @@ -1,75 +0,0 @@ -import requests -from bs4 import BeautifulSoup - -class BrowserRequests(object): - def __init__(self): - self.session = None - self.steam_id = None - self.session_id = None - - def get_avatar_url(self, size=2): - """Get URL to avatar picture - - :param size: possible values are ``0``, ``1``, or ``2`` corresponding to small, medium, large - :type size: :class:`int` - :return: url to avatar - :rtype: :class:`str` - :raises HTTPError: any problem with http request, timeouts, 5xx, 4xx etc - """ - self.url = "https://steamcommunity.com/profiles/%s/edit/avatar" - try: - self.resp = self.session.get(self.url % self.steam_id, - timeout=15, - ) - self.req_bs = BeautifulSoup(self.resp.text) - self.avatar_url = str(self.req_bs.find('div', {'class':'playerAvatar'}).find('img')['src'].split('.jpg')[0]) - sizes = { # размеры картинок - 0: '', - 1: '_medium', - 2: '_full', - } - except requests.exceptions.RequestException as e: - raise HTTPError(str(e)) - - return self.avatar_url+sizes[size]+'.jpg' - - def set_avatar(self, avatar): - """Set image to avatar picture - - :param avatar: bytes image - :type avatar: :class:`bytes` - :return: json response - :rtype: :class:`dict` - :raises HTTPError: any problem with http request, timeouts, 5xx, 4xx etc - :raises AvatarRequiredNoSend: any problem with the format of the file being sent - """ - self.url = "https://steamcommunity.com/actions/FileUploader/" - try: - self.resp = self.session.post(self.url, - timeout=15, - data={ - 'type': 'player_avatar_image', - 'sId': self.steam_id, - 'sessionid': self.session_id, - 'doSub': 1, - 'json': 1 - }, - files={'avatar':avatar} - ).json() - except requests.exceptions.RequestException as e: - raise HTTPError(str(e)) - if self.resp['success'] != True: - raise AvatarRequiredNoSend - return self.resp - -class WebAuthException(Exception): - pass - -class HTTPError(WebAuthException): - pass - -class AvatarRequired(Exception): - pass - -class AvatarRequiredNoSend(AvatarRequired): - pass \ No newline at end of file From 3bdbb2cf8d7b0145030ec5904e3d6327ab670db6 Mon Sep 17 00:00:00 2001 From: XronoZ-create Date: Tue, 21 Jun 2022 18:19:18 +0300 Subject: [PATCH 3/5] Rollback to current version --- steam/webauth.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/steam/webauth.py b/steam/webauth.py index 4b55943..dbaa176 100644 --- a/steam/webauth.py +++ b/steam/webauth.py @@ -65,8 +65,6 @@ from steam.steamid import SteamID from steam.utils.web import make_requests_session, generate_session_id from steam.core.crypto import rsa_publickey, pkcs1v15_encrypt -from steam.webrequests import BrowserRequests - if six.PY2: intBase = long _cli_input = raw_input @@ -75,7 +73,7 @@ else: _cli_input = input -class WebAuth(BrowserRequests): +class WebAuth(object): key = None logged_on = False #: whether authentication has been completed successfully session = None #: :class:`requests.Session` (with auth cookies after auth is completed) @@ -86,7 +84,6 @@ class WebAuth(BrowserRequests): def __init__(self, username, password=''): self.__dict__.update(locals()) - super().__init__() self.session = make_requests_session() self._session_setup() @@ -411,4 +408,4 @@ class TwoFactorCodeRequired(WebAuthException): pass class TooManyLoginFailures(WebAuthException): - pass + pass \ No newline at end of file From ab0f13f0a2d4cfabf505132021d50c961f6ad892 Mon Sep 17 00:00:00 2001 From: XronoZ-create Date: Tue, 21 Jun 2022 18:40:45 +0300 Subject: [PATCH 4/5] Adding a module to work with Community Steam --- steam/community.py | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 steam/community.py diff --git a/steam/community.py b/steam/community.py new file mode 100644 index 0000000..61a8b87 --- /dev/null +++ b/steam/community.py @@ -0,0 +1,95 @@ +# -*- coding: utf-8 -*- + +""" +This module contains methods for working with Community Steam + +Example usage: +.. code:: python + import steam.webauth as wa + import steam.community + + client = wa.WebAuth('login', 'password') + client.login() + + co_client = steam.community.SteamCommunityClient(client=client) + result = co_client.set_avatar(avatar=open('image.jpg', 'rb').read()) + +""" + +import requests +from bs4 import BeautifulSoup +from steam.webauth import WebAuthException, HTTPError + +class SteamCommunityClient(): + def __init__(self, client): + self.client = client + self.session = self.client.session + self.steam_id = self.client.steam_id + self.session_id = self.client.session_id + self.cookies = self.client.session.cookies + + def get_avatar_url(self, size=2) -> str: + """Get URL to avatar picture + + :param size: possible values are ``0``, ``1``, or ``2`` corresponding to small, medium, large + :type size: :class:`int` + :return: url to avatar + :rtype: :class:`str` + :raises HTTPError: any problem with http request, timeouts, 5xx, 4xx etc + """ + self.url = "https://steamcommunity.com/profiles/%s/edit/avatar" + try: + self.resp = self.session.get(self.url % self.steam_id, + timeout=15, + ) + self.req_bs = BeautifulSoup(self.resp.text) + self.avatar_url = str(self.req_bs.find('div', {'class':'playerAvatar'}).find('img')['src'].split('.jpg')[0]) + sizes = { # размеры картинок + 0: '', + 1: '_medium', + 2: '_full', + } + except requests.exceptions.RequestException as e: + raise HTTPError(str(e)) + + return self.avatar_url+sizes[size]+'.jpg' + + def set_avatar(self, avatar: bytes) -> dict: + """Set image to avatar picture + + Example usage: + + .. code:: python + + :param avatar: bytes image + :type avatar: :class:`bytes` + :return: json response + :rtype: :class:`dict` + :raises HTTPError: any problem with http request, timeouts, 5xx, 4xx etc + :raises AvatarRequiredNoSend: any problem with the format of the file being sent + """ + self.url = "https://steamcommunity.com/actions/FileUploader/" + try: + self.resp = self.session.post(self.url, + timeout=15, + data={ + 'type': 'player_avatar_image', + 'sId': self.steam_id, + 'sessionid': self.session_id, + 'doSub': 1, + 'json': 1 + }, + files={'avatar':avatar} + ).json() + except requests.exceptions.RequestException as e: + raise HTTPError(str(e)) + if self.resp['success'] != True: + raise AvatarRequiredNoSend + return self.resp + + +class AvatarRequired(Exception): + pass + +class AvatarRequiredNoSend(AvatarRequired): + pass \ No newline at end of file From 19d477ab76aabf704ca5c40b510318ea87c61c46 Mon Sep 17 00:00:00 2001 From: XronoZ-create Date: Tue, 21 Jun 2022 18:50:32 +0300 Subject: [PATCH 5/5] Editing method description --- steam/community.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/steam/community.py b/steam/community.py index 61a8b87..821d456 100644 --- a/steam/community.py +++ b/steam/community.py @@ -57,10 +57,6 @@ class SteamCommunityClient(): def set_avatar(self, avatar: bytes) -> dict: """Set image to avatar picture - Example usage: - - .. code:: python - :param avatar: bytes image :type avatar: :class:`bytes` :return: json response