o01eg/sendxmppd-rs - Change UAT5MV5OUZS4UW3ZOEMNG75WZOS6W4274FI6F65GQX3TH7KWSCXQC

Directly use id for initial roster request

Created by O01eg on January 1, 2019

UAT5MV5OUZS4UW3ZOEMNG75WZOS6W4274FI6F65GQX3TH7KWSCXQC

Dependencies

In channels

main

Change contents

Replacement in src/xmpp/stanzas.rs at line 4 [3.13]
∅:D[3.141] → [2.0:42]
```
use xmpp_parsers::roster::{Item, Roster};
```
[3.141]
[3.141]
```
use xmpp_parsers::roster::Roster;
```
Insertion in src/xmpp/stanzas.rs at line 17 [3.13]
[4.156]
[2.43]
```
        ver: None,
```
Deletion in src/xmpp/stanzas.rs at line 19 [3.13]
∅:D[2.66] → [4.156:175]
∅:D[4.156] → [4.156:175]
```
        ver: None,
```

Deletion in src/xmpp/stanzas.rs at line 22 [3.13]

∅:D[4.270] → [2.67:445]

}
pub fn make_add_roster(id: &str, jid: jid::Jid) -> Element {
    let mut add_roster = Iq::from_set(Roster {
        items: vec![Item {
            jid,
            name: None,
            subscription: xmpp_parsers::roster::Subscription::None,
            groups: vec![],
        }],
        ver: None,
    });
    add_roster.id = Some(id.to_string());
    add_roster.into()

Deletion in src/xmpp/mod.rs at line 11 [6.17]
∅:D[4.353] → [5.320:321]
∅:D[7.320] → [5.320:321]
∅:D[5.320] → [5.320:321]
∅:D[5.321] → [8.0:46]
```
const ID_GET_ROSTER: &str = "id_get_roster0";
```
Replacement in src/xmpp/mod.rs at line 15 [6.17]
∅:D[2.519] → [2.519:540]
```
    _counter: usize,
```
[2.519]
[2.540]
```
    counter: usize,
```

Replacement in src/xmpp/mod.rs at line 253 [6.17]

∅:D[4.4394] → [9.4782:4859]

    fn process_initial_roster(&mut self, event: Event) -> Result<bool, ()> {

[4.4394]

[4.4471]

    fn process_initial_roster(&mut self, event: Event, id_init_roster: &str) -> Result<bool, ()> {

Replacement in src/xmpp/mod.rs at line 259 [6.17]

∅:D[4.4690] → [8.3485:3534]

                        if id == ID_GET_ROSTER {

[4.4690]

[4.4739]

                        if id == id_init_roster {

Replacement in src/xmpp/mod.rs at line 314 [6.17]

∅:D[9.5676] → [2.4344:4391]

            state: XmppState { client, data },

[9.5676]

[9.5827]

            state: XmppState { client, mut data },

Replacement in src/xmpp/mod.rs at line 318 [6.17]

∅:D[4.6905] → [8.3734:3800]

        let get_roster = stanzas::make_get_roster(ID_GET_ROSTER);

[4.6905]

[4.6971]

        data.counter += 1;
        let id_init_roster = format!("id{}", data.counter);
        let get_roster = stanzas::make_get_roster(&id_init_roster);

Replacement in src/xmpp/mod.rs at line 335 [6.17]

∅:D[4.7416] → [4.7416:7497]

                .processing(XmppConnection::process_initial_roster, stop_future)

[4.7416]

[9.6048]

                .processing(
                    move |conn, event| conn.process_initial_roster(event, &id_init_roster),
                    stop_future,
                )

Replacement in src/xmpp/mod.rs at line 409 [6.17]

∅:D[2.4722] → [2.4722:4786]

        if self.state.data.roster.get(&cmd.xmpp_to).is_some() {

[2.4722]

[2.4786]

        if let Some(_jid_data) = self.state.data.roster.get(&cmd.xmpp_to) {

Deletion in src/xmpp/mod.rs at line 411 [6.17]
∅:D[2.4838] → [2.4838:4867]
```
            future::ok(self)
```

Deletion in src/xmpp/mod.rs at line 413 [6.17]

∅:D[2.4940] → [2.4940:5454]

            let XmppConnection {
                account,
                state: XmppState { client, mut data },
            } = self;
            data.counter += 1;
            let id_add_roster = format!("id{}", data.counter);
            let add_roster = stanzas::make_add_roster(&id_add_roster, cmd.xmpp_to.clone());
            info!("Add jid to roster... {:?}", add_roster);
            future::ok(XmppConnection {
                account,
                state: XmppState { client, data },
            })

Insertion in src/xmpp/mod.rs at line 414 [6.17]
[2.5464]
[2.5464]
```
        future::ok(self)
```

Directly use id for initial roster request

Dependencies

In channels

Change contents

Replacement in src/xmpp/stanzas.rs at line 4 [3.13]

Insertion in src/xmpp/stanzas.rs at line 17 [3.13]

Deletion in src/xmpp/stanzas.rs at line 19 [3.13]

Deletion in src/xmpp/stanzas.rs at line 22 [3.13]

Deletion in src/xmpp/mod.rs at line 11 [6.17]

Replacement in src/xmpp/mod.rs at line 15 [6.17]