Merge pull request #107 from placeTW/more_meow

More meow
placeTW · Aug 18, 2024 · 8145e42 · 8145e42
2 parents e187402 + 943a59e
commit 8145e42
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/mentioned/mention_responses.py b/mentioned/mention_responses.py
@@ -13,6 +13,10 @@
     "<:101_Top:1132608896222113951>\n<:101_Floor:1132608196515725332>": 1,
     "<:PineappleCake:1156373382565212323>": 1,
     "<:twslipper:1156375845330485298>": 1,
+    "<:tw_amogus:1133361653908516885>": 1,
+    "<:meow_b:1249076752798449817>": 1,
+    "<:meow_o:1179052271175204894>": 1,
+    "<:meow_g:1179047382193807370>": 1,
     "喵": 1,
     "🧋": 1,
     # from Baltics server

diff --git a/resources/reacts/meow.json b/resources/reacts/meow.json
@@ -1,4 +1,3 @@
-
 {
   "criteria": [
     {
@@ -55,14 +54,22 @@
     },
     {
       "keywords": [
-        "mjäu",
-        "mjau",
+        "m(?:rr)?j(?:ä|a)u",
+        "kurrnj(?:ä|a)u",
         "ņau",
         "miau"
       ],
       "match_whole_word": true,
       "criteria_link": "baltic_meows"
     },
+    {
+      "keywords": [
+        "няв",
+        "мяв"
+      ],
+      "match_whole_word": true,
+      "criteria_link": "ua_meows"
+    },
     {
       "keywords": [
         "mňau"
@@ -98,7 +105,7 @@
   ],
   "possible_reactions": [
     {
-      "condition": "meow or traditional_cat or cat or zh_meows or jp_cat or jp_meows or baltic_meows or czech_meows or misc_meows",
+      "condition": "meow or traditional_cat or cat or zh_meows or jp_cat or jp_meows or baltic_meows or ua_meows or czech_meows or misc_meows",
       "chance": 0.25,
       "content": [
         "<a:catArrive:1161441364869918881>",
@@ -111,7 +118,7 @@
       ]
     },
     {
-      "condition": "from_meow_channel and not (meow or traditional_cat or cat or zh_meows or jp_cat or jp_meows or baltic_meows or czech_meows or misc_meows)",
+      "condition": "from_meow_channel and not (meow or traditional_cat or cat or zh_meows or jp_cat or jp_meows or baltic_meows or ua_meows or czech_meows or misc_meows)",
       "chance": 0.5,
       "content": [
         "<:ChisobCat:1157361078452375582>",
@@ -128,18 +135,18 @@
       "mention_author": "true"
     },
     {
-      "condition": "meow or traditional_cat or cat or zh_meows or jp_cat or jp_meows or baltic_meows or czech_meows or misc_meows",
+      "condition": "meow or traditional_cat or cat or zh_meows or jp_cat or jp_meows or baltic_meows or ua_meows or czech_meows or misc_meows",
       "chance": 0.169,
       "content": "喵",
       "random_multiplier": 5
     },
     {
-      "condition": "from_meow_channel and not (meow or traditional_cat or cat or zh_meows or jp_cat or jp_meows or baltic_meows or czech_meows or misc_meows)",
+      "condition": "from_meow_channel and not (meow or traditional_cat or cat or zh_meows or jp_cat or jp_meows or baltic_meows or ua_meows or czech_meows or misc_meows)",
       "chance": 0.1,
       "content": "<:dogekek:1132350110148333718>"
     },
     {
-      "condition": "from_meow_channel and not (meow or traditional_cat or cat or zh_meows or jp_cat or jp_meows or baltic_meows or czech_meows or misc_meows)",
+      "condition": "from_meow_channel and not (meow or traditional_cat or cat or zh_meows or jp_cat or jp_meows or baltic_meows or ua_meows or czech_meows or misc_meows)",
       "chance": 0.1,
       "content": "<:CapooDepressed:1198305961203486900>"
     },
@@ -155,6 +162,9 @@
         "<:KitKat:1261502778673725482>",
         "<:Capoo:1139357657698938991>",
         "<a:catArrive:1161441364869918881>",
+        "<:meow_b:1249076752798449817>",
+        "<:meow_o:1179052271175204894>",
+        "<:meow_g:1179047382193807370>",
         "喵",
         "貓",
         "瞄",