fix: missing config changes

ishtanzar · May 21, 2024 · 7cb0f08 · 7cb0f08
1 parent 3d21afa
commit 7cb0f08
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/wm-infra/modules/main/ansible/roles/discordbot/templates/discordbot-config.tpl.json b/wm-infra/modules/main/ansible/roles/discordbot/templates/discordbot-config.tpl.json
@@ -10,6 +10,7 @@
   "intents": [],
   "taverns": [],
   "kanka": {
+    "campaign": 67312,
     "endpoint": "https://kanka.io/api/1.0/campaigns/67312",
     "gm_role": 195422,
     "player_role": 199680
@@ -34,7 +35,9 @@
     "downtime_notif_channel": 1050702617476612126,
     "character_sheet_channel": 996468375150669944,
     "character_sheet_notif_channel": 1167510633076490401,
-    "questions_channel": 911374861304234045
+    "questions_channel": 911374861304234045,
+    "roleplay_category": 996146013221949570,
+    "roleplay_notif_channel": 1215420007459192914
   },
   "sessions": {
     "session_notif_channel": 893175117012676618

diff --git a/wm-infra/modules/main/ansible/roles/westmarches/files/api-config.json b/wm-infra/modules/main/ansible/roles/westmarches/files/api-config.json
@@ -20,9 +20,9 @@
       "scopes": ["identify"]
     },
     "kanka": {
-      "endpoint": "https://kanka.io/oauth/authorize?client_id={client_id}&response_type=code&state={state}&redirect_uri={redirect_uri}",
-      "token_endpoint": "https://kanka.io/oauth/token",
-      "resource_owner_details": "https://kanka.io/api/1.0/profile",
+      "endpoint": "https://app.kanka.io/oauth/authorize?client_id={client_id}&response_type=code&state={state}&redirect_uri={redirect_uri}",
+      "token_endpoint": "https://app.kanka.io/oauth/token",
+      "resource_owner_details": "https://api.kanka.io/1.0/profile",
       "scopes": []
     }
   },

diff --git a/wm-infra/modules/main/ansible/roles/westmarches/files/worker-config.json b/wm-infra/modules/main/ansible/roles/westmarches/files/worker-config.json
@@ -3,7 +3,8 @@
     "endpoint": "https://app.kanka.io/w/67312",
     "api_endpoint": "https://api.kanka.io/1.0/campaigns/67312",
     "calendar_entity_id": 2156802,
-    "gm_role_id": 195422
+    "gm_role_id": 195422,
+    "campaign": 67312
   },
   "discord": {
     "kanka_notify_channel": 813731633177296906,
@@ -57,6 +58,7 @@
           "child.id",
           "child.mentions.id",
           "child.tags",
+          "child.type",
           "acls.users",
           "acls.roles"
         ]

diff --git a/wm-infra/modules/main/ansible/roles/westmarches/templates/docker-compose.tpl.yml b/wm-infra/modules/main/ansible/roles/westmarches/templates/docker-compose.tpl.yml
@@ -158,6 +158,7 @@ services:
     links:
       - redis
       - meilisearch
+      - foundry
     volumes:
       - "{{ westmarches_data_path }}/worker/config.json:/opt/worker/config.json"
       - "{{ westmarches_data_path }}/worker/cache:/var/cache/westmarches/worker"
@@ -190,4 +191,5 @@ services:
       - ADMIN_KEY={{ api_secret }}
       - API_ENDPOINT=https://{{ api_fqdn }}
       - PLAY_ENDPOINT=https://{{ foundry_fqdn }}
+      - SEARCH_ENDPOINT=http://meilisearch:7700
       - WEB_ROOT=https://{{ base_fqdn }}
diff --git a/wm-website/public/index.php b/wm-website/public/index.php
@@ -97,7 +97,8 @@
                 function ($index) use ($query) {
                     return (new SearchQuery())
                         ->setIndexUid($index)
-                        ->setQuery($query);
+                        ->setQuery($query)
+                        ->setLimit(5000);
                 }, $config->search_indices
             );