ferogram 0.1.9__tar.gz → 0.2.0__tar.gz

{ferogram-0.1.9 → ferogram-0.2.0}/Cargo.lock

@@ -274,16 +274,19 @@ dependencies = [
 
 [[package]]
 name = "ferogram"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcdbb324f99754ac070a6222d288fd84b4e7d2a32e035cbbca0326c4ec11fbbc"
+checksum = "532d1f9f37f3579db6e95c22e40231eff18ba4f20820ae38b7a75a6459466922"
 dependencies = [
  "async-trait",
  "base64",
  "chrono",
  "dashmap",
+ "ferogram-connect",
  "ferogram-crypto",
+ "ferogram-fsm",
  "ferogram-mtproto",
+ "ferogram-mtsender",
  "ferogram-parsers",
  "ferogram-session",
  "ferogram-tl-types",
@@ -309,11 +312,31 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "ferogram-connect"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "736861a82c40ba25195d1037463d54ec4e329f9b1e235e8bbe360678a861eaae"
+dependencies = [
+ "ferogram-crypto",
+ "ferogram-mtproto",
+ "ferogram-tl-types",
+ "flate2",
+ "getrandom 0.2.17",
+ "hmac",
+ "metrics",
+ "sha2",
+ "socket2 0.5.10",
+ "tokio",
+ "tokio-socks",
+ "tracing",
+]
+
 [[package]]
 name = "ferogram-crypto"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f485d25585c155a446e50d7a04e16f303f6c718166b0a714d6671e3c638b9bb7"
+checksum = "db48b92a5c0ee7462a2a921a2c0bdd24fbc43a6e5ed96d79c19cc2534831f1e7"
 dependencies = [
  "aes",
  "ctr",
@@ -324,11 +347,24 @@ dependencies = [
  "sha2",
 ]
 
+[[package]]
+name = "ferogram-fsm"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5ab042df109225226c6d0e679de054bf68154bd1a851ec7f0cfc2ca3fb420fc"
+dependencies = [
+ "async-trait",
+ "dashmap",
+ "serde",
+ "serde_json",
+ "tokio",
+]
+
 [[package]]
 name = "ferogram-mtproto"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afa1f669cd3182819e591125387f89ba9bf8844ead834dbd0adf846c2f731c5"
+checksum = "ab166b411950c2493b8da16ac12512e9ae17aecb7efee3f53be12b4b0c558462"
 dependencies = [
  "ferogram-crypto",
  "ferogram-tl-types",
@@ -339,11 +375,31 @@ dependencies = [
  "sha1",
 ]
 
+[[package]]
+name = "ferogram-mtsender"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57b0dc5058983f9662555436af85cf33f0a30aefdd1896a0f74379f4ce3725cc"
+dependencies = [
+ "ferogram-connect",
+ "ferogram-crypto",
+ "ferogram-mtproto",
+ "ferogram-session",
+ "ferogram-tl-types",
+ "flate2",
+ "getrandom 0.2.17",
+ "metrics",
+ "sha2",
+ "socket2 0.5.10",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "ferogram-parsers"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6af91b70fed33554e85c4e49a852cb457fc5285f201d523d868be918ce0573"
+checksum = "ae3bff00615fe04f7194b3392329877217183f45fe4eea88c4f13316d2238477"
 dependencies = [
  "ferogram-tl-types",
  "pulldown-cmark",
@@ -351,7 +407,7 @@ dependencies = [
 
 [[package]]
 name = "ferogram-py"
-version = "0.1.9"
+version = "0.2.0"
 dependencies = [
  "ferogram",
  "hex",
@@ -362,9 +418,9 @@ dependencies = [
 
 [[package]]
 name = "ferogram-session"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ec78ed52c7754d273a3e9e04969607775ff94f236b2406dee286076327209f4"
+checksum = "a33e4d826504cc88a184045ee375daec7df0e8193cc5495633e1001f76ee7829"
 dependencies = [
  "base64",
  "tracing",
@@ -372,24 +428,24 @@ dependencies = [
 
 [[package]]
 name = "ferogram-tl-gen"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41e71db9a199a5a5af641280738d514dd49e764c51ba4c0cbac0f10ed0c7a46"
+checksum = "a3791ca624d86bdf1d2cfee99d4238cfd9fbc9559cef4e1a089b12a7648e9ce3"
 dependencies = [
  "ferogram-tl-parser",
 ]
 
 [[package]]
 name = "ferogram-tl-parser"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6b0a007fb90b406669d5cadd9ef993cbea12c67132f7493a75d1acac80088c"
+checksum = "97a4c074abe63bc6bef7fe46796e75e9b08126cbec9debe2082a8774b15204a2"
 
 [[package]]
 name = "ferogram-tl-types"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cca9c9085ef9b2b636c3819470bd84b168cc7f58639989ab4c0996eff556ebea"
+checksum = "68ef7eab10bb0f30e6ccb1cfc8d24bc67036a4cd7197b9abd0798a6b229e6fd2"
 dependencies = [
  "ferogram-tl-gen",
  "ferogram-tl-parser",

{ferogram-0.1.9 → ferogram-0.2.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name        = "ferogram-py"
-version     = "0.1.9"
+version     = "0.2.0"
 edition     = "2024"
 description = "Python bindings for ferogram (Rust MTProto)"
 license     = "MIT OR Apache-2.0"
@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 hex                 = "0.4"
-ferogram            = "0.3.6"
+ferogram            = "0.3.8"
 pyo3                = { version = "0.24", features = ["extension-module", "abi3-py313"] }
 pyo3-async-runtimes = { version = "0.24", features = ["tokio-runtime"] }
 tokio               = { version = "1", features = ["full"] }

{ferogram-0.1.9 → ferogram-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ferogram
-Version: 0.1.9
+Version: 0.2.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{ferogram-0.1.9 → ferogram-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name        = "ferogram"
-version     = "0.1.9"
+version     = "0.2.0"
 description = "Python wrapper for ferogram, blazing-fast Rust MTProto library for Telegram."
 readme      = "README.md"
 license     = { text = "MIT OR Apache-2.0" }

{ferogram-0.1.9 → ferogram-0.2.0}/src/auth.rs

@@ -45,21 +45,37 @@ pub struct ClientBuilder {
     pub api_id: i32,
     pub api_hash: String,
     pub session: String,
+    pub allow_zero_hash: bool,
 }
 
 #[pymethods]
 impl ClientBuilder {
+    /// For bots only: skip needing a cached access hash.
+    /// Do NOT enable on user accounts.
+    fn experimental_allow_zero_hash(mut slf: PyRefMut<'_, Self>) -> PyRefMut<'_, Self> {
+        slf.allow_zero_hash = true;
+        slf
+    }
+
     fn connect<'py>(&self, py: Python<'py>) -> PyResult<Bound<'py, PyAny>> {
-        let (api_id, api_hash, session) =
-            (self.api_id, self.api_hash.clone(), self.session.clone());
+        let (api_id, api_hash, session, allow_zero_hash) = (
+            self.api_id,
+            self.api_hash.clone(),
+            self.session.clone(),
+            self.allow_zero_hash,
+        );
         future_into_py(py, async move {
-            let (client, shutdown) = ferogram::Client::builder()
+            let mut builder = ferogram::Client::builder()
                 .api_id(api_id)
                 .api_hash(api_hash)
-                .session(session)
-                .connect()
-                .await
-                .map_err(py_err)?;
+                .session(session);
+            if allow_zero_hash {
+                builder = builder.experimental_features(ferogram::ExperimentalFeatures {
+                    allow_zero_hash: true,
+                    ..Default::default()
+                });
+            }
+            let (client, shutdown) = builder.connect().await.map_err(py_err)?;
             Ok(crate::client::make_client(client, shutdown))
         })
     }

{ferogram-0.1.9 → ferogram-0.2.0}/src/client.rs

@@ -18,6 +18,7 @@ use std::sync::Arc;
 use tokio::sync::Mutex;
 
 use crate::{auth::*, message::from_incoming, py_err, types::*};
+use ferogram::PeerExt;
 use ferogram::tl;
 
 #[pyclass]
@@ -78,6 +79,7 @@ impl Client {
             api_id,
             api_hash,
             session,
+            allow_zero_hash: false,
         }
     }
 
@@ -238,8 +240,8 @@ impl Client {
     fn send_to_self<'py>(&self, py: Python<'py>, text: String) -> PyResult<Bound<'py, PyAny>> {
         let c = Arc::clone(&self.inner);
         future_into_py(py, async move {
-            c.send_to_self(text).await.map_err(py_err)?;
-            Ok(())
+            let m = c.send_to_self(text).await.map_err(py_err)?;
+            Ok(from_incoming(m, Some(c)))
         })
     }
 
@@ -283,9 +285,14 @@ impl Client {
     ) -> PyResult<Bound<'py, PyAny>> {
         let c = Arc::clone(&self.inner);
         future_into_py(py, async move {
-            c.forward_messages(destination, &message_ids, source)
-                .await
-                .map_err(py_err)?;
+            c.forward_messages(
+                destination,
+                &message_ids,
+                source,
+                ferogram::ForwardOptions::default(),
+            )
+            .await
+            .map_err(py_err)?;
             Ok(())
         })
     }
@@ -1340,7 +1347,12 @@ impl Client {
         let c = Arc::clone(&self.inner);
         future_into_py(py, async move {
             let msgs = c
-                .forward_messages(destination, &message_ids, source)
+                .forward_messages(
+                    destination,
+                    &message_ids,
+                    source,
+                    ferogram::ForwardOptions::default(),
+                )
                 .await
                 .map_err(py_err)?;
             Ok(msgs
@@ -2464,22 +2476,11 @@ impl Client {
             let pairs: Vec<(i64, Vec<u8>)> = result
                 .votes
                 .into_iter()
-                .map(|v| {
-                    fn peer_id(p: &tl::enums::Peer) -> i64 {
-                        match p {
-                            tl::enums::Peer::User(u) => u.user_id,
-                            tl::enums::Peer::Chat(c) => c.chat_id,
-                            tl::enums::Peer::Channel(ch) => ch.channel_id,
-                        }
-                    }
-                    match v {
-                        tl::enums::MessagePeerVote::MessagePeerVote(x) => {
-                            (peer_id(&x.peer), x.option)
-                        }
-                        tl::enums::MessagePeerVote::InputOption(x) => (peer_id(&x.peer), vec![]),
-                        tl::enums::MessagePeerVote::Multiple(x) => {
-                            (peer_id(&x.peer), x.options.into_iter().flatten().collect())
-                        }
+                .map(|v| match v {
+                    tl::enums::MessagePeerVote::MessagePeerVote(x) => (x.peer.bare_id(), x.option),
+                    tl::enums::MessagePeerVote::InputOption(x) => (x.peer.bare_id(), vec![]),
+                    tl::enums::MessagePeerVote::Multiple(x) => {
+                        (x.peer.bare_id(), x.options.into_iter().flatten().collect())
                     }
                 })
                 .collect();
@@ -2551,22 +2552,22 @@ impl Client {
     ) -> PyResult<Bound<'py, PyAny>> {
         let c = Arc::clone(&self.inner);
         future_into_py(py, async move {
-            let price_refs: Vec<(&str, i64)> =
-                prices.iter().map(|(l, a)| (l.as_str(), *a)).collect();
             let msg = c
                 .send_invoice(
                     peer,
                     title,
                     description,
                     payload,
-                    currency,
-                    &price_refs,
-                    photo_url,
-                    need_name,
-                    need_phone,
-                    need_email,
-                    need_shipping_address,
-                    is_flexible,
+                    ferogram::InvoiceOptions {
+                        currency,
+                        prices,
+                        photo_url,
+                        need_name,
+                        need_phone,
+                        need_email,
+                        need_shipping_address,
+                        is_flexible,
+                    },
                 )
                 .await
                 .map_err(py_err)?;

{ferogram-0.1.9 → ferogram-0.2.0}/src/lib.rs

@@ -60,7 +60,7 @@ fn _ferogram(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<updates::PollVote>()?;
     m.add_class::<updates::BotStopped>()?;
     m.add_class::<updates::RawUpdate>()?;
-    // new in 0.3.6
+    // new in 0.3.6 / updated in 0.3.7 (binding v0.2.0)
     m.add_class::<types::ShippingQuery>()?;
     m.add_class::<types::PreCheckoutQuery>()?;
     m.add_class::<types::ChatBoost>()?;

{ferogram-0.1.9 → ferogram-0.2.0}/src/message.rs

@@ -203,7 +203,7 @@ impl Message {
         let ids = vec![self.id];
         future_into_py(py, async move {
             client
-                .forward_messages(peer, &ids, src)
+                .forward_messages(peer, &ids, src, ferogram::ForwardOptions::default())
                 .await
                 .map_err(py_err)?;
             Ok(())

{ferogram-0.1.9 → ferogram-0.2.0}/src/updates.rs

@@ -11,6 +11,7 @@
 // If you use or modify this code, keep this notice at the top of the file
 // and include the LICENSE-MIT or LICENSE-APACHE file from this repository.
 
+use ferogram::PeerExt;
 use ferogram::tl;
 use pyo3::prelude::*;
 use pyo3_async_runtimes::tokio::future_into_py;
@@ -21,14 +22,6 @@ use crate::{message::from_incoming, py_err};
 
 // helpers
 
-fn peer_to_id(p: &tl::enums::Peer) -> i64 {
-    match p {
-        tl::enums::Peer::User(u) => u.user_id,
-        tl::enums::Peer::Chat(c) => c.chat_id,
-        tl::enums::Peer::Channel(c) => c.channel_id,
-    }
-}
-
 fn reaction_str(r: &tl::enums::Reaction) -> String {
     match r {
         tl::enums::Reaction::Emoji(e) => e.emoticon.clone(),
@@ -378,7 +371,7 @@ pub fn update_to_py(
             )
         }
         ferogram::update::Update::CallbackQuery(q) => {
-            let chat_id = q.chat_peer.as_ref().map(peer_to_id);
+            let chat_id = q.chat_peer.as_ref().map(|p| p.bare_id());
             ok!(
                 "callback_query",
                 CallbackQuery {
@@ -399,7 +392,7 @@ pub fn update_to_py(
                     user_id: q.user_id,
                     query: q.query,
                     offset: q.offset,
-                    peer_id: q.peer.as_ref().map(peer_to_id),
+                    peer_id: q.peer.as_ref().map(|p| p.bare_id()),
                 }
             )
         }
@@ -437,7 +430,7 @@ pub fn update_to_py(
             ok!(
                 "chat_action",
                 ChatAction {
-                    peer_id: peer_to_id(&a.peer),
+                    peer_id: a.peer.bare_id(),
                     user_id: a.user_id,
                     action: action_str(&a.action).to_string(),
                 }
@@ -459,7 +452,7 @@ pub fn update_to_py(
             ok!(
                 "join_request",
                 JoinRequest {
-                    peer_id: peer_to_id(&r.peer),
+                    peer_id: r.peer.bare_id(),
                     user_id: r.user_id,
                     about: r.about,
                     date: r.date,
@@ -470,10 +463,10 @@ pub fn update_to_py(
             ok!(
                 "message_reaction",
                 MessageReaction {
-                    peer_id: peer_to_id(&r.peer),
+                    peer_id: r.peer.bare_id(),
                     msg_id: r.msg_id,
                     date: r.date,
-                    actor_id: peer_to_id(&r.actor),
+                    actor_id: r.actor.bare_id(),
                     old_reactions: r.old_reactions.iter().map(reaction_str).collect(),
                     new_reactions: r.new_reactions.iter().map(reaction_str).collect(),
                 }
@@ -484,7 +477,7 @@ pub fn update_to_py(
                 "poll_vote",
                 PollVote {
                     poll_id: v.poll_id,
-                    peer_id: peer_to_id(&v.peer),
+                    peer_id: v.peer.bare_id(),
                     positions: v.positions,
                 }
             )