RBotKit 0.1.31 → 0.1.35
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.DS_Store +0 -0
- data/RBotKit-0.1.31.gem +0 -0
- data/RBotKit.gemspec +5 -3
- data/lib/RBotKit.rb +27 -6
- data/lib/RBotKit/state_provider.rb +1 -2
- data/lib/RBotKit/version.rb +1 -1
- metadata +24 -24
- data/RBotKit-0.1.30.gem +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ce4439f709bf4aa99f2327b08db5fba310c38ac0
|
4
|
+
data.tar.gz: 19f924b8ec1ba0dedebd2c25db1633a46f697f42
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3da9a2d3a9ce74d3c6272c12958802fee629d478075d6bd819156afee3141ab9f8a75655e3bd93adf0dd789f4dbf799595f949c68b9679ef4787f89873d19b97
|
7
|
+
data.tar.gz: ba5b48702541767a3c6d8d9d299530b429469c76fe7fe238a7fdc09bdaff64c10a1bd8be01d4f0c681d91ee066e2ad216733690f10a86738143589f8a02cb24a
|
data/.DS_Store
CHANGED
Binary file
|
data/RBotKit-0.1.31.gem
ADDED
Binary file
|
data/RBotKit.gemspec
CHANGED
@@ -20,9 +20,11 @@ Gem::Specification.new do |spec|
|
|
20
20
|
spec.require_paths = ["lib"]
|
21
21
|
|
22
22
|
|
23
|
-
spec.add_development_dependency "bundler", "~> 1.8"
|
24
|
-
spec.add_development_dependency "rake", "~> 10.0"
|
25
|
-
spec.add_development_dependency "rspec", "2.99.0"
|
26
23
|
spec.add_dependency 'rest-client', '~> 1.8'
|
27
24
|
spec.add_dependency 'i18n', '~> 0'
|
25
|
+
spec.add_development_dependency "bundler", "~> 1.8"
|
26
|
+
spec.add_development_dependency "rake", "~> 10.0"
|
27
|
+
spec.add_development_dependency "rspec", "2.99.0"
|
28
|
+
# spec.add_development_dependency 'rest-client', '~> 1.8'
|
29
|
+
# spec.add_development_dependency 'i18n', '~> 0'
|
28
30
|
end
|
data/lib/RBotKit.rb
CHANGED
@@ -17,7 +17,7 @@ module RBotKit
|
|
17
17
|
@@bot_key
|
18
18
|
end
|
19
19
|
|
20
|
-
Request = Struct.new(:id, :chat_id, :user_id, :text, :username)
|
20
|
+
Request = Struct.new(:id, :chat_id, :user_id, :text, :username, :photo_id)
|
21
21
|
RequestCallback = Struct.new(:id, :chat_id, :user_id, :text, :username)
|
22
22
|
|
23
23
|
def self.tel_parse_data(data)
|
@@ -29,7 +29,13 @@ module RBotKit
|
|
29
29
|
user_id = usr[:id]
|
30
30
|
username = usr[:first_name]
|
31
31
|
text = mes[:text] != nil ? mes[:text].strip : nil
|
32
|
-
|
32
|
+
photo = mes[:photo]
|
33
|
+
fileid = nil
|
34
|
+
if photo != nil
|
35
|
+
photosize = photo.last
|
36
|
+
fileid = photosize[:file_id]
|
37
|
+
end
|
38
|
+
req = Request.new(id, chat_id, user_id, text, username, fileid)
|
33
39
|
else
|
34
40
|
cb = data[:callback_query]
|
35
41
|
if cb != nil
|
@@ -39,11 +45,24 @@ module RBotKit
|
|
39
45
|
user_id = usr[:id]
|
40
46
|
username = usr[:first_name]
|
41
47
|
text = cb[:data]
|
42
|
-
req = RequestCallback.new(id, chat_id, user_id, text, username)
|
48
|
+
req = RequestCallback.new(id, chat_id, user_id, text, username, nil)
|
43
49
|
end
|
44
50
|
end
|
45
51
|
end
|
46
52
|
|
53
|
+
def self.get_file_link(fileid)
|
54
|
+
responce = RestClient.get "https://api.telegram.org/#{RBotKit.bot_key}/getFile?file_id=#{fileid}"
|
55
|
+
jresp = JSON.parse(responce.body)
|
56
|
+
filepath = nil
|
57
|
+
p jresp["result"] != nil
|
58
|
+
if jresp["result"] != nil
|
59
|
+
filepath = jresp["result"]["file_path"]
|
60
|
+
return "https://api.telegram.org/file/#{RBotKit.bot_key}/#{filepath}"
|
61
|
+
else
|
62
|
+
p jresp
|
63
|
+
return nil
|
64
|
+
end
|
65
|
+
end
|
47
66
|
|
48
67
|
CommandCase = Struct.new(:state, :cmdtext, :cmdclass)
|
49
68
|
|
@@ -73,8 +92,7 @@ module RBotKit
|
|
73
92
|
@locale_provider = locale_provider == nil ? LocaleProvider.new : locale_provider
|
74
93
|
end
|
75
94
|
|
76
|
-
def process_request(req)
|
77
|
-
return if req.text == nil
|
95
|
+
def process_request(req)
|
78
96
|
return if @state_provider.is_req_already_processed(req.chat_id, req.id)
|
79
97
|
|
80
98
|
@state_provider.update_last_processed_req_id(req.chat_id, req.id)
|
@@ -86,12 +104,15 @@ module RBotKit
|
|
86
104
|
|
87
105
|
arrs.each do |cc|
|
88
106
|
in_state = cc.state.class == Array ? cc.state.include?(state) : cc.state == state
|
89
|
-
if in_state || cc.state == :any
|
107
|
+
if in_state || cc.state == :any
|
108
|
+
|
90
109
|
if cc.cmdtext.class == Hash
|
91
110
|
regexp = cc.cmdtext[:regexp]
|
92
111
|
cmdCase = cc if regexp != nil && regexp.match(req.text)
|
93
112
|
elsif cc.cmdtext.class == Symbol && cc.cmdtext == :any
|
94
113
|
cmdCase = cc
|
114
|
+
elsif cc.cmdtext.class == Symbol && cc.cmdtext == :hasphoto && req.photo_id != nil
|
115
|
+
cmdCase = cc
|
95
116
|
else
|
96
117
|
cmdCase = cc if cc.cmdtext == req.text
|
97
118
|
end
|
data/lib/RBotKit/version.rb
CHANGED
metadata
CHANGED
@@ -1,23 +1,23 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: RBotKit
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.35
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- alexej
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-07-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
|
-
name:
|
14
|
+
name: rest-client
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: '1.8'
|
20
|
-
type: :
|
20
|
+
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
@@ -25,61 +25,61 @@ dependencies:
|
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: '1.8'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
|
-
name:
|
28
|
+
name: i18n
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '
|
34
|
-
type: :
|
33
|
+
version: '0'
|
34
|
+
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: '
|
40
|
+
version: '0'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
|
-
name:
|
42
|
+
name: bundler
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- -
|
45
|
+
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version:
|
47
|
+
version: '1.8'
|
48
48
|
type: :development
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- -
|
52
|
+
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version:
|
54
|
+
version: '1.8'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
|
-
name:
|
56
|
+
name: rake
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: '
|
62
|
-
type: :
|
61
|
+
version: '10.0'
|
62
|
+
type: :development
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: '
|
68
|
+
version: '10.0'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
|
-
name:
|
70
|
+
name: rspec
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- -
|
73
|
+
- - '='
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version:
|
76
|
-
type: :
|
75
|
+
version: 2.99.0
|
76
|
+
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- -
|
80
|
+
- - '='
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version:
|
82
|
+
version: 2.99.0
|
83
83
|
description: Bot Kit for telegramm
|
84
84
|
email:
|
85
85
|
- a-nenastev@mail.ru
|
@@ -93,7 +93,7 @@ files:
|
|
93
93
|
- ".travis.yml"
|
94
94
|
- Gemfile
|
95
95
|
- LICENSE.txt
|
96
|
-
- RBotKit-0.1.
|
96
|
+
- RBotKit-0.1.31.gem
|
97
97
|
- RBotKit.gemspec
|
98
98
|
- RBotKit/.gitignore
|
99
99
|
- RBotKit/.rspec
|
data/RBotKit-0.1.30.gem
DELETED
Binary file
|