jeff/trade_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Activity

Fix bug by removing /say commands

Browse Source
This commit is contained in:
Jeff 2024-07-11 02:58:52 -04:00
parent a7d9044b03
commit a4ff2ad2e4
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bot.rs
View File

@ -24,6 +24,7 @@ const COINS: &str = "common.items.utility.coins";
/// A Bot instance represents an active connection to the server and it will /// A Bot instance represents an active connection to the server and it will
/// attempt to run every time the `tick` function is called. /// attempt to run every time the `tick` function is called.
pub struct Bot { pub struct Bot {
username: String,
position: [f32; 3], position: [f32; 3],
orientation: f32, orientation: f32,
admins: Vec<String>, admins: Vec<String>,
@ -44,7 +45,7 @@ impl Bot {
/// Connect to the official veloren server, select the specified character /// Connect to the official veloren server, select the specified character
/// return a Bot instance ready to run. /// return a Bot instance ready to run.
pub fn new( pub fn new(
username: &str, username: String,
password: &str, password: &str,
character: &str, character: &str,
admins: Vec<String>, admins: Vec<String>,
@ -55,7 +56,7 @@ impl Bot {
) -> Result<Self, String> { ) -> Result<Self, String> {
log::info!("Connecting to veloren"); log::info!("Connecting to veloren");
let mut client = connect_to_veloren(username, password)?; let mut client = connect_to_veloren(&username, password)?;
let mut clock = Clock::new(Duration::from_secs_f64(1.0 / 30.0)); let mut clock = Clock::new(Duration::from_secs_f64(1.0 / 30.0));
log::info!("Selecting a character"); log::info!("Selecting a character");
@ -90,6 +91,7 @@ impl Bot {
let now = Instant::now(); let now = Instant::now();
Ok(Bot { Ok(Bot {
username,
position, position,
orientation, orientation,
admins, admins,
@ -137,7 +139,10 @@ impl Bot {
if self.last_announcement.elapsed() > Duration::from_secs(1200) { if self.last_announcement.elapsed() > Duration::from_secs(1200) {
self.client.send_command( self.client.send_command(
"region".to_string(), "region".to_string(),
vec!["I'm a bot. You can trade with me or use /say or /tell to check prices: 'price [search_term]'".to_string()], vec![format!(
"I'm a bot. You can trade with me or check prices: '/tell {} price [search_term]'.",
self.username
)],
); );
self.last_announcement = Instant::now(); self.last_announcement = Instant::now();
@ -153,10 +158,10 @@ impl Bot {
fn handle_veloren_event(&mut self, event: VelorenEvent) -> Result<(), String> { fn handle_veloren_event(&mut self, event: VelorenEvent) -> Result<(), String> {
match event { match event {
VelorenEvent::Chat(message) => { VelorenEvent::Chat(message) => {
let sender = match message.chat_type { let sender = if let ChatType::Tell(uid, _) = message.chat_type {
ChatType::Tell(uid, _) => uid, uid
ChatType::Say(uid) => uid, } else {
_ => return Ok(()), return Ok(());
}; };
let content = message.content().as_plain().unwrap_or_default(); let content = message.content().as_plain().unwrap_or_default();
let mut split_content = content.split(' '); let mut split_content = content.split(' ');

2
src/main.rs
View File

@ -60,7 +60,7 @@ fn main() {
.collect(); .collect();
let mut bot = Bot::new( let mut bot = Bot::new(
&secrets.username, secrets.username,
&secrets.password, &secrets.password,
&secrets.character, &secrets.character,
secrets.admins, secrets.admins,