forked from jmug/stoatchat
chore: migrate authifier into codebase (#658)
Co-authored-by: izzy <me@insrt.uk> Signed-off-by: Zomatree <me@zomatree.live> Signed-off-by: izzy <me@insrt.uk>
This commit is contained in:
@@ -10,7 +10,6 @@ use revolt_database::{events::rabbit::*, Database};
|
||||
#[allow(unused)]
|
||||
pub struct AckConsumer {
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
}
|
||||
@@ -19,13 +18,11 @@ pub struct AckConsumer {
|
||||
impl Consumer for AckConsumer {
|
||||
async fn create(
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
) -> Self {
|
||||
Self {
|
||||
db,
|
||||
authifier_db,
|
||||
connection,
|
||||
channel,
|
||||
}
|
||||
@@ -58,7 +55,7 @@ impl Consumer for AckConsumer {
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
if let Ok(sessions) = self.authifier_db.find_sessions(&payload.user_id).await {
|
||||
if let Ok(sessions) = self.db.fetch_sessions(&payload.user_id).await {
|
||||
let config = revolt_config::config().await;
|
||||
// Step 2: find any apple sessions, since we don't need to calculate this for anything else.
|
||||
// If there's no apple sessions, we can return early
|
||||
|
||||
@@ -11,7 +11,6 @@ use revolt_database::{events::rabbit::*, Database};
|
||||
#[allow(unused)]
|
||||
pub struct DmCallConsumer {
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
}
|
||||
@@ -20,13 +19,11 @@ pub struct DmCallConsumer {
|
||||
impl Consumer for DmCallConsumer {
|
||||
async fn create(
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
) -> Self {
|
||||
Self {
|
||||
db,
|
||||
authifier_db,
|
||||
connection,
|
||||
channel,
|
||||
}
|
||||
@@ -70,7 +67,7 @@ impl Consumer for DmCallConsumer {
|
||||
let config = revolt_config::config().await;
|
||||
|
||||
for user_id in call_recipients {
|
||||
if let Ok(sessions) = self.authifier_db.find_sessions(&user_id).await {
|
||||
if let Ok(sessions) = self.db.fetch_sessions(&user_id).await {
|
||||
for session in sessions {
|
||||
if let Some(sub) = session.subscription {
|
||||
let mut sendable = PayloadToService {
|
||||
|
||||
@@ -11,7 +11,6 @@ use revolt_database::{events::rabbit::*, Database};
|
||||
#[allow(unused)]
|
||||
pub struct FRAcceptedConsumer {
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
}
|
||||
@@ -20,13 +19,11 @@ pub struct FRAcceptedConsumer {
|
||||
impl Consumer for FRAcceptedConsumer {
|
||||
async fn create(
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
) -> Self {
|
||||
Self {
|
||||
db,
|
||||
authifier_db,
|
||||
connection,
|
||||
channel,
|
||||
}
|
||||
@@ -42,7 +39,7 @@ impl Consumer for FRAcceptedConsumer {
|
||||
|
||||
debug!("Received FR accept event");
|
||||
|
||||
if let Ok(sessions) = self.authifier_db.find_sessions(&payload.user).await {
|
||||
if let Ok(sessions) = self.db.fetch_sessions(&payload.user).await {
|
||||
let config = revolt_config::config().await;
|
||||
for session in sessions {
|
||||
if let Some(sub) = session.subscription {
|
||||
|
||||
@@ -11,7 +11,6 @@ use revolt_database::{events::rabbit::*, Database};
|
||||
#[allow(unused)]
|
||||
pub struct FRReceivedConsumer {
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
}
|
||||
@@ -20,13 +19,11 @@ pub struct FRReceivedConsumer {
|
||||
impl Consumer for FRReceivedConsumer {
|
||||
async fn create(
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
) -> Self {
|
||||
Self {
|
||||
db,
|
||||
authifier_db,
|
||||
connection,
|
||||
channel,
|
||||
}
|
||||
@@ -42,7 +39,7 @@ impl Consumer for FRReceivedConsumer {
|
||||
|
||||
debug!("Received FR received event");
|
||||
|
||||
if let Ok(sessions) = self.authifier_db.find_sessions(&payload.user).await {
|
||||
if let Ok(sessions) = self.db.fetch_sessions(&payload.user).await {
|
||||
let config = revolt_config::config().await;
|
||||
for session in sessions {
|
||||
if let Some(sub) = session.subscription {
|
||||
|
||||
@@ -11,7 +11,6 @@ use revolt_database::{events::rabbit::*, Database};
|
||||
#[allow(unused)]
|
||||
pub struct GenericConsumer {
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
}
|
||||
@@ -20,13 +19,11 @@ pub struct GenericConsumer {
|
||||
impl Consumer for GenericConsumer {
|
||||
async fn create(
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
) -> Self {
|
||||
Self {
|
||||
db,
|
||||
authifier_db,
|
||||
connection,
|
||||
channel,
|
||||
}
|
||||
@@ -43,8 +40,8 @@ impl Consumer for GenericConsumer {
|
||||
debug!("Received message event on origin");
|
||||
|
||||
if let Ok(sessions) = self
|
||||
.authifier_db
|
||||
.find_sessions_with_subscription(&payload.users)
|
||||
.db
|
||||
.fetch_sessions_with_subscription(&payload.users)
|
||||
.await
|
||||
{
|
||||
let config = revolt_config::config().await;
|
||||
|
||||
@@ -19,7 +19,6 @@ use revolt_result::ToRevoltError;
|
||||
#[allow(unused)]
|
||||
pub struct MassMessageConsumer {
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
}
|
||||
@@ -31,8 +30,8 @@ impl MassMessageConsumer {
|
||||
users: &[String],
|
||||
) -> Result<()> {
|
||||
if let Ok(sessions) = self
|
||||
.authifier_db
|
||||
.find_sessions_with_subscription(users)
|
||||
.db
|
||||
.fetch_sessions_with_subscription(users)
|
||||
.await
|
||||
{
|
||||
let config = revolt_config::config().await;
|
||||
@@ -75,13 +74,11 @@ impl MassMessageConsumer {
|
||||
impl Consumer for MassMessageConsumer {
|
||||
async fn create(
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
) -> Self {
|
||||
Self {
|
||||
db,
|
||||
authifier_db,
|
||||
connection,
|
||||
channel,
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@ use revolt_database::{events::rabbit::*, Database};
|
||||
#[allow(unused)]
|
||||
pub struct MessageConsumer {
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
}
|
||||
@@ -20,13 +19,11 @@ pub struct MessageConsumer {
|
||||
impl Consumer for MessageConsumer {
|
||||
async fn create(
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<Channel>,
|
||||
) -> Self {
|
||||
Self {
|
||||
db,
|
||||
authifier_db,
|
||||
connection,
|
||||
channel,
|
||||
}
|
||||
@@ -48,8 +45,8 @@ impl Consumer for MessageConsumer {
|
||||
debug!("Received message event on origin");
|
||||
|
||||
if let Ok(sessions) = self
|
||||
.authifier_db
|
||||
.find_sessions_with_subscription(&payload.users)
|
||||
.db
|
||||
.fetch_sessions_with_subscription(&payload.users)
|
||||
.await
|
||||
{
|
||||
let config = revolt_config::config().await;
|
||||
|
||||
@@ -80,7 +80,6 @@ impl<'a> PayloadLike for CallStartStopPayload<'a> {
|
||||
#[allow(unused)]
|
||||
pub struct ApnsOutboundConsumer {
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<AMQPChannel>,
|
||||
client: Client,
|
||||
@@ -126,7 +125,6 @@ impl ApnsOutboundConsumer {
|
||||
impl Consumer for ApnsOutboundConsumer {
|
||||
async fn create(
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<AMQPChannel>,
|
||||
) -> Self {
|
||||
@@ -161,7 +159,6 @@ impl Consumer for ApnsOutboundConsumer {
|
||||
|
||||
Self {
|
||||
db,
|
||||
authifier_db,
|
||||
connection,
|
||||
channel,
|
||||
client,
|
||||
|
||||
@@ -119,7 +119,6 @@ impl NotificationData {
|
||||
#[allow(unused)]
|
||||
pub struct FcmOutboundConsumer {
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<AMQPChannel>,
|
||||
client: Client,
|
||||
@@ -129,7 +128,6 @@ pub struct FcmOutboundConsumer {
|
||||
impl Consumer for FcmOutboundConsumer {
|
||||
async fn create(
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<AMQPChannel>,
|
||||
) -> Self {
|
||||
@@ -137,7 +135,6 @@ impl Consumer for FcmOutboundConsumer {
|
||||
|
||||
Self {
|
||||
db,
|
||||
authifier_db,
|
||||
connection,
|
||||
channel,
|
||||
client: Client::new(
|
||||
|
||||
@@ -19,7 +19,6 @@ use web_push::{
|
||||
#[allow(unused)]
|
||||
pub struct VapidOutboundConsumer {
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<AMQPChannel>,
|
||||
client: IsahcWebPushClient,
|
||||
@@ -30,7 +29,6 @@ pub struct VapidOutboundConsumer {
|
||||
impl Consumer for VapidOutboundConsumer {
|
||||
async fn create(
|
||||
db: Database,
|
||||
authifier_db: authifier::Database,
|
||||
connection: Arc<Connection>,
|
||||
channel: Arc<AMQPChannel>,
|
||||
) -> Self {
|
||||
@@ -48,7 +46,6 @@ impl Consumer for VapidOutboundConsumer {
|
||||
|
||||
Self {
|
||||
db,
|
||||
authifier_db,
|
||||
connection,
|
||||
channel,
|
||||
client: IsahcWebPushClient::new().unwrap(),
|
||||
|
||||
Reference in New Issue
Block a user