From 436d8d5c8f808b4f5c4a20428b8548da074153f3 Mon Sep 17 00:00:00 2001
From: Teal <git@teal.is>
Date: Mon, 27 May 2024 16:49:04 +0200
Subject: [PATCH] durrrr
---
app/subscribers/telegram_bot_subscriber.rb | 4 ++--
config/environments/development.rb | 3 +++
config/environments/production.rb | 4 +++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/app/subscribers/telegram_bot_subscriber.rb b/app/subscribers/telegram_bot_subscriber.rb
index 9d7d558..5fc4c35 100644
--- a/app/subscribers/telegram_bot_subscriber.rb
+++ b/app/subscribers/telegram_bot_subscriber.rb
@@ -25,7 +25,7 @@ class TelegramBotSubscriber
changes.delete("stage_id")
end
- message = "<b><a href=\"#{conference_session_url(record.conference, record)}\">Session #{record.title}</a> #{action}</b>\n" +
+ message = "<b><a href=\"#{conference_session_url(record.conference, record, host: 'rescheduled.c3lingo.org', protocol: 'https')}\">Session #{record.title}</a> #{action}</b>\n" +
changes.map { |attr, (from, to)| "- #{attr}: #{from} -> #{to}" }.join("\n") + "\n#{conference_session_url(record.conference, record)}"
TelegramGroupChatNotificationJob.perform_later(target: "-316096320", text: message, parse_mode: 'HTML')
@@ -38,7 +38,7 @@ class TelegramBotSubscriber
record = event.payload[:record]
session = record.session
- message = "<b><a href=\"#{conference_session_url(session.conference, session)}\">Session #{session.title}</a> Speaker Change</b>\n" +
+ message = "<b><a href=\"#{conference_session_url(session.conference, session, host: 'rescheduled.c3lingo.org', protocol: 'https')}\">Session #{session.title}</a> Speaker Change</b>\n" +
"#{record.speaker.name} #{action == 'destroyed' ? 'removed' : 'added'}" + "\n#{conference_session_url(session.conference, session)}"
TelegramGroupChatNotificationJob.perform_later(target: "-316096320", text: message, parse_mode: 'HTML')
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 2e7fb48..d27cc5b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -74,3 +74,6 @@ Rails.application.configure do
# Raise error when a before_action's only/except options reference missing actions
config.action_controller.raise_on_missing_callback_actions = true
end
+
+Rails.application.routes.default_url_options[:host] = '127.0.0.1'
+Rails.application.routes.default_url_options[:protocol] = 'http'
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 08bf92a..fa203f7 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -96,4 +96,6 @@ Rails.application.configure do
# config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
end
-Rails.application.routes.default_url_options.merge({ host: 'rescheduled.c3lingo.org', protocol: 'https' })
+# Rails.application.routes.default_url_options.merge({ host: 'rescheduled.c3lingo.org', protocol: 'https' })
+Rails.application.routes.default_url_options[:host] = 'rescheduled.c3lingo.org'
+Rails.application.routes.default_url_options[:protocol] = 'https'
--
GitLab