FIX: adds back recurring to send_message automation (#18990)
Also uses new way to get channel title
This commit is contained in:
parent
f8939bd294
commit
a578bc2f5f
|
@ -83,10 +83,6 @@ class ChatChannel < ActiveRecord::Base
|
|||
"/chat/channel/#{self.id}/#{self.slug || "-"}"
|
||||
end
|
||||
|
||||
def public_channel_title
|
||||
chatable.name
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def change_status(acting_user, target_status)
|
||||
|
|
|
@ -675,13 +675,13 @@ after_initialize do
|
|||
|
||||
placeholder :channel_name
|
||||
|
||||
triggerables [:recurring]
|
||||
|
||||
script do |context, fields, automation|
|
||||
sender = User.find_by(username: fields.dig("sender", "value")) || Discourse.system_user
|
||||
channel = ChatChannel.find_by(id: fields.dig("chat_channel_id", "value"))
|
||||
|
||||
placeholders = { channel_name: channel.public_channel_title }.merge(
|
||||
context["placeholders"] || {},
|
||||
)
|
||||
placeholders = { channel_name: channel.title(sender) }.merge(context["placeholders"] || {})
|
||||
|
||||
creator =
|
||||
Chat::ChatMessageCreator.create(
|
||||
|
|
Loading…
Reference in New Issue