Merge #241: v1.15.11

Patch release
xooniverse · Apr 16, 2024 · b1ddffc · b1ddffc
2 parents 076497b + ce6e17b
commit b1ddffc
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.15.11
+
+- Minor fix in update processing
+- Added `businessConnectionId` to Context aware methods.
+
 # 1.15.10
 
 - Added `Bot.fromAPI` constructor for creating Bot instance from `RawAPI` instance.

diff --git a/lib/src/televerse/bot.dart b/lib/src/televerse/bot.dart
@@ -322,7 +322,7 @@ class Bot {
   /// Handler Scopes and proceeds to process the update.
   void _onUpdate(Update update) async {
     // Gets the sublist of Handler Scopes that is apt for the recieved Update
-    final sub = _handlerScopes.reversed.where((scope) {
+    List<HandlerScope> sub = _handlerScopes.reversed.where((scope) {
       return scope.types.contains(update.type);
     }).toList();
 
@@ -349,12 +349,13 @@ class Bot {
       if (!passing) continue;
       _preProcess(sub[forks[i]], context);
       await _processUpdate(sub[forks[i]], context);
-      sub[forks[i]].executed();
+      sub.removeAt(forks[i]);
     }
 
     // Finds and processes the handler scopes.
     for (int i = 0; i < sub.length; i++) {
       final passing = sub[i].predicate(context);
+
       if (sub[i].hasCustomPredicate) {
         try {
           final customPass =
@@ -374,13 +375,11 @@ class Bot {
       }
 
       if (sub[i].handler == null) continue;
-      if (sub[i].isExecuted) continue;
 
       _preProcess(sub[i], context);
 
       if (passing) {
         await _processUpdate(sub[i], context);
-        sub[i].executed();
         break;
       }
     }

diff --git a/lib/src/televerse/context/context.dart b/lib/src/televerse/context/context.dart
@@ -219,6 +219,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendMessage);
     return api.sendMessage(
@@ -232,6 +233,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -255,6 +257,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendPhoto);
     return api.sendPhoto(
@@ -268,6 +271,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -289,6 +293,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendAudio);
     return api.sendAudio(
@@ -306,6 +311,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -325,6 +331,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendDocument);
     return api.sendDocument(
@@ -340,6 +347,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -363,6 +371,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendVideo);
     return api.sendVideo(
@@ -382,6 +391,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -399,6 +409,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendVideoNote);
     return api.sendVideoNote(
@@ -412,6 +423,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -430,6 +442,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendVoice);
     return api.sendVoice(
@@ -444,6 +457,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -457,6 +471,7 @@ class Context {
     bool? disableNotification,
     bool? protectContent,
     ReplyParameters? replyParameters,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendMediaGroup);
     return api.sendMediaGroup(
@@ -466,6 +481,7 @@ class Context {
       disableNotification: disableNotification,
       protectContent: protectContent,
       replyParameters: replyParameters,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -484,6 +500,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendLocation);
     return api.sendLocation(
@@ -499,6 +516,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -519,6 +537,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendVenue);
     return api.sendVenue(
@@ -536,6 +555,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -552,6 +572,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendContact);
     return api.sendContact(
@@ -565,6 +586,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -589,6 +611,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     return api.sendPoll(
       id,
@@ -609,6 +632,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -622,6 +646,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendDice);
     return api.sendDice(
@@ -632,6 +657,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -641,12 +667,14 @@ class Context {
   Future<bool> replyWithChatAction(
     ChatAction action, {
     int? messageThreadId,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendChatAction);
     return api.sendChatAction(
       id,
       action,
       messageThreadId: _threadId(messageThreadId),
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -660,6 +688,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendGame);
     return api.sendGame(
@@ -670,6 +699,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -691,6 +721,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     ReplyMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendAnimation);
     return api.sendAnimation(
@@ -709,6 +740,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 
@@ -722,6 +754,7 @@ class Context {
     bool? protectContent,
     ReplyParameters? replyParameters,
     InlineKeyboardMarkup? replyMarkup,
+    String? businessConnectionId,
   }) async {
     _verifyInfo([_chatId], APIMethod.sendSticker);
     return api.sendSticker(
@@ -732,6 +765,7 @@ class Context {
       protectContent: protectContent,
       replyParameters: replyParameters,
       replyMarkup: replyMarkup,
+      businessConnectionId: businessConnectionId,
     );
   }
 

diff --git a/lib/src/televerse/models/handler_scope.dart b/lib/src/televerse/models/handler_scope.dart
@@ -31,9 +31,6 @@ class HandlerScope {
   /// Scope Options - Additional parameters for the scope.
   final ScopeOptions? options;
 
-  /// Flag whether already executed
-  bool isExecuted;
-
   /// Creates a new [HandlerScope].
   HandlerScope({
     this.handler,
@@ -45,7 +42,6 @@ class HandlerScope {
     this.isConversation = false,
     this.chatId,
     this.options,
-    this.isExecuted = false,
   }) : assert(handler != null || isConversation);
 
   /// Whether the scope is forked or not.
@@ -54,11 +50,6 @@ class HandlerScope {
   /// Name of the scope
   String? get name => options?.name;
 
-  /// Sets executiion status to true.
-  void executed() {
-    isExecuted = true;
-  }
-
   /// Whether the scope has a custom predicate
   bool get hasCustomPredicate => options?.customPredicate != null;
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: televerse
 description: Televerse lets you create your own efficient Telegram bots with ease in Dart. Supports latest Telegram Bot API - 7.2!
-version: 1.15.10
+version: 1.15.11
 homepage: https://github.com/HeySreelal/televerse
 topics:
   - telegram