mirror of
https://github.com/nikdoof/test-auth.git
synced 2025-12-15 15:22:17 +00:00
Mumble service now provides a full alliance/corp/name tag
This commit is contained in:
@@ -6,8 +6,8 @@ class MumbleService(BaseService):
|
|||||||
settings = { 'require_user': True,
|
settings = { 'require_user': True,
|
||||||
'require_password': True,
|
'require_password': True,
|
||||||
'provide_login': False,
|
'provide_login': False,
|
||||||
'use_corptag': True,
|
'mumble_server_id': 1
|
||||||
'mumble_server_id': 1 }
|
'name_format': r'%(alliance}s | %(corporation)s | %(name)s' }
|
||||||
|
|
||||||
def _get_server(self):
|
def _get_server(self):
|
||||||
return Mumble.objects.get(id=self.settings['mumble_server_id'])
|
return Mumble.objects.get(id=self.settings['mumble_server_id'])
|
||||||
@@ -15,15 +15,11 @@ class MumbleService(BaseService):
|
|||||||
def add_user(self, username, password, **kwargs):
|
def add_user(self, username, password, **kwargs):
|
||||||
""" Add a user, returns a UID for that user """
|
""" Add a user, returns a UID for that user """
|
||||||
|
|
||||||
if 'character' in kwargs and self.settings['use_corptag']:
|
details = { 'name': username,
|
||||||
if kwargs['character'].corporation:
|
'alliance': kwargs['character'].corporation.alliance.ticker,
|
||||||
if kwargs['character'].corporation.alliance:
|
'corporation': kwargs['character'].corporation.ticker }
|
||||||
tag = kwargs['character'].corporation.alliance.ticker
|
|
||||||
else:
|
|
||||||
tag = kwargs['character'].corporation.ticker
|
|
||||||
|
|
||||||
if tag:
|
username = self.settings['name_format'] % details
|
||||||
username = "[%s]%s" % (tag, username)
|
|
||||||
|
|
||||||
return self.raw_add_user(username, password)
|
return self.raw_add_user(username, password)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user