Stats: allow manual ID override

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / matrix / matrix.qc

diff --git a/qcsrc/lib/matrix/matrix.qc b/qcsrc/lib/matrix/matrix.qc
index a5ae3dc981a59e17dad6bc71d3ec974988c6ca5e..c399c2aa6cf86e2d9a9ba910667c8cd1c926ba43 100644 (file)
--- a/qcsrc/lib/matrix/matrix.qc
+++ b/qcsrc/lib/matrix/matrix.qc
@@ -5,6 +5,7 @@
 void MX_Nick_(entity fh, entity pass, int status);
 void MX_Nick(string name)
 {
+    if (!matrix_access_token) return;
     entity pass = new_pure(mx);
     pass.message = name;
     url_single_fopen(
@@ -21,7 +22,7 @@ void MX_Nick_(entity fh, entity pass, int status)
             fh.url_verb = "PUT";
             fh.url_content_type = "application/json";
             url_fputs(fh, sprintf("{\"displayname\": \"%s\"}", pass.message));
-            remove(pass);
+            delete(pass);
             url_fclose(fh);
             break;
         }
@@ -32,6 +33,7 @@ void MX_Nick_(entity fh, entity pass, int status)
 void MX_Messages_(entity fh, entity pass, int status);
 void MX_Messages(string from)
 {
+    if (!matrix_access_token) return;
     string s = sprintf("%s/_matrix/client/r0/events?room_id=%s&limit=50&timeout=30000&from=%s&access_token=%s", autocvar_matrix_server, matrix_room, from, matrix_access_token);
     url_single_fopen(
         s,
@@ -44,7 +46,7 @@ void MX_Messages_(entity fh, entity pass, int status)
 {
     switch (status) {
         default: {
-            LOG_WARNINGF("status: %d", status);
+            LOG_WARNF("status: %d", status);
             break;
         }
         case URL_READY_CLOSED: break;
@@ -67,6 +69,7 @@ void MX_Messages_(entity fh, entity pass, int status)
 void MX_Sync_(entity fh, entity pass, int status);
 void MX_Sync(string since)
 {
+    if (!matrix_access_token) return;
     string s = strcat(autocvar_matrix_server, "/_matrix/client/r0/sync?");
     if (since) {
         s = strcat(s,
@@ -87,7 +90,7 @@ void MX_Sync_(entity fh, entity pass, int status)
 {
     switch (status) {
         default: {
-            LOG_WARNINGF("status: %d", status);
+            LOG_WARNF("status: %d", status);
             break;
         }
         case URL_READY_CLOSED: break;
@@ -111,6 +114,7 @@ void MX_Sync_(entity fh, entity pass, int status)
 void MX_JLF_(entity fh, entity pass, int status);
 void MX_Join(string room)
 {
+    if (!matrix_access_token) return;
     url_single_fopen(
         sprintf("%s/_matrix/client/r0/rooms/%s/join?access_token=%s", autocvar_matrix_server, matrix_room, matrix_access_token),
         FILE_WRITE,
@@ -120,6 +124,7 @@ void MX_Join(string room)
 }
 void MX_Leave(string room)
 {
+    if (!matrix_access_token) return;
     url_single_fopen(
         sprintf("%s/_matrix/client/r0/rooms/%s/leave?access_token=%s", autocvar_matrix_server, matrix_room, matrix_access_token),
         FILE_WRITE,
@@ -129,6 +134,7 @@ void MX_Leave(string room)
 }
 void MX_Forget(string room)
 {
+    if (!matrix_access_token) return;
     url_single_fopen(
         sprintf("%s/_matrix/client/r0/rooms/%s/forget?access_token=%s", autocvar_matrix_server, matrix_room, matrix_access_token),
         FILE_WRITE,
@@ -152,6 +158,7 @@ void MX_JLF_(entity fh, entity pass, int status)
 void MX_Typing_(entity fh, entity pass, int status);
 void MX_Typing(bool state)
 {
+    if (!matrix_access_token) return;
     entity pass = new_pure(mx);
     pass.message = state ? "true" : "false";
     url_single_fopen(
@@ -168,7 +175,7 @@ void MX_Typing_(entity fh, entity pass, int status)
             fh.url_verb = "PUT";
             fh.url_content_type = "application/json";
             url_fputs(fh, sprintf("{\"typing\": %s, \"timeout\": 30000}", pass.message));
-            remove(pass);
+            delete(pass);
             url_fclose(fh);
             break;
         }
@@ -179,6 +186,7 @@ void MX_Typing_(entity fh, entity pass, int status)
 void MX_Say_(entity fh, entity pass, int status);
 void MX_Say(string body)
 {
+    if (!matrix_access_token) return;
     static int txnid;
     entity pass = new_pure(mx);
     pass.message = strzone(body);
@@ -196,7 +204,7 @@ void MX_Say_(entity fh, entity pass, int status)
             fh.url_verb = "PUT";
             fh.url_content_type = "application/json";
             url_fputs(fh, sprintf("{\"msgtype\": \"m.text\", \"body\": \"%s\"}", pass.message));
-            strunzone(pass.message); remove(pass);
+            strunzone(pass.message); delete(pass);
             url_fclose(fh);
             break;
         }