eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-16 10:40:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(gateway): add option to use source address in gateway awaiter

Browse source
This commit is contained in:
alyssa 2025-04-19 18:21:36 +00:00
parent 795e4f43b4
commit 5fcee4eb29
2 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/gateway/src/event_awaiter.rs
View file

@ -4,6 +4,7 @@
use std::{
collections::{hash_map::Entry, HashMap},
net::{IpAddr, SocketAddr},
time::Duration,
};
@ -149,7 +150,7 @@ impl EventAwaiter {
}
}
pub async fn handle_request(&self, req: AwaitEventRequest) {
pub async fn handle_request(&self, req: AwaitEventRequest, addr: SocketAddr) {
match req {
AwaitEventRequest::Reaction {
message_id,
@ -167,7 +168,7 @@ impl EventAwaiter {
.unwrap_or(DEFAULT_TIMEOUT),
)
.expect("invalid time"),
target,
target_or_addr(target, addr),
),
);
}
@ -188,7 +189,7 @@ impl EventAwaiter {
.unwrap_or(DEFAULT_TIMEOUT),
)
.expect("invalid time"),
target,
target_or_addr(target, addr),
options,
),
);
@ -208,7 +209,7 @@ impl EventAwaiter {
.unwrap_or(DEFAULT_TIMEOUT),
)
.expect("invalid time"),
target,
target_or_addr(target, addr),
),
);
}
@ -221,3 +222,21 @@ impl EventAwaiter {
self.interactions.write().await.clear();
}
}
fn target_or_addr(target: String, addr: SocketAddr) -> String {
if target == "source-addr" {
let ip_str = match addr.ip() {
IpAddr::V4(v4) => v4.to_string(),
IpAddr::V6(v6) => {
if let Some(v4) = v6.to_ipv4_mapped() {
v4.to_string()
} else {
format!("[{v6}]")
}
}
};
format!("http://{ip_str}:5002/events")
} else {
target
}
}