Merge pull request #36 from beabee-communityrm/feat/callout-channel

Feat(callout-channel): Add filter to only list callouts for telegram
beabee-communityrm · May 10, 2024 · 69b70de · 69b70de
2 parents ee9d3a8 + 5d10628
commit 69b70de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/beabee-common b/beabee-common
diff --git a/telegram-bot/renderer/callout.renderer.ts b/telegram-bot/renderer/callout.renderer.ts
@@ -61,7 +61,7 @@ export class CalloutRenderer {
    * @param listChar
    * @returns
    */
-  public listItem(callout: CalloutDataExt, listChar = "\\-") {
+  public listItem(callout: GetCalloutDataExt, listChar = "\\-") {
     listChar = escapeMd(listChar);
 
     const result: Render = {
@@ -130,7 +130,7 @@ export class CalloutRenderer {
    * @param withUrl Whether to include the URL in the title
    * @returns
    */
-  public title(callout: CalloutDataExt, withUrl = true) {
+  public title(callout: GetCalloutDataExt, withUrl = true) {
     const result: Render = {
       key: `callout:title:${callout.shortSlug}`,
       type: RenderType.MARKDOWN,
@@ -156,7 +156,7 @@ export class CalloutRenderer {
    * @param callout
    * @returns
    */
-  public async calloutDetails(callout: CalloutDataExt) {
+  public async calloutDetails(callout: GetCalloutDataExt) {
     const imagePath = await downloadImage(callout.image);
     const inputFile = new InputFile(await Deno.open(imagePath), callout.title);
 

diff --git a/telegram-bot/services/callout.service.ts b/telegram-bot/services/callout.service.ts
@@ -28,13 +28,14 @@ import type {
   Paginated,
 } from "../deps/index.ts";
 
-const CALLOUTS_ACTIVE_QUERY: GetCalloutsQuery = {
+const CALLOUTS_ACTIVE_TELEGRAM_QUERY: GetCalloutsQuery = {
   rules: {
     condition: "AND",
     rules: [
       { field: "status", operator: "equal", value: [ItemStatus.Open] },
       { field: "expires", operator: "is_empty", value: [] },
       { field: "hidden", operator: "equal", value: [false] },
+      { field: "channels", operator: "contains", value: ["telegram"] },
     ],
   },
 };
@@ -122,7 +123,7 @@ export class CalloutService extends BaseService {
 
   public async list(limit = 10) {
     const data = await this.client.list({
-      ...CALLOUTS_ACTIVE_QUERY,
+      ...CALLOUTS_ACTIVE_TELEGRAM_QUERY,
       limit,
       sort: "title",
     });
+1 −1		deno.json
+1 −1		package.json
+6 −0		src/data/callout-access.ts
+5 −0		src/data/callout-captcha.ts
+4 −0		src/data/callout-channel.ts
+3 −0		src/data/index.ts
+1 −0		src/data/payment-status.ts
+19 −0		src/search/callouts.ts
+1 −1		src/search/contacts.ts
+2 −1		src/search/payments.ts
+3 −0		src/types/callout-channel-filter-name.ts
+13 −4		src/types/callout-data.ts
+14 −0		src/types/callout-variant-data.ts
+5 −0		src/types/callout-variant-navigation-data.ts
+6 −8		src/types/create-callout-data.ts
+3 −0		src/types/get-callout-data.ts
+4 −0		src/types/index.ts
+5 −0		src/types/payment-source-base.ts
+2 −1		src/types/payment-source-go-cardless-direct-debit.ts
+2 −1		src/types/payment-source-manual.ts
+2 −1		src/types/payment-source-stripe-bacs.ts
+13 −1		src/types/payment-source-stripe-card.ts
+2 −1		src/types/payment-source-stripe-paypal.ts
+2 −1		src/types/payment-source-stripe-sepa.ts
+4 −4		src/types/payment-source.ts