Skip to content

Commit

Permalink
Revert "Merge pull request #1696 from tactilenews/1386_add_more_conte…
Browse files Browse the repository at this point in the history
…xt_to_signal_errors"

This reverts commit a5ccdb8, reversing
changes made to c985028.
  • Loading branch information
mattwr18 committed Sep 18, 2023
1 parent 60bec3b commit e1a8a8e
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 102 deletions.
28 changes: 0 additions & 28 deletions app/adapters/signal_adapter/api.rb

This file was deleted.

9 changes: 0 additions & 9 deletions app/adapters/signal_adapter/bad_request_error.rb

This file was deleted.

18 changes: 12 additions & 6 deletions app/adapters/signal_adapter/outbound/file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,23 @@ class File < ApplicationJob

def perform(message:)
@message = message
uri = URI.parse("#{Setting.signal_cli_rest_api_endpoint}/v2/send")
request = Net::HTTP::Post.new(uri, {
url = URI.parse("#{Setting.signal_cli_rest_api_endpoint}/v2/send")
request = Net::HTTP::Post.new(url.to_s, {
Accept: 'application/json',
'Content-Type': 'application/json'
})
request.body = data.to_json
SignalAdapter::Api.perform_request(request) do
# TODO: Do something on success. For example, mark the message as delivered?
# Or should we use deliver receipts as the source of truth.
Rails.logger.debug 'Great!'
response = Net::HTTP.start(url.host, url.port) do |http|
http.request(request)
end
response.value # may raise exception
rescue Net::HTTPClientException => e
ErrorNotifier.report(e, context: {
code: e.response.code,
message: e.response.message,
headers: e.response.to_hash,
body: e.response.body
})
end

def data
Expand Down
18 changes: 12 additions & 6 deletions app/adapters/signal_adapter/outbound/text.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,23 @@ class Text < ApplicationJob
def perform(recipient:, text:)
@recipient = recipient
@text = text
uri = URI.parse("#{Setting.signal_cli_rest_api_endpoint}/v2/send")
request = Net::HTTP::Post.new(uri, {
url = URI.parse("#{Setting.signal_cli_rest_api_endpoint}/v2/send")
request = Net::HTTP::Post.new(url.to_s, {
Accept: 'application/json',
'Content-Type': 'application/json'
})
request.body = data.to_json
SignalAdapter::Api.perform_request(request) do
# TODO: Do something on success. For example, mark the message as delivered?
# Or should we use deliver receipts as the source of truth.
Rails.logger.debug 'Great!'
response = Net::HTTP.start(url.host, url.port) do |http|
http.request(request)
end
response.value # may raise exception
rescue Net::HTTPClientException => e
ErrorNotifier.report(e, context: {
code: e.response.code,
message: e.response.message,
headers: e.response.to_hash,
body: e.response.body
})
end

def data
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
- postgres_data:/var/lib/postgresql/data

signal:
image: bbernhard/signal-cli-rest-api:0.119-dev
image: bbernhard/signal-cli-rest-api:0.67
environment:
- MODE=native
#- AUTO_RECEIVE_SCHEDULE=0 22 * * * #enable this parameter on demand (see description below)
Expand Down
46 changes: 0 additions & 46 deletions spec/adapters/signal_adapter/api_spec.rb

This file was deleted.

5 changes: 2 additions & 3 deletions spec/adapters/signal_adapter/outbound/file_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@
end

describe 'on error' do
let(:error_message) { 'User is not registered' }
before(:each) { stub_request(:post, 'http://signal:8080/v2/send').to_return(status: 400, body: { error: error_message }.to_json) }
before(:each) { stub_request(:post, 'http://signal:8080/v2/send').to_return(status: 400) }

it 'reports the error' do
expect(Sentry).to receive(:capture_exception).with(SignalAdapter::BadRequestError.new(error_code: 400, message: error_message))
expect(Sentry).to receive(:capture_exception).with(Net::HTTPClientException)

subject.call
end
Expand Down
5 changes: 2 additions & 3 deletions spec/adapters/signal_adapter/outbound/text_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@
end

describe 'on error' do
let(:error_message) { 'User is not registered' }
before(:each) { stub_request(:post, 'http://signal:8080/v2/send').to_return(status: 400, body: { error: error_message }.to_json) }
before(:each) { stub_request(:post, 'http://signal:8080/v2/send').to_return(status: 400) }

it 'reports the error' do
expect(Sentry).to receive(:capture_exception).with(SignalAdapter::BadRequestError.new(error_code: 400, message: error_message))
expect(Sentry).to receive(:capture_exception).with(Net::HTTPClientException)

subject.call
end
Expand Down

0 comments on commit e1a8a8e

Please sign in to comment.