steam-trade 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ec0d0b02e28d0786909bc9aa8291e3a6985b842
-  data.tar.gz: a953614b30f1b7a38a32de697b6bc08007a51526
+  metadata.gz: 6fbde2803532a7f2bd6bf50986fcd678230e07db
+  data.tar.gz: 9ce311c6a2568ea06ca4068046f2958177e135ce
 SHA512:
-  metadata.gz: b5d516bdd1738fa7eed8513a4743f117ad4ca33c888c221762ff1909a548c31ef2329c8cf8fb8aac5aadcb5909cfbcc324873370d798404b530b7d4ae97f0701
-  data.tar.gz: 39e2643a0402a09d82431fdeb0c3a89c88d55e24bb9f2ed926b9be6647a42575f4620e64955f7d60def1f0d8c3553efb14d8ba3e15194403af16ad4f75739a80
+  metadata.gz: 3dc473b18d24ee21829ea9b61504f80faf03cdf377f0fe7789f350d0ab432354a888ba664a89d8945d4ac3045f6be26f556240744a1f576bfbbcbb03aa72e618
+  data.tar.gz: 6de09926ac61687084e583b9adcba6c382400af597001a11ecefe92e4114d999a1ed3a620eeb5a70bffe5ec036270118bcc6c42ddbafe9711a2f35ea11ad57e8

data/README.md

@@ -1,4 +1,4 @@
-# steam-trade V0.1.3
+# steam-trade V0.1.4
 Please check constantly for updates cause i'm still making this gem.
 
 This gem simplifes/allows sending steam trade offers programmatically.
@@ -7,6 +7,11 @@ this gem is primarly for trading cards, tho can be used to CS:GO and other games
 
 # Changelog
 ```
+0.1.4:
+- added Social commands : send friend request, accept friend request, remove friend, send message, get messages
+- added function to update badges blueprint (useful when there is no gem update)
+
+
 0.1.3:
 - decreased cooldown between requests from 2 seconds to 1 second.
 - added a 0.6 second wait before attempting to confirm a trade offer (mobile).
@@ -41,8 +46,15 @@ this gem is primarly for trading cards, tho can be used to CS:GO and other games
     - [cancel_trade_offer()](#cancel_trade_offertrade_offer_id)
   - [Counting badges owned](#counting-badges-owned)
     - [sets_count()](#sets_counttargetnon_marketable)
+    - [update_blueprint()](#update_blueprint)
   - [2FA codes](#2fa-codes)
     - [fa()](#fashared_secret-time_difference)
+  - [Social Features](#social-commands)
+    - [send_friend_request()](#send_friend_requesttarget)
+    - [accept_friend_request()](#accept_friend_requesttarget)
+    - [remove_friend()](#remove_friendtarget)
+    - [send_message()](#send_messagetarget-message)
+    - [poll_messages()](#poll_messages)
   - [More commands](#more-commands)
 
 ## Installation
@@ -371,6 +383,16 @@ hash = account.sets_count('CardExchange')
 hash = account.sets_count(76561198370420964)
 hash = account.sets_count('https://steamcommunity.com/tradeoffer/new/?partner=410155236&token=H-yK-GFt',false)
 
+```
+
+#### update_blueprint()
+- updates your locally saved badges blueprint
+```ruby
+require 'steam-trade'
+
+handler = Handler.new
+
+handler.update_blueprint()
 ```
 ## 2FA codes
 #### `fa(shared_secret, time_difference)`
@@ -393,6 +415,64 @@ nonlogged = Handler.new()
 puts nonlogged.fa() # will not work
 puts logged.fa() # will give a random code
 
+```
+## Social Commands
+**ALL OF THE COMMANDS BELOW REQUIRES LOGIN**
+### `send_friend_request(target)`
+sends a friend request to the target
+- `target` can be a steamID64, tradelink, or profileID
+
+```ruby
+require 'steam-trade'
+
+h = Handler.new('username', 'password')
+h.send_friend_request('nomg3r')
+```
+
+### `accept_friend_request(target)`
+accepts a friend request from the target
+- `target` can be a steamID64, tradelink, or profileID
+
+```ruby
+require 'steam-trade'
+
+h = Handler.new('username', 'password')
+h.accept_friend_request('nomg3r')
+```
+
+### `remove_friend(target)`
+removes a friend
+- `target` can be a steamID64, tradelink, or profileID
+
+```ruby
+require 'steam-trade'
+
+h = Handler.new('username', 'password')
+h.remove_friend('nomg3r')
+```
+### `send_message(target, message)`
+sends a message to the target
+- `target` can be a steamID64, tradelink, or profileID
+- `message` the message to send
+```ruby
+require 'steam-trade'
+
+h = Handler.new('username', 'password')
+h.send_message('nomg3r', "Hello, Friend)
+```
+
+### `poll_messages()`
+gives you the messages you receieved (after mobile login is initiated (after you call send_message() or poll_messages()  ) )
+
+```ruby
+require 'steam-trade'
+
+h = Handler.new('username', 'password')
+print h.poll_messages() # will not return messages so you call at again ( only the first time in the whole program )
+puts ""
+puts "------"
+sleep(10) #send a message to the logged in account
+print h.poll_messages() # actually have messages ( if you received some in the time between the first and the second request )
 ```
 ## More commands
 you can find more non-vital commands in the [wiki](https://github.com/OmG3r/steam-trade/wiki)

data/lib/LoginExecutor.rb

@@ -4,7 +4,7 @@ module LoginCommands
      private
       def login()
             response = @session.post('https://store.steampowered.com/login/getrsakey/', {'username' => @username})
-            data = pass_stamp(response)
+            data = pass_stamp(response,@password)
             encrypted_password = data["password"]
             timestamp = data["timestamp"]
             repeater = 0
@@ -89,7 +89,7 @@ module LoginCommands
 
 
 ########################################################################################
-      def pass_stamp(give)
+      def pass_stamp(give,password)
 
             data = JSON::parse(give)
             mod = data["publickey_mod"].hex
@@ -99,7 +99,7 @@ module LoginCommands
             key   = OpenSSL::PKey::RSA.new
             key.e = OpenSSL::BN.new(exp)
             key.n = OpenSSL::BN.new(mod)
-            ep = Base64.encode64(key.public_encrypt(@password.force_encoding("utf-8"))).gsub("\n", '')
+            ep = Base64.encode64(key.public_encrypt(password.force_encoding("utf-8"))).gsub("\n", '')
             return {'password' => ep, 'timestamp' => timestamp }
       end
 ########################################################################################

data/lib/Misc.rb

@@ -26,7 +26,9 @@ module MiscCommands
       end
 ########################################################################################
 
-
+      def use_chat_session()
+            @chat_session
+      end
 
 
 
@@ -76,7 +78,7 @@ module MiscCommands
             end
             if value == nil
                   begin
-                        @session.cookie_jar.jar["store.steampowered.com"]["/"]["sessionid"].value
+                        value = @session.cookie_jar.jar["store.steampowered.com"]["/"]["sessionid"].value
                   rescue
                         value = nil
                   end

data/lib/Social.rb

@@ -42,8 +42,8 @@ module SocialCommands
       end
 
       def send_message(id, message)
-            raise "you must be logged in to send a message" if @loggedin == false
-            chat_start() if @chat_session.nil?
+            raise "no account details given cannot poll messages" if @chat_session.nil? && @username.nil?
+            mobile_login() if @chat_session.nil?
 
             steamid = verify_profileid_or_trade_link_or_steamid(id)
 
@@ -59,8 +59,8 @@ module SocialCommands
 
 
       def poll_messages()
-            raise "you must be logged in to pool messages" if @loggedin == false
-            chat_start() if @chat_session.nil?
+            raise "no account details given cannot poll messages" if @chat_session.nil? && @username.nil?
+            mobile_login() if @chat_session.nil?
             response = @chat_session.post('https://api.steampowered.com/ISteamWebUserPresenceOAuth/Poll/v1', {
                   "umqid": @umqid,
                   "message": @message_id,
@@ -77,17 +77,18 @@ module SocialCommands
       end
 
 
-      private
-      def chat_start()
-                  mobile_login()
-                  get_umqid()
-      end
 
 
-      def mobile_login()
-            @chat_session = Mechanize.new { |agent| # the session which will hold your cookies to communicate with steam
-                  agent.follow_meta_refresh = true
-                  agent.log = Logger.new('read.log')
+
+
+      def mobile_login(username = @username, password = @password, secret = nil)
+            secret = @secret if username == @username
+            raise "username is required to do a chat login" if username.nil?
+            raise "password is required to do a chat login" if password.nil?
+
+            @chat_session = Mechanize.new { |a| # the session which will hold your cookies to communicate with steam
+                  a.follow_meta_refresh = true
+               #   a.agent.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
             }
 
             mobileheaders = {
@@ -108,16 +109,16 @@ module SocialCommands
             @chat_session.cookie_jar << cookie
 
 
-            response = @chat_session.post('https://steamcommunity.com/login/getrsakey/', {'username' => @username}, mobileheaders).content
+            response = @chat_session.post('https://steamcommunity.com/login/getrsakey/', {'username' => username}, mobileheaders).content
 
 
-            data = pass_stamp(response)
+            data = pass_stamp(response,password)
             encrypted_password = data["password"]
             timestamp = data["timestamp"]
             repeater = 0
             until repeater == true
-                  if @secret != nil
-                        guardcode = fa(@secret,@time_difference)
+                  if secret != nil
+                        guardcode = fa(secret,0)
                   else
                         puts "please write your 2FA code (mobile login to send messages)"
                         guardcode = gets.chomp
@@ -130,10 +131,10 @@ module SocialCommands
                         'emailauth' => '',
                         'emailsteamid' => '',
                         'password' => encrypted_password,
-                        'remember_login' => 'false',
+                        'remember_login' => 'true',
                         'rsatimestamp' => timestamp,
                         'twofactorcode' =>guardcode,
-                        'username' => @username,
+                        'username' => username,
                         'loginfriendlyname' => '#login_emailauth_friendlyname_mobile',
                         'oauth_scope' => "read_profile write_profile read_client write_client",
                         'oauth_client_id' => "DE45CD61"
@@ -145,7 +146,7 @@ module SocialCommands
                   if response["success"] == true
                         repeater = true
                   elsif repeater == 3
-                        raise "Login (mobile) failed username: #{@username}, password: #{@password}, shared_scret: #{@secret} tried 3 times"
+                        raise "Login (mobile) failed username: #{username}, password: #{password}, shared_scret: #{secret} tried 3 times"
                  else
 
                        sleep(2)
@@ -157,11 +158,54 @@ module SocialCommands
 
             oauth_hash = JSON.parse(response["oauth"]) # steam returns a hash as a string
             @oauth_token = oauth_hash["oauth_token"]
+            machinevalue = steammachine_cookie(oauth_hash["steamid"])
+            get_umqid()
+            return {"oauth_token" => @oauth_token, "machine" => machinevalue}
+      end
+
+
+
+      def oauth_login(oauth_token,machinevalue)
+
+        @chat_session = Mechanize.new { |a| # the session which will hold your cookies to communicate with steam
+              a.follow_meta_refresh = true
+             # a.agent.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        }
+
+
+        @oauth_token = oauth_token
+        response = @chat_session.post('https://api.steampowered.com/IMobileAuthService/GetWGToken/v1/', {"access_token" => oauth_token}).content
+        data = JSON.parse(response)
+        data = data["response"]
+
+        raise "error. cannot login" if data["token"].nil? || data["token_secure"].nil?
+
+
+        steamid = get_umqid(true) ##umqid got
+
+        ## loading cookies
+        container = []
+        container << (Mechanize::Cookie.new :domain => 'store.steampowered.com', :name =>'steamLogin', :value =>data["token"], :path => '/')
+        container << (Mechanize::Cookie.new :domain => 'steamcommunity.com', :name =>'steamLogin', :value =>data["token"], :path => '/')
+        container << (Mechanize::Cookie.new :domain => 'help.steampowered.com', :name =>'steamLogin', :value =>data["token"], :path => '/')
+
+        container << (Mechanize::Cookie.new :domain => 'store.steampowered.com', :name =>'steamLoginSecure', :value =>data["token_secure"], :path => '/')
+        container << (Mechanize::Cookie.new :domain => 'steamcommunity.com', :name =>'steamLoginSecure', :value =>data["token_secure"], :path => '/')
+        container << (Mechanize::Cookie.new :domain => 'help.steampowered.com', :name =>'steamLoginSecure', :value =>data["token_secure"], :path => '/')
+
+        container << (Mechanize::Cookie.new :domain => 'store.steampowered.com', :name => "steamMachineAuth#{steamid}" , :value => machinevalue, :path => '/')
+        container << (Mechanize::Cookie.new :domain => 'steamcommunity.com', :name => "steamMachineAuth#{steamid}" , :value => machinevalue, :path => '/')
+        container << (Mechanize::Cookie.new :domain => 'help.steampowered.com', :name => "steamMachineAuth#{steamid}" , :value => machinevalue, :path => '/')
+
+        container.each { |cookie|
+            @chat_session.cookie_jar << cookie
+        }
 
 
       end
 
-      def get_umqid()
+      private
+      def get_umqid(re = false)
             response = @chat_session.post('https://api.steampowered.com/ISteamWebUserPresenceOAuth/Logon/v1', {
                                     'ui_mode' => 'web',
                                     'access_token' => @oauth_token
@@ -170,16 +214,32 @@ module SocialCommands
             @umqid = hash["umqid"]
             @message_id = hash["message"]
 
-            ## starting polling
-            response = @chat_session.post('https://api.steampowered.com/ISteamWebUserPresenceOAuth/Poll/v1', {
-                  "umqid": @umqid,
-                  "message": @message_id,
-                  "pollid": 1,
-                  "sectimeout": 20,
-                  "secidletime": 0,
-                  "use_accountids": 0,
-                  "access_token": @oauth_token
-                  })
+          (return hash["steamid"]) if re == true
+      end
+
 
+      def steammachine_cookie(steamid)
+            value = nil
+            begin
+                  value = @chat_session.cookie_jar.jar["steamcommunity.com"]["/"]["steamMachineAuth#{steamid}"].value
+            rescue
+                  value = nil
+            end
+            if value == nil
+                  begin
+                        value = @chat_session.cookie_jar.jar["store.steampowered.com"]["/"]["steamMachineAuth#{steamid}"].value
+                  rescue
+                        value = nil
+                  end
+            end
+
+            if value == nil
+                  @chat_session.cookies.each { |c|
+                        if c.name == "steamMachineAuth#{steamid}"
+                               value = c.value
+                         end
+                  }
+            end
+            return value
       end
 end