spluspy 2.2.8__tar.gz → 2.2.9__tar.gz

{spluspy-2.2.8/spluspy.egg-info → spluspy-2.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spluspy
-Version: 2.2.8
+Version: 2.2.9
 Summary: High-performance Python Self-Bot Framework for Soroush Plus
 Author: Ali Mirshekari
 License: MIT
@@ -26,7 +26,7 @@ Requires-Dist: rsa
 Requires-Dist: pyaes
 Dynamic: license-file
 
-# SplusPy v2.2.8
+# SplusPy v2.2.9
 
 
 **A fast, minimal, and fully-featured self-bot framework**
@@ -37,7 +37,7 @@ Dynamic: license-file
 
 SplusPy is a Python library designed specifically for building **Soroush Plus self-bots** (userbots). It provides a clean, intuitive API for automating your personal Soroush Plus account with ease.
 
-> ⚠️ **Note:** This is a **self-bot framework** — it operates on your personal account, not a bot account. Please adhere to Telegram's Terms of Service.
+> ⚠️ **Note:** This is a **self-bot framework** — it operates on your personal account, not a bot account. Please adhere to Soroush's Terms of Service.
 
 ---
 

{spluspy-2.2.8 → spluspy-2.2.9}/README.md

@@ -1,4 +1,4 @@
-# SplusPy v2.2.8
+# SplusPy v2.2.9
 
 
 **A fast, minimal, and fully-featured self-bot framework**
@@ -9,7 +9,7 @@
 
 SplusPy is a Python library designed specifically for building **Soroush Plus self-bots** (userbots). It provides a clean, intuitive API for automating your personal Soroush Plus account with ease.
 
-> ⚠️ **Note:** This is a **self-bot framework** — it operates on your personal account, not a bot account. Please adhere to Telegram's Terms of Service.
+> ⚠️ **Note:** This is a **self-bot framework** — it operates on your personal account, not a bot account. Please adhere to Soroush's Terms of Service.
 
 ---
 

{spluspy-2.2.8 → spluspy-2.2.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "spluspy"
-version = "2.2.8"
+version = "2.2.9"
 description = "High-performance Python Self-Bot Framework for Soroush Plus"
 readme = "README.md"
 license = {text = "MIT"}

{spluspy-2.2.8 → spluspy-2.2.9}/spluspy/client/updates.py

@@ -298,6 +298,8 @@ class UpdateMethods:
         event = None
         if isinstance(update, (types.UpdateNewMessage, types.UpdateNewChannelMessage)):
             event = NewMessage.build(update, None, self._mb_entity_cache.self_id)
+            if event is None and isinstance(update.message, types.MessageService):
+                event = ChatAction.build(update, None, self._mb_entity_cache.self_id)
         elif isinstance(update, (types.UpdateEditMessage, types.UpdateEditChannelMessage)):
             event = MessageEdited.build(update, None, self._mb_entity_cache.self_id)
         elif isinstance(update, (types.UpdateDeleteMessages, types.UpdateDeleteChannelMessages)):
@@ -317,24 +319,6 @@ class UpdateMethods:
             types.UpdateChannelUserTyping,
         )):
             event = UserUpdate.build(update, None, self._mb_entity_cache.self_id)
-        elif isinstance(update, (types.UpdateNewMessage, types.UpdateNewChannelMessage)):
-            # Check for service messages that are ChatActions
-            msg = update.message
-            if isinstance(msg, types.MessageService) and isinstance(msg.action, (
-                types.MessageActionChatJoinedByLink,
-                types.MessageActionChatAddUser,
-                types.MessageActionChatDeleteUser,
-                types.MessageActionChatCreate,
-                types.MessageActionChannelCreate,
-                types.MessageActionChatEditTitle,
-                types.MessageActionChatEditPhoto,
-                types.MessageActionChatDeletePhoto,
-                types.MessageActionPinMessage,
-                types.MessageActionGameScore,
-            )):
-                event = ChatAction.build(update, None, self._mb_entity_cache.self_id)
-            else:
-                event = NewMessage.build(update, None, self._mb_entity_cache.self_id)
 
         # For Raw handlers, always dispatch with the raw update
         raw_event = update

{spluspy-2.2.8 → spluspy-2.2.9}/spluspy/client/users.py

@@ -483,6 +483,18 @@ class UserMethods:
                     'GetUsersRequest with access_hash=0 failed for user %s, '
                     'trying contacts fallback', peer.user_id)
 
+            # SoroushPlus groups are channels. A bare positive ID may actually
+            # be a group, so try resolving it as a channel before giving up.
+            try:
+                channels = await self(functions.channels.GetChannelsRequest([
+                    types.InputChannel(peer.user_id, access_hash=0)]))
+                if channels.chats:
+                    return utils.get_input_peer(channels.chats[0])
+            except errors.RPCError:
+                _log.debug(
+                    'GetChannelsRequest with access_hash=0 failed for %s',
+                    peer.user_id)
+
             # Fallback: search contacts for the user by ID
             try:
                 contacts = (await self(
@@ -510,8 +522,10 @@ class UserMethods:
         )
 
     async def _get_peer(self: 'SoroushClient', peer: 'hints.EntityLike'):
-        i, cls = utils.resolve_id(await self.get_peer_id(peer))
-        return cls(i)
+        if isinstance(peer, int):
+            i, cls = utils.resolve_id(await self.get_peer_id(peer))
+            return cls(i)
+        return utils.get_peer(peer)
 
     async def get_peer_id(
             self: 'SoroushClient',

{spluspy-2.2.8 → spluspy-2.2.9}/spluspy/events/common.py

@@ -19,9 +19,15 @@ async def _into_id_set(client, chats):
     for chat in chats:
         if isinstance(chat, int):
             if chat < 0:
-                result.add(chat)  # Explicitly marked IDs are negative
+                # Explicitly marked IDs (e.g. legacy "-100...") are kept, and
+                # their unmarked form is also added so both styles match.
+                result.add(chat)
+                result.add(utils.resolve_id(chat)[0])
             else:
-                result.update({  # Support all valid types of peers
+                # A bare positive ID in SoroushPlus can be a user or a group
+                # (channels), so add every possible representation to match
+                # whichever type the chat actually is.
+                result.update({
                     utils.get_peer_id(types.PeerUser(chat)),
                     utils.get_peer_id(types.PeerChat(chat)),
                     utils.get_peer_id(types.PeerChannel(chat)),
@@ -122,7 +128,7 @@ class EventBuilder(abc.ABC):
                 return
 
         if self.filters:
-            if not await self.filters(event.client, event.message if hasattr(event, 'message') else event):
+            if not await self.filters(event.client, event):
                 return
 
         if not self.func:

{spluspy-2.2.8 → spluspy-2.2.9}/spluspy/sessions/memory.py

@@ -5,7 +5,7 @@ from .. import utils
 from ..tl import TLObject
 from ..tl.types import (
     PeerUser, PeerChat, PeerChannel,
-    InputPeerUser, InputPeerChat, InputPeerChannel,
+    InputPeerUser, InputPeerChat, InputPeerChannel, InputPeerSelf,
     InputPhoto, InputDocument
 )
 
@@ -110,7 +110,6 @@ class MemorySession(Session):
             return
         try:
             p = utils.get_input_peer(e, allow_self=False)
-            marked_id = utils.get_peer_id(p)
         except TypeError:
             # Note: `get_input_peer` already checks for non-zero `access_hash`.
             #        See issues #354 and #392. It also checks that the entity
@@ -118,10 +117,19 @@ class MemorySession(Session):
             #        anywhere (since layer 102, there are two access hashes).
             return
 
-        if isinstance(p, (InputPeerUser, InputPeerChannel)):
+        if isinstance(p, InputPeerSelf):
+            return
+        elif isinstance(p, InputPeerChannel):
+            # Keep the "-100" mark so the session can later tell a channel
+            # (group) apart from a user when resolving a bare ID.
+            marked_id = -(1000000000000 + p.channel_id)
             p_hash = p.access_hash
         elif isinstance(p, InputPeerChat):
+            marked_id = -p.chat_id
             p_hash = 0
+        elif isinstance(p, InputPeerUser):
+            marked_id = p.user_id
+            p_hash = p.access_hash
         else:
             return
 

{spluspy-2.2.8 → spluspy-2.2.9}/spluspy/utils.py

@@ -1042,11 +1042,9 @@ def get_peer_id(peer, add_mark=True):
         if not (0 < peer.channel_id <= 9999999999):
             peer.channel_id = resolve_id(peer.channel_id)[0]
 
-        if not add_mark:
-            return peer.channel_id
-
-        # Growing backwards from -100_0000_000_000 indicates it's a channel
-        return -(1000000000000 + peer.channel_id)
+        # SoroushPlus only has a single type of group (channels), so group
+        # IDs are returned as-is without the Telegram "-100" bot-API mark.
+        return peer.channel_id
 
 
 def resolve_id(marked_id):

{spluspy-2.2.8 → spluspy-2.2.9}/spluspy/version.py

@@ -1,3 +1,3 @@
 # Versions should comply with PEP440.
 # This line is parsed in setup.py:
-__version__ = '2.2.8'
+__version__ = '2.2.9'

{spluspy-2.2.8 → spluspy-2.2.9/spluspy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spluspy
-Version: 2.2.8
+Version: 2.2.9
 Summary: High-performance Python Self-Bot Framework for Soroush Plus
 Author: Ali Mirshekari
 License: MIT
@@ -26,7 +26,7 @@ Requires-Dist: rsa
 Requires-Dist: pyaes
 Dynamic: license-file
 
-# SplusPy v2.2.8
+# SplusPy v2.2.9
 
 
 **A fast, minimal, and fully-featured self-bot framework**
@@ -37,7 +37,7 @@ Dynamic: license-file
 
 SplusPy is a Python library designed specifically for building **Soroush Plus self-bots** (userbots). It provides a clean, intuitive API for automating your personal Soroush Plus account with ease.
 
-> ⚠️ **Note:** This is a **self-bot framework** — it operates on your personal account, not a bot account. Please adhere to Telegram's Terms of Service.
+> ⚠️ **Note:** This is a **self-bot framework** — it operates on your personal account, not a bot account. Please adhere to Soroush's Terms of Service.
 
 ---