Skip to content
Extraits de code Groupes Projets
Non vérifiée Valider 942e090b rédigé par Mahonri Gibson's avatar Mahonri Gibson Validation de Benjamin Neff
Parcourir les fichiers

Fix welcome message crashing server if podmin is set to invalid user.

Fixes #7363

closes #7452
parent 02b4d3f3
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -8,6 +8,7 @@
* Fix first comment in mobile view with french locale [#7441](https://github.com/diaspora/diaspora/pull/7441)
* Use post page title and post author in atom feed [#7420](https://github.com/diaspora/diaspora/pull/7420)
* Handle broken public keys when receiving posts [#7448](https://github.com/diaspora/diaspora/pull/7448)
* Fix welcome message when podmin is set to an invalid username [#7452](https://github.com/diaspora/diaspora/pull/7452)
## Features
......
......@@ -431,6 +431,7 @@ class User < ActiveRecord::Base
return unless AppConfig.settings.welcome_message.enabled? && AppConfig.admins.account?
sender_username = AppConfig.admins.account.get
sender = User.find_by(username: sender_username)
return if sender.nil?
conversation = sender.build_conversation(
participant_ids: [sender.person.id, person.id],
subject: AppConfig.settings.welcome_message.subject.get,
......
......@@ -875,6 +875,12 @@ describe User, :type => :model do
user.send_welcome_message
expect(user.conversations.count).to eq 0
end
it "should send no welcome message if podmin is invalid" do
AppConfig.admins.account = "invalid"
user.send_welcome_message
expect(user.conversations.count).to eq 0
end
end
context "with welcome message disabled" do
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter