Merge pull request #2 from iiiypuk/crystal

Crystal 💎

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*.cr]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true

.gitignore

@@ -1 +1,7 @@
+/docs/
+/lib/
+/bin/
+/.shards/
+*.dwarf
+
 config.json

.travis.yml

@@ -0,0 +1,6 @@
+language: crystal
+
+# Uncomment the following if you'd like Travis to run specs and check code formatting
+# script:
+#   - crystal spec
+#   - crystal tool format --check

LICENSE

@@ -1,24 +1,21 @@
-This is free and unencumbered software released into the public domain.
+The MIT License (MIT)
 
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
+Copyright (c) 2021 Alexander Popov <iiiypuk@iiiypuk.me>
 
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-For more information, please refer to <http://unlicense.org>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -1,10 +1,12 @@
-# service for set status online on vk.com
-Скрипт для поддержания статуса __Онлайн__ в социальной сети Vk.com  
-включает в себя `Python` скрипт `systemd` юнит.  
-![preview](https://raw.githubusercontent.com/iiiypuk/vk0nline/master/asset/.preview.png)  
+# vk0nline
+Утилита для поддержания статуса __Онлайн__ в социальной сети Vk.com.
 
-## Установка:
-+ Активировать автоматический запуск сессии пользователя
+Включает в себя `systemd` юнит.
+
+![preview](https://raw.githubusercontent.com/iiiypuk/vk0nline/master/.preview.png)
+
+## Установка
+Активировать автоматический запуск сессии пользователя
 ```console
 # Изменить параметр ReadWritePaths=/etc /run /var/lib/systemd/linger
 nano /usr/lib/systemd/system/systemd-logind.service
@@ -15,9 +17,30 @@ mkdir /var/lib/systemd/linger
 loginctl enable-linger $USER
 ```
 
-+ Скачать и запустить установщик
+Скачать и запустить установщик:
 ```console
 curl -Lsk https://raw.githubusercontent.com/iiiypuk/vk0nline/master/install.sh | sh
 ```
 
-+ Следовать инструкциям установщика
+Следовать инструкциям установщика.
+
+## Использование
+* Скачать исполняемый файл программы
+* Заполнить `appID` и `userIds` в `config.json`
+* Запустить программу `vk0nline` и получить `accessToken`
+
+## Development
+
+TODO: Write development instructions here
+
+## Contributing
+
+1. Fork it (<https://github.com/your-github-user/src/fork>)
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request
+
+## Contributors
+
+- [Alexander Popov](https://github.com/iiiypuk) - creator and maintainer

config.json.example

@@ -1,6 +1,7 @@
 {
-  "clientId": 1,
-  "secureKey": "",
-  "serviceKey": "",
-  "accessToken": ""
+  "appID": 6954184,
+  "userIds": 69040735,
+  "secureKey": null,
+  "serviceKey": null,
+  "accessToken": null
 }

shard.lock

@@ -0,0 +1,14 @@
+version: 2.0
+shards:
+  crest:
+    git: https://github.com/mamantoha/crest.git
+    version: 0.27.0
+
+  http-client-digest_auth:
+    git: https://github.com/mamantoha/http-client-digest_auth.git
+    version: 0.6.0
+
+  http_proxy:
+    git: https://github.com/mamantoha/http_proxy.git
+    version: 0.8.0
+

shard.yml

@@ -0,0 +1,17 @@
+name: vk0nline
+version: 2.0.0
+
+authors:
+  - Alexander Popov <iiiypuk@iiiypuk.me>
+
+targets:
+  src:
+    main: src/src.cr
+
+dependencies:
+  crest:
+    github: mamantoha/crest
+
+crystal: 1.0.0
+
+license: MIT

spec/spec_helper.cr

@@ -0,0 +1,2 @@
+require "spec"
+require "../src/src"

spec/src_spec.cr

@@ -0,0 +1,9 @@
+require "./spec_helper"
+
+describe Src do
+  # TODO: Write tests
+
+  it "works" do
+    false.should eq(true)
+  end
+end

src/vk0nline.cr

@@ -0,0 +1,56 @@
+require "json"
+require "crest"
+
+begin # JSON::ParseException
+  json = File.open("config.json") do |file|
+    JSON.parse(file)
+  end
+rescue
+  puts "Parse config.json error"
+
+  exit
+end
+
+def get_access_token(appId : Int32)
+  puts "Open this page, and save token to config.json\n\n"
+
+  token_url = "https://oauth.vk.com/authorize?client_id="\
+  "#{appId}&redirect_uri=vk.com&response_type=token"\
+  "&display=mobile&v=5.131&revoke=1&state=01010&scope=offline"
+
+  puts token_url
+end
+
+if json["accessToken"] == nil
+  get_access_token(json["appID"].as_i)
+else
+  response = Crest.get(
+    "https://api.vk.com/method/account.setOnline",
+    params: { :voip => "0", :v => "5.131",
+      :access_token => json["accessToken"].as_s,
+      :user_ids => json["userIds"].as_i }
+  )
+
+  status = JSON.parse(response.body)
+
+  begin # Missing hash key
+    if status["error"]
+      puts status["error"]["error_msg"]
+      puts "Error code #{status["error"]["error_code"]}"
+
+      puts "---"
+
+      get_access_token(json["appID"].as_i)
+    end
+    rescue
+      # execute if an exception is raised
+  end
+
+  begin # Missing hash key
+    if status["response"] == 1
+      puts "Complete!"
+    end
+  rescue
+    # execute if an exception is raised
+  end
+end

vk0nline.py

@@ -1,69 +0,0 @@
-#!/usr/bin/env python3
-
-import json
-import requests
-from datetime import datetime
-import getpass
-import sys
-
-__author__ = 'Alexander Popov'
-__copyright__ = '2019 by iiiypuk'
-__credits__ = ['Alexander Popov']
-__license__ = 'Unlicense'
-__version__ = '1.0.3'
-__maintainer__ = 'Alexander Popov'
-__email__ = 'iiiypuk@fastmail.fm'
-__status__ = 'Production'
-
-username = getpass.getuser()
-with open('/home/{user}/.config/emilecok/vk0nline/config.json'
-          .format(user=getpass.getuser()), 'r', encoding='utf-8') as f:
-    _C = json.load(f)
-
-
-def getStatus():
-    response = requests.get('https://api.vk.com/method/users.get?'
-                            'fields=online,last_seen&v=5.95'
-                            '&access_token={key}&user_ids={user}'
-                            .format(key=_C['serviceKey'], user=_C['clientId']))
-    userLoginTime = json.loads(response.content.decode('utf-8'))
-    userLoginTime = userLoginTime['response'][0]['last_seen']['time']
-    userOnline = json.loads(response.content.decode('utf-8'))
-    userOnline = userOnline['response'][0]['online']
-
-    return([userOnline, userLoginTime])
-
-
-def setOnline():
-    response = requests.get('https://api.vk.com/method/account.setOnline?'
-                            'voip=0&v=5.95&access_token={key}&user_ids={user}'
-                            .format(user=_C['clientId'],
-                                    key=_C['accessToken']))
-    content = json.loads(response.content.decode('utf-8'))
-
-    if 'error' in content:
-        # User authorization failed
-        if 5 == content['error']['error_code']:
-            print('User authorization failed.\n',
-                  'Open this link in browser, and copy access token.')
-            print('https://oauth.vk.com/authorize?client_id={appid}'
-                  '&redirect_uri=vk.com&display=mobile&response_type=token'
-                  '&v=5.95&revoke=1&state=01010&scope=offline'
-                  .format(appid=_C['clientId']))
-        else:
-            print('Error: {}.'.format(content['error']['error_code']))
-    elif 'response' in content:
-        if 1 == content['response']:
-            onlineStatus, lastSeen = getStatus()
-            lastSeen = datetime.fromtimestamp(lastSeen) \
-                .strftime('%Y-%m-%d %H:%M:%S')
-
-            if 0 == onlineStatus:
-                print('Not successful.')
-                sys.exit(1)
-
-            print('Last online', lastSeen)
-
-
-if __name__ == "__main__":
-    setOnline()