Fix some config issues

config.py

@@ -133,6 +133,9 @@ def match_icon(name):

                                
                                
                                
                            
                                
                                    
                                        
                                            133  
                                                    return "simple-icons:git"
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            134  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            135  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        136 +
                                        www_protocol = f"http{'s' if suggest_https else ''}"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        137 +
                                        url_prefix = f"{www_protocol}://{BASE_DOMAIN}" + (f":{port}" if port not in {80, 443} else "")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        138 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            139  
                                            footer = f"""
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            140  
                                            <x-hbox>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            141  
                                                <a href="/help">Help</a>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -154,23 +157,19 @@ footer = f"""

                                
                                
                                
                            
                                
                                    
                                        
                                            157  
                                            </p>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            158  
                                            """
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            159  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        157 -
                                        mail_footer = """
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        160 +
                                        mail_footer = f"""
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            161  
                                            <small>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        159 -
                                            For any inquiries, write to <a href="mailto:{{ config.CONTACT_EMAIL }}"></a><br>. To adjust your email
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        162 +
                                            For any inquiries, write to <a href="mailto:{CONTACT_EMAIL}"></a><br>. To adjust your email
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            163  
                                                notification preferences, log in to your account in a browser and visit
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        161 -
                                            <a href="{{ config.web_protocol }}://{{ config.BASE_DOMAIN }}/settings">your user settings</a>.
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        164 +
                                            <a href="{www_protocol}://{BASE_DOMAIN}/settings">your user settings</a>.
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            165  
                                            </small>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            166  
                                            """
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            167  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        165 -
                                        mail_header = """
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        166 -
                                        <img src="{{ config.web_protocol }}://{{ config.BASE_DOMAIN }}/static/logo.svg" width="48">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        168 +
                                        mail_header = f"""
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            169  
                                            """
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            170  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        169 -
                                        mail_footer_plain = """
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        170 -
                                        For any inquiries, write to <{{ config.CONTACT_EMAIL }}>.
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        171 +
                                        mail_footer_plain = f"""
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        172 +
                                        For any inquiries, write to <{CONTACT_EMAIL}>.
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            173  
                                            To adjust your email notification preferences, log in to your account in a browser and visit your user settings at
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        172 -
                                        <{{ config.web_protocol }}://{{ config.BASE_DOMAIN }}/settings>.
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        174 +
                                        <{www_protocol}://{BASE_DOMAIN}/settings>.
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            175  
                                            """
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        174 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        175 -
                                        www_protocol = f"http{'s' if suggest_https else ''}"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        176 -
                                        url_prefix = f"{www_protocol}://{BASE_DOMAIN}" + (f":{port}" if port not in {80, 443} else "")