O01eg/sendxmppd-rs - Change O2GM5J4FSOXLTJURP2K6JMCBRAJ2JPJ723A43CR6AT2VQQQYRHFQC

Don't split xmpp receiving and sending

Created by O01eg on December 16, 2018

O2GM5J4FSOXLTJURP2K6JMCBRAJ2JPJ723A43CR6AT2VQQQYRHFQC

Dependencies

In channels

main

Change contents

Replacement in src/xmpp/mod.rs at line 12 [4.17]
∅:D[3.478] → [4.269:346]
∅:D[4.269] → [4.269:346]
```
    inner: Option<(stream::SplitSink<Client>, stream::SplitStream<Client>)>,
```
[3.478]
[2.0]
```
    inner: Option<Client>,
```

Replacement in src/xmpp/mod.rs at line 17 [4.17]

∅:D[2.74] → [2.74:143]

    inner: (stream::SplitSink<Client>, stream::SplitStream<Client>),

[2.74]

[2.143]

    inner: Client,

Replacement in src/xmpp/mod.rs at line 58 [4.17]

∅:D[4.1522] → [4.1522:1576]

                Self::online(client.split(), account)

[4.1522]

[2.582]

                Self::online(client, account)

Replacement in src/xmpp/mod.rs at line 71 [4.17]
∅:D[4.2003] → [4.2003:2085]
∅:D[4.2003] → [4.2003:2085]
```
        (sink, stream): (stream::SplitSink<Client>, stream::SplitStream<Client>),
```
[4.2003]
[3.528]
```
        client: Client,
```

Replacement in src/xmpp/mod.rs at line 74 [4.17]

∅:D[3.649] → [4.2180:2498]

∅:D[2.728] → [4.2180:2498]

∅:D[4.2180] → [4.2180:2498]

∅:D[4.2498] → [2.729:805]

∅:D[2.805] → [4.2574:2615]

∅:D[5.350] → [4.2574:2615]

∅:D[4.2574] → [4.2574:2615]

∅:D[4.2615] → [2.806:861]

∅:D[2.861] → [4.2676:3237]

∅:D[4.2676] → [4.2676:3237]

        Box::new(future::loop_fn(
            (sink, stream, account),
            |(sink, stream, account)| {
                stream.into_future().then(|r| match r {
                    Ok((event, stream)) => match event {
                        Some(Event::Online) => {
                            info!("Online");
                            future::ok(future::Loop::Break(XmppConnection {
                                account,
                                inner: (sink, stream),
                            }))
                        }
                        Some(Event::Stanza(s)) => {
                            info!("xmpp stanza: {:?}", s);
                            future::ok(future::Loop::Continue((sink, stream, account)))
                        }
                        _ => {
                            warn!("Disconnected");
                            future::err(account)
                        }
                    },
                    Err((e, _)) => {
                        error!("xmpp receive error: {}", e);

[2.728]

[4.3237]

        Box::new(future::loop_fn((client, account), |(client, account)| {
            client.into_future().then(|r| match r {
                Ok((event, client)) => match event {
                    Some(Event::Online) => {
                        info!("Online");
                        future::ok(future::Loop::Break(XmppConnection {
                            account,
                            inner: client,
                        }))
                    }
                    Some(Event::Stanza(s)) => {
                        info!("xmpp stanza: {:?}", s);
                        future::ok(future::Loop::Continue((client, account)))
                    }
                    _ => {
                        warn!("Disconnected");

Replacement in src/xmpp/mod.rs at line 92 [4.17]

∅:D[4.3304] → [4.3304:3349]

                })
            },
        ))

[4.3304]

[4.3349]

                },
                Err((e, _)) => {
                    error!("xmpp receive error: {}", e);
                    future::err(account)
                }
            })
        }))

Replacement in src/xmpp/mod.rs at line 105 [4.17]
∅:D[2.942] → [2.942:978]
```
        let (sink, stream) = inner;
```
[2.942]
[2.978]
```
        let client = inner;
```
Insertion in src/xmpp/mod.rs at line 110 [4.17]
[2.1108]
[2.1108]
```
        let account2 = account.clone();
```

Replacement in src/xmpp/mod.rs at line 112 [4.17]

∅:D[2.1126] → [2.1126:1158]

            sink.send(presence)

[2.1126]

[2.1158]

            client
                .send(presence)

Replacement in src/xmpp/mod.rs at line 118 [4.17]

∅:D[2.1333] → [2.1333:1472]

                .join(
                    future::loop_fn((account.clone(), stream), |(account, stream)| {
                        stream

[2.1333]

[2.1472]

                .and_then(move |client| {
                    future::loop_fn((account2.clone(), client), |(account, client)| {
                        client

Replacement in src/xmpp/mod.rs at line 126 [4.17]

∅:D[2.1746] → [2.1746:1816]

                            .and_then(|(event, stream)| match event {

[2.1746]

[2.1816]

                            .and_then(|(event, client)| match event {

Replacement in src/xmpp/mod.rs at line 135 [4.17]

∅:D[2.2387] → [2.2387:2471]

                                            future::ok(future::Loop::Break(stream))

[2.2387]

[3.2608]

                                            future::ok(future::Loop::Break(client))

Replacement in src/xmpp/mod.rs at line 137 [4.17]

∅:D[3.2657] → [2.2472:2570]

                                            future::ok(future::Loop::Continue((account, stream)))

[3.2657]

[3.2743]

                                            future::ok(future::Loop::Continue((account, client)))

Replacement in src/xmpp/mod.rs at line 146 [4.17]

∅:D[2.2872] → [2.2872:2965]

                    .map_err(|e| format!("waiting self-presence: {}", e)),
                )

[2.2872]

[2.2965]

                    .map_err(|e| format!("waiting self-presence: {}", e))
                })