maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use APP_NAME rather than APP_DOMAIN in chat channels (#11029)

Browse source 
* Use APP_NAME rather than APP_DOMAIN in chat channels

APP_NAME may not always be set (it is not "required" per se), which can
cause issues while deriving the pusher_channels. We should use APP_DOMAIN,
which is more common and always has a default value.

* Add TODO to make pusher channels more unique
This commit is contained in:
Vaidehi Joshi 2020-10-22 16:22:19 -07:00 • committed by GitHub
parent 2d75d6d5ea
commit 429d9fb947
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env_sample
View file

@ -4,7 +4,6 @@ export SKIP_SERVICEWORKERS="true"
# App core values
export APP_DOMAIN="localhost:3000"
export APP_PROTOCOL="http://"
export APP_NAME="forem_local"
export FOREM_OWNER_SECRET="secret"
# Openresty domain + Protocol setting for development

7
app/models/chat_channel.rb
View file

@ -112,10 +112,11 @@ class ChatChannel < ApplicationRecord
end
def pusher_channels
# TODO: use something more unique here (uuid?) rather than just id.
if invite_only?
"private-channel--#{ApplicationConfig['APP_NAME']}-#{id}"
"private-channel--#{ApplicationConfig['APP_DOMAIN']}-#{id}"
elsif open?
"open-channel--#{ApplicationConfig['APP_NAME']}-#{id}"
"open-channel--#{ApplicationConfig['APP_DOMAIN']}-#{id}"
else
chat_channel_memberships.pluck(:user_id).map { |id| ChatChannel.pm_notifications_channel(id) }
end
@ -165,7 +166,7 @@ class ChatChannel < ApplicationRecord
end
def self.pm_notifications_channel(user_id)
"private-message-notifications--#{ApplicationConfig['APP_NAME']}-#{user_id}"
"private-message-notifications--#{ApplicationConfig['APP_DOMAIN']}-#{user_id}"
end
private

2
app/views/shell/_top.html.erb
View file

@ -58,7 +58,7 @@
data-user-status="<%= user_logged_in_status %>"
class="<%= SiteConfig.default_font.tr("_", "-") %>-article-body default-header"
data-pusher-key="<%= ApplicationConfig["PUSHER_KEY"] %>"
data-app-name="<%= ApplicationConfig["APP_NAME"] %>"
data-app-name="<%= ApplicationConfig["APP_DOMAIN"] %>"
data-honeybadger-key="<%= ApplicationConfig["HONEYBADGER_JS_API_KEY"] %>"
data-release-footprint="<%= ApplicationConfig["RELEASE_FOOTPRINT"] %>"
data-ga-tracking="<%= SiteConfig.ga_tracking_id %>">