Merge branch 'release/v0.8.13'

.gitignore

@@ -107,3 +107,5 @@ docker-compose.yml
 mainframe.ini
 
 *.plist
+*.rdb
+.idea/

api/views/user.py

@@ -42,7 +42,7 @@ def list(request, validated=[], *args, **kwargs):
                                                     default=F('punishment__is_gagged'),
                                                     output_field=BooleanField()),
                                      name=F('namespace'), is_internal=F('is_active'))\
-                           .filter(username__contains=validated['match'])
+                           .filter(username__contains=validated['match']).distinct()
 
     if validated['internal']:
       selected = selected.filter(is_internal=validated['internal'])
@@ -192,7 +192,7 @@ def detailed(request, u=None, s=None, validated={}, *args, **kwargs):
               'permissions': [a.content_type.app_label + '.' + a.codename for a in user.user_permissions.all()],
               'groups': [str(a) for a in user.groups.all()],
               'roles': [],
-              'has_panel_access': user.is_active,
+              'is_internal': user.is_active,
               'country': None if user.country is None else user.country.code
               }
 
@@ -357,7 +357,7 @@ def detailed(request, u=None, s=None, validated={}, *args, **kwargs):
         m = Membership.objects.get(user=user, role=validated['role'])
         m.delete()
 
-      for role in validated['role']:
+      for role in validated['roles']:
         m = Membership.objects.get(user=user, role=role)
         m.delete()
 

core/models.py

@@ -222,6 +222,8 @@ def __str__(self):
 
 class Server(BaseModel):
   name = models.CharField(max_length=255)
+  slug = models.SlugField()
+
   ip = models.GenericIPAddressField()
   port = models.IntegerField()
   password = models.CharField(max_length=255)

core/signals.py

@@ -3,7 +3,8 @@
 from django.utils import timezone
 from core.lib.steam import populate
 import logging
-from core.models import User
+from core.models import User, Server
+from django.template.defaultfilters import slugify
 
 
 logger = logging.getLogger(__name__)
@@ -81,3 +82,16 @@ def user_log_handler(sender, instance, raw, using, update_fields, **kwargs):
 
   if iplog:
     ip.save()
+
+
+@receiver(pre_save, sender=Server, weak=False)
+def server_slug_handler(sender, instance, raw, using, update_fields, **kwargs):
+  try:
+    state = Server.objects.get(id=instance.id)
+  except Server.DoesNotExist:
+    state = None
+
+  if state and state.name == instance.name:
+    return
+
+  instance.slug = slugify(instance.name)[:50]

interface/static/js/api.create.coffee

@@ -64,7 +64,7 @@ submit = (mode = '', that) ->
       if server != 'all'
         data.server = server
 
-      window.endpoint.api.users[user].punishment.put(o, {}, data, (err, data) ->
+      window.endpoint.api.users[user].punishments.put(o, {}, data, (err, data) ->
         window.ajax.ban.user(1)
       )
 
@@ -114,7 +114,7 @@ submit = (mode = '', that) ->
       if server != 'all'
         data.server = server
 
-      window.endpoint.api.users[user].punishment.put(o, {}, data, (err, data) ->
+      window.endpoint.api.users[user].punishments.put(o, {}, data, (err, data) ->
         window.ajax.mutegag.user(1)
         return data
       )
@@ -125,7 +125,7 @@ submit = (mode = '', that) ->
         server: $('input.server', node)[0].value
         kicked: true
 
-      window.endpoint.api.users[user].punishment.put(o, {}, data, (err, data) ->
+      window.endpoint.api.users[user].punishments.put(o, {}, data, (err, data) ->
         window.ajax.player.user(1)
         return data
       )

interface/static/js/api.delete.coffee

@@ -14,7 +14,6 @@ remove = (mode = '', that) ->
       role = $('input.role', node)[0].value
 
       payload =
-        reset: true
         role: role
 
       endpoint = window.endpoint.api.users[user]
@@ -27,12 +26,12 @@ remove = (mode = '', that) ->
       server = $('input.server', node)[0].value
       punishment = $('input.punishment', node)[0].value
 
-      endpoint = window.endpoint.api.users[user].punishment[punishment]
+      endpoint = window.endpoint.api.users[user].punishments[punishment]
     when 'mutegag'
       user = $('input.user', node)[0].value
       punishment = $('input.punishment', node)[0].value
 
-      endpoint = window.endpoint.api.users[user].punishment[punishment]
+      endpoint = window.endpoint.api.users[user].punishments[punishment]
     when 'server'
       node = that.parentElement.parentElement.parentElement.parentElement
       server = $('input.uuid', node)[0].value

interface/static/js/api.edit.coffee

@@ -110,7 +110,7 @@ save = (mode = '', that) ->
         if type.match /gag/
           payload.gagged = true
 
-      window.endpoint.api.users[user].punishment[punishment].post(o, {}, payload, (err, data) ->)
+      window.endpoint.api.users[user].punishments[punishment].post(o, {}, payload, (err, data) ->)
 
     when 'server'
       node = node.parentElement

lib/base.py

@@ -55,6 +55,8 @@ def run(self, command):
       pass
     except RCONTimeoutError:
       pass
+    except Exception:
+      pass
     finally:
       self.close()
 

sourcemod/addons/sourcemod/scripting/hawthorne/player.sp

@@ -1,7 +1,7 @@
 public void OnClientAuthorized(int client) {
   CLIENTS[client] = "";
 
-  if (StrEqual(SERVER, "") || IsFakeClient(client)) return;
+  if (StrEqual(SERVER, "") || IsFakeClient(client) || client < 1) return;
 
   char steamid[20];
   GetClientAuthId(client, AuthId_SteamID64, steamid, sizeof(steamid));

sourcemod/addons/sourcemod/scripting/hawthorne/server.sp

@@ -33,7 +33,7 @@ void GetServerUUID() {
   httpClient.Get(url, APIGetServerUUID);
 }
 
-public void APIGetServerUUID(HTTPResponse response, any value) {
+void APIGetServerUUID(HTTPResponse response, any value) {
   if (!APIValidator(response)) return;
 
   JSONObject output = view_as<JSONObject>(response.Data);