Fix a panic when confirm email with no public name #4210
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sblaisot
approved these changes
Nov 9, 2023
taratatach
reviewed
Nov 9, 2023
Comment on lines
+205
to
+210
| publicName, _ := settings.M["public_name"].(string) | ||
| // if the public name is not defined, use the instance's domain | ||
| if publicName == "" { | ||
| split := strings.Split(inst.DomainName(), ".") | ||
| publicName = split[0] | ||
| } |
There was a problem hiding this comment.
This looks a lot like what the PublicName function does.
Suggested change
| publicName, _ := settings.M["public_name"].(string) | |
| // if the public name is not defined, use the instance's domain | |
| if publicName == "" { | |
| split := strings.Split(inst.DomainName(), ".") | |
| publicName = split[0] | |
| } | |
| publicName, err := s.PublicName(inst) | |
| if err != nil { | |
| return fmt.Errorf("failed to fetch the settings: %w", err) | |
| } |
There was a problem hiding this comment.
Yes, but PublicName makes a request to CouchDB to load the settings document and I would prefer to avoid that as we already have this document loaded.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.