PATCH PEER TYPES

Author: Patrick De La Garza

refiner/models/unrefined.py

@@ -117,7 +117,7 @@ class MinerFwdFrom(BaseModel):
     flags: int
     imported: bool = False
     savedOut: bool = False
-    fromId: Optional[MinerFromId] = None
+    fromId: Optional[Any] = None
     fromName: Optional[str] = None
     date: int
     channelPost: Optional[int] = None
@@ -146,7 +146,7 @@ class MinerMessageData(BaseModel):
     post: Optional[bool] = False
     legacy: Optional[bool] = False
     id: int
-    fromId: Optional[MinerFromId] = None
+    fromId: Optional[Union[MinerFromId, PeerChannel, PeerChat]] = None
     peerId: Optional[MinerPeerId] = None
     fwdFrom: Optional[MinerFwdFrom] = None
     replyTo: Optional[MinerReplyTo] = None

refiner/transformer/miner_transformer.py

@@ -76,6 +76,10 @@ def transform(self, data: Dict[str, Any]) -> List[Base]:
             for msg in chat_data.contents:
                 if hasattr(msg, 'fromId') and msg.fromId and hasattr(msg.fromId, 'userId'):
                     participants.add(msg.fromId.userId)
+                if hasattr(msg, 'fromId') and msg.fromId and hasattr(msg.fromId, 'channelId'):
+                    participants.add(msg.fromId.channelId)
+                if hasattr(msg, 'fromId') and msg.fromId and hasattr(msg.fromId, 'chatId'):
+                    participants.add(msg.fromId.chatId)
 
             # Create SubmissionChat record
             chat_id = str(uuid.uuid4())
@@ -102,6 +106,10 @@ def transform(self, data: Dict[str, Any]) -> List[Base]:
                 sender_id = "unknown"
                 if hasattr(msg_content, 'fromId') and msg_content.fromId and hasattr(msg_content.fromId, 'userId'):
                     sender_id = str(msg_content.fromId.userId)
+                elif hasattr(msg_content, 'fromId') and msg_content.fromId and hasattr(msg_content.fromId, 'channelId'):
+                    sender_id = str(msg_content.fromId.channelId)
+                elif hasattr(msg_content, 'fromId') and msg_content.fromId and hasattr(msg_content.fromId, 'chatId'):
+                    sender_id = str(msg_content.fromId.chatId)
 
                 # Get chat ID
                 chat_source_id = str(chat_data.chat_id)