Skip to content

Commit

Permalink
ignore HELP spam
Browse files Browse the repository at this point in the history
  • Loading branch information
fabi321 committed May 30, 2024
1 parent 3ca731b commit 462d85d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
3 changes: 3 additions & 0 deletions breakwater-core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ if cfg!(feature = "alpha") {
"PX x y rrggbbaa: Color the pixel (x,y) with the given hexadecimal color rrggbb. The alpha part is discarded for performance reasons, as breakwater was compiled without the alpha feature"
}
).as_bytes();

/// Can be used for clients that repeatedly request help
pub const ALT_HELP_TEXT: &[u8] = b"Stop spamming help!";
19 changes: 14 additions & 5 deletions breakwater-parser/src/original.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::{
sync::Arc,
};

use breakwater_core::{framebuffer::FrameBuffer, HELP_TEXT};
use breakwater_core::{framebuffer::FrameBuffer, HELP_TEXT, ALT_HELP_TEXT};

use crate::{Parser, ParserError};

Expand Down Expand Up @@ -38,6 +38,7 @@ impl Parser for OriginalParser {
message_sender: &Sender<Box<[u8]>>,
) -> Result<usize, ParserError> {
let mut last_byte_parsed = 0;
let mut help_count = 0;

let mut i = 0; // We can't use a for loop here because Rust don't lets use skip characters by incrementing i
let loop_end = buffer.len().saturating_sub(PARSER_LOOKAHEAD); // Let's extract the .len() call and the subtraction into it's own variable so we only compute it once
Expand Down Expand Up @@ -174,10 +175,18 @@ impl Parser for OriginalParser {
} else if current_command & 0xffff_ffff == HELP_PATTERN {
i += 4;
last_byte_parsed = i - 1;

message_sender
.send(HELP_TEXT.into())
.expect("Failed to write message");

if help_count < 3 {
message_sender
.send(HELP_TEXT.into())
.expect("Failed to write message");
help_count += 1;
} else if help_count == 3 {
message_sender
.send(ALT_HELP_TEXT.into())
.expect("Failed to write message");
help_count += 1;
}
continue;
}

Expand Down

0 comments on commit 462d85d

Please sign in to comment.