mirror of
https://github.com/stoatchat/stoatchat.git
synced 2026-07-14 21:47:02 +00:00
@@ -181,10 +181,28 @@ impl Message {
|
||||
}
|
||||
|
||||
pub async fn publish(self, channel: &Channel, process_embeds: bool) -> Result<()> {
|
||||
// construct message and publish
|
||||
// commit message to database
|
||||
// Publish message event
|
||||
ClientboundNotification::Message(self.clone())
|
||||
.publish(channel.id().to_string());
|
||||
|
||||
// Commit message to database
|
||||
get_collection("messages")
|
||||
.insert_one(to_bson(&self).unwrap().as_document().unwrap().clone(), None)
|
||||
.await
|
||||
.map_err(|_| Error::DatabaseError {
|
||||
operation: "insert_one",
|
||||
with: "message",
|
||||
})?;
|
||||
|
||||
// spawn task_queue ( update last_message_id )
|
||||
match channel {
|
||||
Channel::DirectMessage { id, .. } =>
|
||||
crate::task_queue::task_last_message_id::queue(id.clone(), self.id.clone(), true).await,
|
||||
Channel::Group { id, .. } | Channel::TextChannel { id, .. } =>
|
||||
crate::task_queue::task_last_message_id::queue(id.clone(), self.id.clone(), false).await,
|
||||
_ => {}
|
||||
}
|
||||
|
||||
// spawn task_queue ( process embeds )
|
||||
|
||||
// if mentions {
|
||||
@@ -195,14 +213,7 @@ impl Message {
|
||||
// spawn task_queue ( web push )
|
||||
// }
|
||||
|
||||
get_collection("messages")
|
||||
.insert_one(to_bson(&self).unwrap().as_document().unwrap().clone(), None)
|
||||
.await
|
||||
.map_err(|_| Error::DatabaseError {
|
||||
operation: "insert_one",
|
||||
with: "message",
|
||||
})?;
|
||||
|
||||
/*
|
||||
// ! FIXME: all this code is legitimately crap
|
||||
// ! rewrite when can be asked
|
||||
|
||||
@@ -263,7 +274,6 @@ impl Message {
|
||||
}
|
||||
|
||||
let mentions = self.mentions.clone();
|
||||
ClientboundNotification::Message(self.clone()).publish(channel.id().to_string());
|
||||
|
||||
/*
|
||||
Web Push Test Code
|
||||
@@ -333,7 +343,7 @@ impl Message {
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});*/
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ pub mod routes;
|
||||
pub mod redis;
|
||||
pub mod util;
|
||||
pub mod version;
|
||||
pub mod task_queue;
|
||||
|
||||
use async_std::task;
|
||||
use futures::join;
|
||||
@@ -50,6 +51,7 @@ async fn main() {
|
||||
database::connect().await;
|
||||
redis::connect().await;
|
||||
notifications::hive::init_hive().await;
|
||||
task_queue::start_queues().await;
|
||||
|
||||
ctrlc::set_handler(move || {
|
||||
// Force ungraceful exit to avoid hang.
|
||||
|
||||
5
src/task_queue/mod.rs
Normal file
5
src/task_queue/mod.rs
Normal file
@@ -0,0 +1,5 @@
|
||||
pub mod task_last_message_id;
|
||||
|
||||
pub async fn start_queues() {
|
||||
async_std::task::spawn(task_last_message_id::run());
|
||||
}
|
||||
87
src/task_queue/task_last_message_id.rs
Normal file
87
src/task_queue/task_last_message_id.rs
Normal file
@@ -0,0 +1,87 @@
|
||||
use std::{collections::HashMap, time::{Duration, Instant}};
|
||||
|
||||
use async_channel::{ Sender, Receiver, bounded };
|
||||
use mongodb::bson::doc;
|
||||
|
||||
use crate::database::*;
|
||||
|
||||
// Commit to database every 30 seconds if the task is particularly active.
|
||||
static EXPIRE_CONSTANT: u64 = 30;
|
||||
|
||||
// Otherwise, commit to database after 5 seconds.
|
||||
static SAVE_CONSTANT: u64 = 5;
|
||||
|
||||
type Message = (String, String, bool);
|
||||
|
||||
#[derive(Debug)]
|
||||
struct Task {
|
||||
id: String,
|
||||
is_dm: bool,
|
||||
last_updated: Instant,
|
||||
first_seen: Instant,
|
||||
}
|
||||
|
||||
lazy_static! {
|
||||
static ref CHANNEL: (Sender<Message>, Receiver<Message>) = bounded(100);
|
||||
}
|
||||
|
||||
pub async fn queue(channel: String, id: String, is_dm: bool) {
|
||||
CHANNEL.0.send((channel, id, is_dm)).await.ok();
|
||||
}
|
||||
|
||||
pub async fn run() {
|
||||
let channels = get_collection("channels");
|
||||
let mut tasks = HashMap::<String, Task>::new();
|
||||
let mut keys = vec![];
|
||||
|
||||
loop {
|
||||
// Find due tasks.
|
||||
for (key, Task { first_seen, last_updated, .. }) in &tasks {
|
||||
if first_seen.elapsed().as_secs() > EXPIRE_CONSTANT ||
|
||||
last_updated.elapsed().as_secs() > SAVE_CONSTANT {
|
||||
keys.push(key.clone());
|
||||
}
|
||||
}
|
||||
|
||||
// Commit any due tasks to the database.
|
||||
for key in &keys {
|
||||
if let Some(Task { id, is_dm, .. }) = tasks.remove(key) {
|
||||
let mut set = doc! { "last_message_id": id.clone() };
|
||||
|
||||
if is_dm {
|
||||
set.insert("active", true);
|
||||
}
|
||||
|
||||
channels
|
||||
.update_one(
|
||||
doc! { "_id": key },
|
||||
doc! { "$set": set },
|
||||
None,
|
||||
)
|
||||
.await
|
||||
.ok();
|
||||
}
|
||||
}
|
||||
|
||||
// Clear keys
|
||||
keys.clear();
|
||||
|
||||
// Queue incoming tasks.
|
||||
while let Ok((channel, id, is_dm)) = CHANNEL.1.try_recv() {
|
||||
if let Some(mut existing_task) = tasks.get_mut(&channel) {
|
||||
existing_task.id = id;
|
||||
existing_task.last_updated = Instant::now();
|
||||
} else {
|
||||
tasks.insert(channel, Task {
|
||||
id,
|
||||
is_dm,
|
||||
last_updated: Instant::now(),
|
||||
first_seen: Instant::now()
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Sleep for an arbitrary amount of time.
|
||||
async_std::task::sleep(Duration::from_secs(1)).await;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user