Hashtags for categories

bostrot · Mar 3, 2023 · a41de60 · a41de60
1 parent 3439ff2
commit a41de60
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/config/config-sample.yaml b/config/config-sample.yaml
@@ -108,6 +108,7 @@ autoreply:
 #  - name: "Admin Chat"
 #    group_id: "-12345678910"
 #  - name: "Other issues"
+#    tag: "#other"
 #    msg: "Please specify your order number and describe the problem in as much detail as possible"
 #    group_id: "-12345678910"
 #  - name: "Contact"

diff --git a/src/addons/telegram.ts b/src/addons/telegram.ts
@@ -89,6 +89,7 @@ class TelegramAddon {
         modeData: {} as any,
         mode: null,
         groupCategory: null,
+        groupTag: '',
         group: '',
         groupAdmin: {} as any,
         getSessionKey: (ctx: Context) => {

diff --git a/src/inline.ts b/src/inline.ts
@@ -68,6 +68,7 @@ function initInline(bot: TelegramAddon) {
             );
           }
           ctx.session.group = cache.config.categories[i].group_id;
+          ctx.session.groupTag = cache.config.categories[i].tag || '';
           ctx.session.groupCategory = cache.config.categories[i].name;
         });
         // Create subcategory button events
@@ -87,6 +88,7 @@ function initInline(bot: TelegramAddon) {
             );
           }
           ctx.session.group = cache.config.categories[i].group_id;
+          ctx.session.groupTag = cache.config.categories[i].tag || '';
           ctx.session.groupCategory = cache.config.categories[i].name;
         });
         continue;

diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -12,6 +12,7 @@ interface SessionData {
   mode: string | null;
   modeData: ModeData;
   groupCategory: string | null;
+  groupTag: string;
   group: string;
   groupAdmin: any;
   getSessionKey: Function;
@@ -72,6 +73,7 @@ interface Language {
 interface Category {
   name: string;
   msg: string;
+  tag: string;
   group_id: string;
   subgroups: {
     name: string;

diff --git a/src/users.ts b/src/users.ts
@@ -16,6 +16,7 @@ function ticketMsg(
     from: { first_name: string | any[]; language_code: any };
     text: string | any[];
   },
+  tag: string,
   anon = true,
   autoReplyInfo: any,
 ) {
@@ -29,7 +30,7 @@ function ticketMsg(
     `#T${ticket.toString().padStart(6, '0')} ${cache.config.language.from} ` +
     `[${esc(message.from.first_name)}](${link})` +
     ` ${cache.config.language.language}: ` +
-    `${message.from.language_code}\n\n` +
+    `${message.from.language_code} ${tag}\n\n` +
     `${esc(message.text)}\n\n` +
     (autoReplyInfo ? `_${autoReplyInfo}_` : '')
   );
@@ -109,6 +110,7 @@ function chat(ctx: Context, chat: { id: string }) {
           ticketMsg(
             ticket.id,
             ctx.message,
+            ctx.session.groupTag,
             cache.config.anonymous_tickets,
             autoReplyInfo,
           ),
@@ -126,6 +128,7 @@ function chat(ctx: Context, chat: { id: string }) {
             ticketMsg(
               ticket.id,
               ctx.message,
+              ctx.session.groupTag,
               cache.config.anonymous_tickets,
               autoReplyInfo,
             ),
@@ -175,6 +178,7 @@ function chat(ctx: Context, chat: { id: string }) {
           ticketMsg(
             ticket.id,
             ctx.message,
+            ctx.session.groupTag,
             cache.config.anonymous_tickets,
             autoReplyInfo,
           ),
@@ -189,6 +193,7 @@ function chat(ctx: Context, chat: { id: string }) {
             ticketMsg(
               ticket.id,
               ctx.message,
+              ctx.session.groupTag,
               cache.config.anonymous_tickets,
               autoReplyInfo,
             ),
@@ -213,6 +218,7 @@ function chat(ctx: Context, chat: { id: string }) {
         ticketMsg(
           ticket.id,
           ctx.message,
+          ctx.session.groupTag,
           cache.config.anonymous_tickets,
           autoReplyInfo,
         ),