Overview
| Comment: | some fixes (by CodeRabbit), merge changes from release branch |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
d8c1d259a292ba4d06a715abf834bd0f |
| User & Date: | arcade on 2026-04-23 18:44:39.858 |
| Other Links: | manifest | tags |
Context
|
2026-04-23
| ||
| 18:44 | some fixes (by CodeRabbit), merge changes from release branch leaf check-in: d8c1d259a2 user: arcade tags: trunk | |
| 10:36 | fix workflow, fix and comment clippy warnings bump rustls-webpki to 0.103.13 (fixes 2 lowsec issues) leaf check-in: 01565c7f7e user: arcade tags: release, v0.5.6 | |
|
2026-04-18
| ||
| 18:31 | bump, update workflow, add update reaction code, change paging logic check-in: be0b8602d1 user: arcade tags: trunk | |
Changes
Modified .github/workflows/rust-clippy.yml
from [d39c325e1d]
to [b19cf4cd44].
1 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | + - + + + + - + | name: rust-ci on: |
| ︙ |
Modified Cargo.lock
from [513db45714]
to [6aa5bd626f].
| ︙ | |||
2089 2090 2091 2092 2093 2094 2095 | 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 | - + - + | "libc", "linux-raw-sys", "windows-sys 0.61.2", ] [[package]] name = "rustls" |
| ︙ | |||
2153 2154 2155 2156 2157 2158 2159 | 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 | - + - + | name = "rustls-platform-verifier-android" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" |
| ︙ | |||
3020 3021 3022 3023 3024 3025 3026 | 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 | - + - + | checksum = "4189890526f0168710b6ee65ceaedf1460c48a14318ceec933cb26baa492096a" dependencies = [ "linked-hash-map", ] [[package]] name = "typenum" |
| ︙ | |||
3627 3628 3629 3630 3631 3632 3633 | 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 | - + - + | name = "windows_x86_64_msvc" version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" |
| ︙ |
Modified src/command.rs
from [adc7f1bfb3]
to [86e99002d1].
| ︙ | |||
40 41 42 43 44 45 46 | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | - + | )).await.stack()?; Ok(()) } /// Send the sender's subscription list to the chat. /// /// Retrieves the message sender's user ID, obtains their subscription list from `core`, |
| ︙ |
Modified src/core.rs
from [0d0a1f2581]
to [f29c7ca645].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | + |
use crate::{
Arc,
command,
Mutex,
sql::Db,
tg_bot::{
Callback,
MyMessage,
Tg,
validate,
},
};
use std::{
borrow::Cow,
collections::{
BTreeMap,
|
| ︙ | |||
110 111 112 113 114 115 116 117 118 119 120 121 122 123 | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | + + |
pub tg: Tg,
pub db: Db,
pub feeds: Arc<Mutex<UserCache>>,
running: Arc<Mutex<HashSet<i32>>>,
http_client: reqwest::Client,
}
// XXX Right now that part is unfinished and I guess I need to finish menu first
#[allow(unused)]
pub struct Post {
uri: String,
_title: String,
_authors: String,
_summary: String,
}
|
| ︙ | |||
419 420 421 422 423 424 425 | 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 | - + - - - - - - + + + + + + + - - + + + + + + + |
}
impl UpdateHandler for Core {
/// Dispatches an incoming Telegram update to a matching command handler and reports handler errors to the originating chat.
///
/// This method inspects the update; if it contains a message that can be parsed as a bot command,
/// it executes the corresponding command handler. If the handler returns an error, the error text
|
| ︙ |
Modified src/sql.rs
from [3451dbd25d]
to [91f3b5a681].
| ︙ | |||
232 233 234 235 236 237 238 | 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | - + + + |
where I: Into<i64> {
sqlx::query("update rsstg_source set last_scrape = now() where source_id = $1;")
.bind(id.into())
.execute(&mut *self.0).await.stack()?;
Ok(())
}
|
| ︙ |
Modified src/tg_bot.rs
from [7753405f16]
to [186b21c68f].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | + + |
use crate::{
Arc,
Mutex,
core::FeedList,
};
use std::{
borrow::Cow,
fmt,
time::Duration,
};
use lazy_static::lazy_static;
use serde::{
Deserialize,
Serialize,
};
use regex::Regex;
use smol::Timer;
use stacked_errors::{
bail,
Result,
StackableErr,
};
use tgbot::{
|
| ︙ | |||
37 38 39 40 41 42 43 44 45 46 47 48 49 50 | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | + + + + + + + + + + + + + + + |
Message,
ParseMode,
SendMessage,
},
};
const CB_VERSION: u8 = 0;
lazy_static! {
pub static ref RE_CLOSING: Regex = Regex::new(r"</[ \t]*(pre|code)[ \t]*>").unwrap();
}
// validate input as being postable in preformatted block, all html tags are fine, except tags that
// break the block - </pre> and </code>, we don't need to escape anything else, as telegram manages
// that
pub fn validate (text: &str) -> Result<&str> {
if RE_CLOSING.is_match(text) {
bail!("Telegram closing tag found.");
} else {
Ok(text)
}
}
#[derive(Serialize, Deserialize, Debug)]
pub enum Callback {
// Edit one feed (version, name)
Edit(u8, String),
// List all feeds (version, name to show, page number)
List(u8, String, usize),
|
| ︙ | |||
146 147 148 149 150 151 152 | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | - + |
}
}
if long {
kb.push(vec![
InlineKeyboardButton::for_callback_data("<<",
Callback::list("", if *page == 0 { *page } else { page - 1 } ).to_string()),
InlineKeyboardButton::for_callback_data(">>",
|
| ︙ | |||
195 196 197 198 199 200 201 | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 | - - + + - + |
pub fn html_to_kb <'a, S> (text: S, to: ChatPeerId, kb: InlineKeyboardMarkup) -> MyMessage<'a>
where S: Into<Cow<'a, str>> {
let text = text.into();
MyMessage::HtmlToKb { text, to, kb }
}
|
| ︙ | |||
251 252 253 254 255 256 257 | 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 | - + |
}
/// Send a text message to a chat, using an optional target and parse mode.
///
/// # Returns
/// The sent `Message` on success.
pub async fn send (&self, msg: MyMessage<'_>) -> Result<Message> {
|
| ︙ | |||
276 277 278 279 280 281 282 283 284 285 286 287 288 289 | 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 | + |
where O: Into<i64> {
Tg {
owner: ChatPeerId::from(owner.into()),
..self.clone()
}
}
// XXX Can loop indefinitely if API calls results retry_after, add max retries?
pub async fn update_message (&self, chat_id: i64, message_id: i64, text: String, feeds: &Arc<Mutex<FeedList>>, cb: Callback) -> Result<EditMessageResult> {
loop {
let req = EditMessageText::for_chat_message(chat_id, message_id, &text)
.with_reply_markup(get_kb(&cb, feeds).await.stack()?);
let res = self.client.execute(req).await;
match res {
Ok(res) => return Ok(res),
|
| ︙ |