kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Lint

Browse Source
This commit is contained in:
Brendan Abolivier
2019-08-01 12:11:27 +02:00
parent cd47482257
commit 359aed4168
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sample_config.yaml
View File

@@ -800,7 +800,7 @@ uploads_path: "DATADIR/uploads"
# # Directory in which Synapse will try to find the HTML files to serve to the
# # user when trying to renew an account. Optional, defaults to
# # synapse/res/templates.
# template_dir: "res/templates"
# template_dir: "res/templates"
# # HTML to be displayed to the user after they successfully renewed their
# # account. Optional.
# account_renewed_html_path: "account_renewed.html"

19
synapse/config/registration.py
View File

@@ -14,10 +14,10 @@
# limitations under the License.
import os
import pkg_resources
from distutils.util import strtobool
import pkg_resources
from synapse.config._base import Config, ConfigError
from synapse.types import RoomAlias
from synapse.util.stringutils import random_string_with_symbols
@@ -54,13 +54,10 @@ class AccountValidityConfig(Config):
template_dir = pkg_resources.resource_filename("synapse", "res/templates")
if "account_renewed_html_path" in config:
file_path = os.path.join(
template_dir, config["account_renewed_html_path"],
)
file_path = os.path.join(template_dir, config["account_renewed_html_path"])
self.account_renewed_html_content = self.read_file(
file_path,
"account_validity.account_renewed_html_path",
file_path, "account_validity.account_renewed_html_path"
)
else:
self.account_renewed_html_content = (
@@ -68,12 +65,10 @@ class AccountValidityConfig(Config):
)
if "invalid_token_html_path" in config:
file_path = os.path.join(
template_dir, config["invalid_token_html_path"],
)
file_path = os.path.join(template_dir, config["invalid_token_html_path"])
self.invalid_token_html_content = self.read_file(
file_path, "account_validity.invalid_token_html_path",
file_path, "account_validity.invalid_token_html_path"
)
else:
self.invalid_token_html_content = (
@@ -200,7 +195,7 @@ class RegistrationConfig(Config):
# # Directory in which Synapse will try to find the HTML files to serve to the
# # user when trying to renew an account. Optional, defaults to
# # synapse/res/templates.
# template_dir: "res/templates"
# template_dir: "res/templates"
# # HTML to be displayed to the user after they successfully renewed their
# # account. Optional.
# account_renewed_html_path: "account_renewed.html"

2
synapse/rest/client/v2_alpha/account_validity.py
View File

@@ -50,7 +50,7 @@ class AccountValidityRenewServlet(RestServlet):
renewal_token = request.args[b"token"][0]
token_valid = yield self.account_activity_handler.renew_account(
renewal_token.decode("utf8"),
renewal_token.decode("utf8")
)
if token_valid: