mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-13 14:30:17 +02:00
Merge pull request #107 from Adarnof/broadcast
Broadcast Plugin Support
This commit is contained in:
commit
7e6e5bbfb7
@ -302,6 +302,7 @@ OPENFIRE_ADDRESS = os.environ.get('AA_OPENFIRE_ADDRESS', "http://yourdomain.com:
|
||||
OPENFIRE_SECRET_KEY = os.environ.get('AA_OPENFIRE_SECRET_KEY', "somekey")
|
||||
BROADCAST_USER = os.environ.get('AA_BROADCAST_USER', "broadcast@") + JABBER_URL
|
||||
BROADCAST_USER_PASSWORD = os.environ.get('AA_BROADCAST_USER_PASSWORD', "somepassword")
|
||||
BROADCAST_SERVICE_NAME = os.environ.get('AA_BROADCAST_SERVICE_NAME', "broadcast")
|
||||
|
||||
######################################
|
||||
# Mumble Configuration
|
||||
|
@ -103,27 +103,11 @@ class OpenfireManager:
|
||||
client.connect(server=(settings.JABBER_SERVER, settings.JABBER_PORT))
|
||||
client.auth(settings.BROADCAST_USER, settings.BROADCAST_USER_PASSWORD, 'broadcast')
|
||||
|
||||
if group_name != 'all':
|
||||
group = Group.objects.get(name=group_name)
|
||||
for user in group.user_set.all():
|
||||
auth_info = AuthServicesInfoManager.get_auth_service_info(user)
|
||||
if auth_info:
|
||||
if auth_info.jabber_username != "":
|
||||
to_address = auth_info.jabber_username + '@' + settings.JABBER_URL
|
||||
message = xmpp.Message(to_address, broadcast_message)
|
||||
message.setAttr('type', 'chat')
|
||||
client.send(message)
|
||||
client.Process(1)
|
||||
else:
|
||||
for user in User.objects.all():
|
||||
auth_info = AuthServicesInfoManager.get_auth_service_info(user)
|
||||
if auth_info:
|
||||
if auth_info.jabber_username != "":
|
||||
to_address = auth_info.jabber_username + '@' + settings.JABBER_URL
|
||||
message = xmpp.Message(to_address, broadcast_message)
|
||||
message.setAttr('type', 'chat')
|
||||
client.send(message)
|
||||
client.Process(1)
|
||||
to_address = group_name + '@' + settings.BROADCAST_SERVICE_NAME + '.' + settings.JABBER_URL
|
||||
message = xmpp.Message(to_address, broadcast_message)
|
||||
message.setAttr('type', 'chat')
|
||||
client.send(message)
|
||||
client.Process(1)
|
||||
|
||||
client.disconnect()
|
||||
|
||||
@ -138,4 +122,4 @@ class XmppThread (threading.Thread):
|
||||
def run(self):
|
||||
print "Starting " + self.name
|
||||
OpenfireManager.send_broadcast_message(self.group, self.message)
|
||||
print "Exiting " + self.name
|
||||
print "Exiting " + self.name
|
||||
|
Loading…
x
Reference in New Issue
Block a user