qwtf_discord_bot 5.5.17 → 5.5.18

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Dockerfile +2 -1
  3. data/Gemfile.lock +39 -43
  4. data/README.md +1 -1
  5. data/VERSION +1 -1
  6. data/lib/dashboard.rb +26 -21
  7. data/qwtf_discord_bot.gemspec +3 -3
  8. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 55bf454fa327aa5bf7d0b29bd63829ae2c2b93de601e15de209f8deff570869f
4
- data.tar.gz: f12ee66e6996bfee4400dba504de6227179595a84576cc195611a6ea3f79f2c8
3
+ metadata.gz: edf725dbe10cf8dd1f3a44adb214ccd9ebca849a86c898dc5012b180301da3eb
4
+ data.tar.gz: 3c2dff10129f4f73b4b16337ed7413207d5aa2695457fa046158b5a8bf4a5240
5
5
  SHA512:
6
- metadata.gz: 9de0be068be49dfed25b62b8d1d45c4c380aadb67f7abe05384d606a25967814350b8ba026ecd1936e1d4e0bbd9adda3bc8c4c91a2e5f1c6d6e4635bf9ff8d03
7
- data.tar.gz: 77454e92741377506ffaaea1c81a206cfd5902c7e0896515c1e67df2fe514aaee2b498be773650b4fc2c537b33ebf0866b77561b2ac7e07257723a4026f8ba66
6
+ metadata.gz: f9a5f0e994c6ffd34c93af96d8b5b7ac9bcf80005532a6fa9e1918da72a05c42c74ab079cc7ab34bd03f5f0bf6a51d12c5a7510f10a692146dcb96dc6d35da47
7
+ data.tar.gz: a6d3460b139e0386de4c5685ea978c8e98fafcd1fcdb9988ff620628e37df0ef5854d5adc5d72403cff072168c138e4fc8120f62f82f90f24a9cc7f822ec3a43
data/Dockerfile CHANGED
@@ -1,5 +1,6 @@
1
- FROM ruby:2.6
1
+ FROM ruby:3.0
2
2
  WORKDIR /discord-bot/
3
+ RUN gem install bundler
3
4
  RUN git clone https://github.com/multiplay/qstat.git \
4
5
  && cd /discord-bot/qstat \
5
6
  && ./autogen.sh \
data/Gemfile.lock CHANGED
@@ -1,90 +1,86 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- qwtf_discord_bot (5.3.5)
5
- discordrb (~> 3.3)
6
- redis (~> 4.1)
7
- thor (~> 0.20)
4
+ qwtf_discord_bot (5.5.18)
5
+ discordrb
6
+ redis
7
+ thor
8
8
 
9
9
  GEM
10
10
  remote: https://rubygems.org/
11
11
  specs:
12
- activesupport (6.0.3.2)
12
+ activesupport (6.1.3)
13
13
  concurrent-ruby (~> 1.0, >= 1.0.2)
14
- i18n (>= 0.7, < 2)
15
- minitest (~> 5.1)
16
- tzinfo (~> 1.1)
17
- zeitwerk (~> 2.2, >= 2.2.2)
14
+ i18n (>= 1.6, < 2)
15
+ minitest (>= 5.1)
16
+ tzinfo (~> 2.0)
17
+ zeitwerk (~> 2.3)
18
18
  coderay (1.1.3)
19
- concurrent-ruby (1.1.7)
19
+ concurrent-ruby (1.1.8)
20
20
  diff-lcs (1.4.4)
21
- discordrb (3.3.0)
22
- discordrb-webhooks (~> 3.3.0)
21
+ discordrb (3.4.2)
22
+ discordrb-webhooks (~> 3.4.2)
23
23
  ffi (>= 1.9.24)
24
24
  opus-ruby
25
- rbnacl (~> 3.4.0)
26
- rest-client (>= 2.1.0.rc1)
25
+ rest-client (>= 2.0.0)
27
26
  websocket-client-simple (>= 0.3.0)
28
- discordrb-webhooks (3.3.0)
29
- rest-client (>= 2.1.0.rc1)
27
+ discordrb-webhooks (3.4.2)
28
+ rest-client (>= 2.0.0)
30
29
  domain_name (0.5.20190701)
31
30
  unf (>= 0.0.5, < 1.0.0)
32
31
  event_emitter (0.2.6)
33
32
  factory_bot (6.1.0)
34
33
  activesupport (>= 5.0.0)
35
- ffi (1.13.1)
34
+ ffi (1.14.2)
36
35
  http-accept (1.7.0)
37
36
  http-cookie (1.0.3)
38
37
  domain_name (~> 0.5)
39
- i18n (1.8.5)
38
+ i18n (1.8.9)
40
39
  concurrent-ruby (~> 1.0)
41
40
  method_source (1.0.0)
42
41
  mime-types (3.3.1)
43
42
  mime-types-data (~> 3.2015)
44
- mime-types-data (3.2020.0512)
45
- minitest (5.14.1)
43
+ mime-types-data (3.2021.0212)
44
+ minitest (5.14.3)
46
45
  netrc (0.11.0)
47
46
  opus-ruby (1.0.1)
48
47
  ffi
49
- pry (0.13.1)
48
+ pry (0.14.0)
50
49
  coderay (~> 1.1)
51
50
  method_source (~> 1.0)
52
- rbnacl (3.4.0)
53
- ffi
54
- redis (4.2.1)
51
+ redis (4.2.5)
55
52
  rest-client (2.1.0)
56
53
  http-accept (>= 1.7.0, < 2.0)
57
54
  http-cookie (>= 1.0.2, < 2.0)
58
55
  mime-types (>= 1.16, < 4.0)
59
56
  netrc (~> 0.8)
60
- rspec (3.9.0)
61
- rspec-core (~> 3.9.0)
62
- rspec-expectations (~> 3.9.0)
63
- rspec-mocks (~> 3.9.0)
64
- rspec-core (3.9.2)
65
- rspec-support (~> 3.9.3)
66
- rspec-expectations (3.9.2)
57
+ rspec (3.10.0)
58
+ rspec-core (~> 3.10.0)
59
+ rspec-expectations (~> 3.10.0)
60
+ rspec-mocks (~> 3.10.0)
61
+ rspec-core (3.10.1)
62
+ rspec-support (~> 3.10.0)
63
+ rspec-expectations (3.10.1)
67
64
  diff-lcs (>= 1.2.0, < 2.0)
68
- rspec-support (~> 3.9.0)
69
- rspec-mocks (3.9.1)
65
+ rspec-support (~> 3.10.0)
66
+ rspec-mocks (3.10.2)
70
67
  diff-lcs (>= 1.2.0, < 2.0)
71
- rspec-support (~> 3.9.0)
72
- rspec-support (3.9.3)
73
- thor (0.20.3)
74
- thread_safe (0.3.6)
75
- tzinfo (1.2.7)
76
- thread_safe (~> 0.1)
68
+ rspec-support (~> 3.10.0)
69
+ rspec-support (3.10.2)
70
+ thor (1.1.0)
71
+ tzinfo (2.0.4)
72
+ concurrent-ruby (~> 1.0)
77
73
  unf (0.1.4)
78
74
  unf_ext
79
75
  unf_ext (0.0.7.7)
80
- websocket (1.2.8)
76
+ websocket (1.2.9)
81
77
  websocket-client-simple (0.3.0)
82
78
  event_emitter
83
79
  websocket
84
- zeitwerk (2.4.0)
80
+ zeitwerk (2.4.2)
85
81
 
86
82
  PLATFORMS
87
- ruby
83
+ x86_64-linux
88
84
 
89
85
  DEPENDENCIES
90
86
  bundler
@@ -97,4 +93,4 @@ DEPENDENCIES
97
93
  thor
98
94
 
99
95
  BUNDLED WITH
100
- 1.17.2
96
+ 2.2.8
data/README.md CHANGED
@@ -126,7 +126,7 @@ they haven't been connected for more than ten minutes.
126
126
 
127
127
  Build:
128
128
 
129
- gem build qwtf_discrd_bot.gemspec
129
+ gem build qwtf_discord_bot.gemspec
130
130
 
131
131
 
132
132
  Install:
data/VERSION CHANGED
@@ -1 +1 @@
1
- 5.5.17
1
+ 5.5.18
data/lib/dashboard.rb CHANGED
@@ -2,7 +2,6 @@ class Dashboard
2
2
  def initialize(dashboard_config, bot)
3
3
  @server = bot.server(dashboard_config["server_id"])
4
4
  @endpoints = dashboard_config["endpoints"]
5
- @messages = {}
6
5
 
7
6
  channel_name = dashboard_config["name"]
8
7
 
@@ -11,31 +10,37 @@ class Dashboard
11
10
  end
12
11
 
13
12
  @channel = if old_dashboard_channel
14
- position = old_dashboard_channel.position
15
- topic = old_dashboard_channel.topic
16
- category = old_dashboard_channel.category
17
- old_dashboard_channel.delete
18
-
19
- @server.create_channel(channel_name).tap do |channel|
20
- channel.position = position
21
- channel.topic = topic if topic
22
- channel.category = category if category
23
- end
24
- else
25
- @server.create_channel(channel_name).tap do |channel|
26
- channel.topic = "QWTF Bot Dashboard"
27
- end
28
- end
13
+ old_messages = JSON.parse(
14
+ Discordrb::API::Channel.messages(
15
+ "Bot #{QwtfDiscordBot.config.token}",
16
+ old_dashboard_channel.id,
17
+ 100
18
+ )
19
+ )
20
+
21
+ old_messages.each do |old_message|
22
+ sleep 2
23
+ old_dashboard_channel.message(old_message['id']).delete
24
+ end
25
+
26
+ old_dashboard_channel
27
+ else
28
+ @server.create_channel(channel_name).tap do |channel|
29
+ channel.topic = "QWTF Bot Dashboard"
30
+ end
31
+ end
29
32
  end
30
33
 
31
34
  def update
35
+ messages = {}
36
+
32
37
  @endpoints.each do |endpoint|
33
38
  qstat_request = QstatRequest.new(endpoint)
34
39
 
35
40
  if qstat_request.is_empty?
36
- if @messages[endpoint]
37
- @messages[endpoint].delete
38
- @messages.delete(endpoint)
41
+ if messages[endpoint]
42
+ messages[endpoint].delete
43
+ messages.delete(endpoint)
39
44
  end
40
45
 
41
46
  next
@@ -43,8 +48,8 @@ class Dashboard
43
48
 
44
49
  embed = qstat_request.to_full_embed
45
50
 
46
- @messages[endpoint] = if @messages[endpoint]
47
- @messages[endpoint].edit(nil, embed)
51
+ messages[endpoint] = if messages[endpoint]
52
+ messages[endpoint].edit(nil, embed)
48
53
  else
49
54
  @channel.send_embed(nil, embed)
50
55
  end
data/qwtf_discord_bot.gemspec CHANGED
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
27
27
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
28
28
  spec.require_paths = ['lib']
29
29
 
30
- spec.add_runtime_dependency 'discordrb', '~> 3.3'
31
- spec.add_runtime_dependency 'redis', '~> 4.1'
32
- spec.add_runtime_dependency 'thor', '~> 0.20'
30
+ spec.add_runtime_dependency 'discordrb', '~> 3.4'
31
+ spec.add_runtime_dependency 'redis', '~> 4.2'
32
+ spec.add_runtime_dependency 'thor', '~>1.1'
33
33
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: qwtf_discord_bot
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.5.17
4
+ version: 5.5.18
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sheldon Johnson
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-12-28 00:00:00.000000000 Z
11
+ date: 2021-02-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: discordrb
@@ -16,42 +16,42 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '3.3'
19
+ version: '3.4'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '3.3'
26
+ version: '3.4'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: redis
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '4.1'
33
+ version: '4.2'
34
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: '4.1'
40
+ version: '4.2'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: thor
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '0.20'
47
+ version: '1.1'
48
48
  type: :runtime
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: '0.20'
54
+ version: '1.1'
55
55
  description: A Discord bot for reporting on QuakeWorld Team Fortress game servers
56
56
  email:
57
57
  - shayolden@hotmail.com
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
140
140
  - !ruby/object:Gem::Version
141
141
  version: '0'
142
142
  requirements: []
143
- rubygems_version: 3.1.2
143
+ rubygems_version: 3.2.3
144
144
  signing_key:
145
145
  specification_version: 4
146
146
  summary: Works by wrapping the excellent CLI server query tool qstat. Accepts !server,