Skip to content

A platform for community discussion. Free, open, simple.

DEV: Fix some services raising in model steps

Loïc Guitautaf32b319396c
diff --git a/app/services/nested_topic/toggle_pin.rb b/app/services/nested_topic/toggle_pin.rb
index 28556f1c5ef..ff104c2819f 100644
--- a/app/services/nested_topic/toggle_pin.rb
+++ b/app/services/nested_topic/toggle_pin.rb
@@ -38,7 +38,7 @@ class NestedTopic::TogglePin
end
def find_or_create_nested_topic(topic:)
- topic.nested_topic || NestedTopic.find_or_create_by!(topic: topic)
+ topic.nested_topic || NestedTopic.find_or_create_by(topic:)
end
def within_pin_limit(nested_topic:, post:)
diff --git a/app/services/user/action/create_from_verified_email.rb b/app/services/user/action/create_from_verified_email.rb
index 179faeb16d5..5f5ca9f082d 100644
--- a/app/services/user/action/create_from_verified_email.rb
+++ b/app/services/user/action/create_from_verified_email.rb
@@ -36,8 +36,7 @@ class User::Action::CreateFromVerifiedEmail < Service::ActionBase
ReviewableUser.set_approved_fields!(user, Discourse.system_user)
end
- user.save!
- user
+ user.tap(&:save)
end
private
diff --git a/plugins/discourse-ai/app/services/discourse_ai/ai_helper/generate_thumbnails.rb b/plugins/discourse-ai/app/services/discourse_ai/ai_helper/generate_thumbnails.rb
index 870fbf25a74..edade295bc0 100644
--- a/plugins/discourse-ai/app/services/discourse_ai/ai_helper/generate_thumbnails.rb
+++ b/plugins/discourse-ai/app/services/discourse_ai/ai_helper/generate_thumbnails.rb
@@ -31,11 +31,8 @@ module DiscourseAi
end
def fetch_llm_model(agent:)
- model =
- LlmModel.find_by(id: agent.default_llm_id) ||
- LlmModel.find_by(id: SiteSetting.ai_default_llm_model)
- fail!("llm_model_not_configured") if model.nil?
- model
+ LlmModel.find_by(id: agent.default_llm_id) ||
+ LlmModel.find_by(id: SiteSetting.ai_default_llm_model)
end
def generate_images(agent:, llm_model:, params:, guardian:)
diff --git a/plugins/discourse-solved/app/services/discourse_solved/accept_answer.rb b/plugins/discourse-solved/app/services/discourse_solved/accept_answer.rb
index 80b18879eeb..798db893b78 100644
--- a/plugins/discourse-solved/app/services/discourse_solved/accept_answer.rb
+++ b/plugins/discourse-solved/app/services/discourse_solved/accept_answer.rb
@@ -202,10 +202,10 @@ class DiscourseSolved::AcceptAnswer
end
def find_or_create_solved_topic(topic:)
- DiscourseSolved::SolvedTopic.find_or_create_by!(topic:)
+ DiscourseSolved::SolvedTopic.find_or_create_by(topic:)
end
def create_topic_answer(solved_topic:, post:, guardian:)
- DiscourseSolved::TopicAnswer.create!(solved_topic:, post:, accepter: guardian.user)
+ DiscourseSolved::TopicAnswer.create(solved_topic:, post:, accepter: guardian.user)
end
end
diff --git a/plugins/discourse-topic-voting/app/services/discourse_topic_voting/votes/cast.rb b/plugins/discourse-topic-voting/app/services/discourse_topic_voting/votes/cast.rb
index e4f09287d9e..52e8befccd2 100644
--- a/plugins/discourse-topic-voting/app/services/discourse_topic_voting/votes/cast.rb
+++ b/plugins/discourse-topic-voting/app/services/discourse_topic_voting/votes/cast.rb
@@ -50,7 +50,7 @@ module DiscourseTopicVoting
end
def create_vote(guardian:, topic:)
- DiscourseTopicVoting::Vote.create!(user: guardian.user, topic: topic)
+ DiscourseTopicVoting::Vote.create(user: guardian.user, topic: topic)
end
def refresh_vote_count(topic:)