Ralith/idlebot - Change T4NU6NAZKVJ2ZSJZW6OWELN2ACVN5QACFDR2LECD6RNMM4JVMMNAC

Kick idle users

Created by Ralith on January 31, 2021

T4NU6NAZKVJ2ZSJZW6OWELN2ACVN5QACFDR2LECD6RNMM4JVMMNAC

Dependencies

In channels

main

Change contents

Insertion in src/main.rs at line 4 [3.17]
[2.11]
[2.11]
```
    cell::RefCell,
```

Replacement in src/main.rs at line 16 [3.17]

B:BD[2.213] → [2.213:250]

        membership::join_room_by_id,

[2.213]

[2.250]

        membership::{join_room_by_id, kick_user},

Insertion in src/main.rs at line 26 [3.17]
[2.446]
[2.446]
```
use tokio::sync::Notify;
```

Replacement in src/main.rs at line 29 [3.17]

B:BD[2.534] → [2.534:558]

use tracing_subscriber;

[2.534]

[2.558]

use tracing_subscriber::{layer::SubscriberExt as _, util::SubscriberInitExt as _};

Replacement in src/main.rs at line 35 [3.17]

B:BD[4.153] → [2.587:624]

    tracing_subscriber::fmt::init();

[4.153]

[2.624]

    tracing_subscriber::registry()
        .with(tracing_subscriber::fmt::layer().with_target(false))
        .with(
            tracing_subscriber::filter::EnvFilter::from_default_env()
                .add_directive(tracing_subscriber::filter::LevelFilter::INFO.into()),
        )
        .init();

Replacement in src/main.rs at line 93 [3.17]
B:BD[2.1656] → [2.1656:1690]
```
    let mut state = State::new();
```
[2.1656]
[2.1690]
```
    let state = RefCell::new(State::new());
```

Replacement in src/main.rs at line 96 [3.17]

B:BD[2.1739] → [2.1739:1776]

        state.update_room(id, room);

[2.1739]

[2.1776]

        state.borrow_mut().update_room(&config, id, room);

Replacement in src/main.rs at line 108 [3.17]

B:BD[2.1995] → [2.1995:2137]

    while let Some(res) = sync_stream.try_next().await? {
        for (id, room) in res.rooms.join {
            state.update_room(id, room);

[2.1995]

[2.2137]

    let update_complete = Notify::new();
    let update = async {
        while let Some(res) = sync_stream.try_next().await? {
            for (id, room) in res.rooms.join {
                state.borrow_mut().update_room(&config, id, room);
            }
            update_complete.notify_one();

Replacement in src/main.rs at line 117 [3.17]
∅:D[2.2147] → [4.1205:1211]
B:BD[4.1205] → [4.1205:1211]
```
    }
```
[2.2147]
[4.1211]
```
        Ok(())
    };
```

Replacement in src/main.rs at line 121 [3.17]

∅:D[4.1212] → [3.982:993]

B:BD[3.982] → [3.982:993]

    Ok(())

[4.1212]

[2.2148]

    let sleep = async {
        loop {
            let least_active = state.borrow().least_active();
            if let Some((time, room, user)) = least_active {
                let dt = (time + Duration::from_secs_f32(config.idle_days * 60.0 * 60.0 * 24.0))
                    .duration_since(SystemTime::now())
                    .unwrap_or(Duration::new(0, 0));
                debug!(%room, %user, time = ?dt, "waiting");
                tokio::select! {
                    _ = tokio::time::sleep(dt) => {
                        state.borrow_mut().rooms.get_mut(&room).unwrap().remove(&user);
                        if let Err(error) = client.request(kick_user::Request::new(&room, &user)).await {
                            error!(%room, %user, %error, "kick failed");
                        } else {
                            info!(%room, %user, "kicked");
                        }
                    }
                    _ = update_complete.notified() => {}
                }
            } else {
                update_complete.notified().await;
            }
        }
    };
    loop {
        tokio::select! {
            result = update => { return result; }
            _ = sleep => unreachable!(),
        }
    }

Replacement in src/main.rs at line 165 [3.17]

B:BD[2.2315] → [2.2315:2377]

    fn update_room(&mut self, id: RoomId, room: JoinedRoom) {

[2.2315]

[2.2377]

    fn update_room(&mut self, config: &Config, id: RoomId, room: JoinedRoom) {

Replacement in src/main.rs at line 170 [3.17]

B:BD[2.2587] → [2.2587:2633]

            state.handle_event(event.json());

[2.2587]

[2.2633]

            state.handle_event(config, event.json());

Replacement in src/main.rs at line 173 [3.17]

B:BD[2.2687] → [2.2687:2733]

            state.handle_event(event.json());

[2.2687]

[2.2733]

            state.handle_event(config, event.json());

Insertion in src/main.rs at line 176 [3.17]

[2.2749]


    fn least_active(&self) -> Option<(SystemTime, RoomId, UserId)> {
        let (room, (time, user)) = self
            .rooms
            .iter()
            .filter_map(|(id, room)| Some((id, room.least_active()?)))
            .min_by_key(|&(_room, (time, _user))| time)?;
        Some((time, room.clone(), user.clone()))
    }

Replacement in src/main.rs at line 200 [3.17]

B:BD[2.3008] → [2.3008:3078]

    fn handle_event(&mut self, event: &serde_json::value::RawValue) {

[2.3008]

[2.3078]

    fn handle_event(&mut self, config: &Config, event: &serde_json::value::RawValue) {

Replacement in src/main.rs at line 208 [3.17]

B:BD[2.3325] → [2.3325:3361]

        self.update(&event.sender);

[2.3325]

[2.3361]

        if !config.blacklist.contains(&event.sender) {
            self.update(&event.sender);
        }

Replacement in src/main.rs at line 219 [3.17]

B:BD[2.3659] → [2.3659:3711]

                    Ok(user) => self.remove(&user),

[2.3659]

[2.3711]

                    Ok(user) => {
                        if !config.blacklist.contains(&user) {
                            self.remove(&user);
                        }
                    }

Replacement in src/main.rs at line 251 [3.17]

B:BD[2.4617] → [2.4617:4650]

        self.users.remove(user);

[2.4617]

[2.4650]

        if let Some(time) = self.users.remove(user) {
            if let btree_map::Entry::Occupied(mut activity) = self.activity.entry(time) {
                activity.get_mut().retain(|x| x != user);
                if activity.get().is_empty() {
                    activity.remove();
                }
            }
        }
    }
    fn least_active(&self) -> Option<(SystemTime, &UserId)> {
        let (&time, users) = self.activity.iter().next()?;
        Some((time, &users[0]))

Replacement in src/config.rs at line 1 [4.1225]
B:BD[4.1225] → [4.1226:1250]
```
use serde::Deserialize;
```
[4.1225]
[2.4933]
```
use std::collections::HashSet;
```
Insertion in src/config.rs at line 4 [4.1225]
[2.4966]
[4.1273]
```
use serde::Deserialize;
```
Replacement in src/config.rs at line 15 [4.1225]
B:BD[4.1520] → [2.4967:4999]
```
    pub blacklist: Vec<UserId>,
```
[4.1520]
[4.1520]
```
    pub blacklist: HashSet<UserId>,
```

Replacement in Cargo.toml at line 10 [3.1705]

B:BD[3.1929] → [3.1929:1988]

tokio = { version = "1.0.1", features = ["macros", "rt"] }

[3.1929]

[3.1988]

tokio = { version = "1.0.1", features = ["macros", "rt", "time"] }