github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 20:01:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: adds back recurring to send_message automation (#18990)

Browse Source 
Also uses new way to get channel title
This commit is contained in:
Joffrey JAFFEUX
2022-11-11 15:58:05 +01:00
committed by GitHub
parent f8939bd294
commit a578bc2f5f
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/chat/app/models/chat_channel.rb
View File

@ -83,10 +83,6 @@ class ChatChannel < ActiveRecord::Base
"/chat/channel/#{self.id}/#{self.slug || "-"}" "/chat/channel/#{self.id}/#{self.slug || "-"}"
end end
def public_channel_title
chatable.name
end
private private
def change_status(acting_user, target_status) def change_status(acting_user, target_status)

6
plugins/chat/plugin.rb
View File

@ -675,13 +675,13 @@ after_initialize do
placeholder :channel_name placeholder :channel_name
triggerables [:recurring]
script do |context, fields, automation| script do |context, fields, automation|
sender = User.find_by(username: fields.dig("sender", "value")) || Discourse.system_user sender = User.find_by(username: fields.dig("sender", "value")) || Discourse.system_user
channel = ChatChannel.find_by(id: fields.dig("chat_channel_id", "value")) channel = ChatChannel.find_by(id: fields.dig("chat_channel_id", "value"))
placeholders = { channel_name: channel.public_channel_title }.merge( placeholders = { channel_name: channel.title(sender) }.merge(context["placeholders"] || {})
context["placeholders"] || {},
)
creator = creator =
Chat::ChatMessageCreator.create( Chat::ChatMessageCreator.create(