From 9f2881323f3a9cbe061d3be1f06c7c8f43fe0f0d Mon Sep 17 00:00:00 2001 From: jesopo Date: Thu, 23 May 2019 10:39:24 +0100 Subject: Only show register/identify advice when we're using `internal` auth --- modules/permissions/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/permissions/__init__.py b/modules/permissions/__init__.py index 86770d05..c636a972 100644 --- a/modules/permissions/__init__.py +++ b/modules/permissions/__init__.py @@ -2,7 +2,8 @@ import base64, os import scrypt from src import ModuleManager, utils -REQUIRES_IDENTIFY = ("You need to be identified to use that command " +REQUIRES_IDENTIFY = "You need to be identified to use that command" +REQUIRES_IDENTIFY_INTERNAL = ("You need to be identified to use that command " "(/msg %s register | /msg %s identify)") @utils.export("serverset", {"setting": "identity-mechanism", @@ -221,8 +222,11 @@ class Module(ModuleManager.BaseModule): return utils.consts.PERMISSION_FORCE_SUCCESS elif authenticated: if not identified_account: - return REQUIRES_IDENTIFY % (event["server"].nickname, - event["server"].nickname) + if identity_mechanism == "internal": + return REQUIRES_IDENTIFY_INTERNAL % ( + event["server"].nickname, event["server"].nickname) + else: + return REQUIRES_IDENTIFY else: return utils.consts.PERMISSION_FORCE_SUCCESS -- cgit v1.3.1-10-gc9f91