Diff
Logged in as anonymous

Differences From Artifact [c6e371c2f9]:

To Artifact [efefd7f7a3]:


13
14
15
16
17
18
19

20
21
22
23
24
25



26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52

53
54
55
56
57
58
59
	sync::{
		Arc,
		Mutex
	},
};

use anyhow::{

	bail,
	Result,
};
use async_std::task;
use chrono::DateTime;
use frankenstein::{



	client_reqwest::Bot,
	methods::{
		GetUpdatesParams,
		SendMessageParams
	},
	types::{
		AllowedUpdate,
		MessageEntityType,
		User,
	},
	updates::UpdateContent,
	AsyncTelegramApi,
	ParseMode,
};
use thiserror::Error;

#[derive(Error, Debug)]
pub enum RssError {
	// #[error(transparent)]
	// Tg(#[from] TgError),
	#[error(transparent)]
	Int(#[from] TryFromIntError),
}

#[derive(Clone)]
pub struct Core {
	owner_chat: i64,

	pub tg: Bot,
	pub me: User,
	pub db: Db,
	sources: Arc<Mutex<HashSet<Arc<i32>>>>,
	http_client: reqwest::Client,
}








>






>
>
>











<
<














>







13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40


41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
	sync::{
		Arc,
		Mutex
	},
};

use anyhow::{
	anyhow,
	bail,
	Result,
};
use async_std::task;
use chrono::DateTime;
use frankenstein::{
	AsyncTelegramApi,
	Error as FrankError,
	ParseMode,
	client_reqwest::Bot,
	methods::{
		GetUpdatesParams,
		SendMessageParams
	},
	types::{
		AllowedUpdate,
		MessageEntityType,
		User,
	},
	updates::UpdateContent,


};
use thiserror::Error;

#[derive(Error, Debug)]
pub enum RssError {
	// #[error(transparent)]
	// Tg(#[from] TgError),
	#[error(transparent)]
	Int(#[from] TryFromIntError),
}

#[derive(Clone)]
pub struct Core {
	owner_chat: i64,
	max_delay: u16,
	pub tg: Bot,
	pub me: User,
	pub db: Db,
	sources: Arc<Mutex<HashSet<Arc<i32>>>>,
	http_client: reqwest::Client,
}

74
75
76
77
78
79
80

81
82
83
84
85
86
87
		let core = Core {
			tg,
			me,
			owner_chat,
			db: Db::new(&settings.get_string("pg")?)?,
			sources: Arc::new(Mutex::new(HashSet::new())),
			http_client,

		};
		let mut clone = core.clone();
		task::spawn(async move {
			loop {
				let delay = match &clone.autofetch().await {
					Err(err) => {
						if let Err(err) = clone.send(format!("🛑 {err:?}"), None, None).await {







>







77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
		let core = Core {
			tg,
			me,
			owner_chat,
			db: Db::new(&settings.get_string("pg")?)?,
			sources: Arc::new(Mutex::new(HashSet::new())),
			http_client,
			max_delay: 60,
		};
		let mut clone = core.clone();
		task::spawn(async move {
			loop {
				let delay = match &clone.autofetch().await {
					Err(err) => {
						if let Err(err) = clone.send(format!("🛑 {err:?}"), None, None).await {
123
124
125
126
127
128
129
130
131
132
133
134
135


136
137
138
139
140

141

142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160

161





















162
163
164
165
166
167
168
							let chars: Vec<u16> = text.encode_utf16().collect();
							for entity in entities {
								if entity.type_field == MessageEntityType::BotCommand && entity.offset != 0 {
									bail!("commands should be at message start");
								};
								let cmd = String::from_utf16_lossy(&chars[entity.offset as usize..entity.length as usize]);
								let words: Vec<&str> = text.split_whitespace().collect();
								match cmd.as_ref() {
									"/check" | "/clean" | "/enable" | "/delete" | "/disable" => { command::command(self, msg.chat.id, words).await? },
									"/start" => { command::start(self, msg.chat.id).await?; },
									"/list" => { command::list(self, msg.chat.id).await?; },
									"/add" | "/update" => { command::update(self, msg.chat.id, words).await?; },
									any => {


										self.send(format!("\\#error\n```\nUnknown command: {any}\n```"),
											Some(msg.chat.id),
											Some(ParseMode::MarkdownV2)
										).await?;
									},

								};

							};
						};
					};
				};
			}
		}
	}

	pub async fn send <S>(&self, msg: S, target: Option<i64>, mode: Option<ParseMode>) -> Result<()>
	where S: Into<String> {
		let msg = msg.into();

		let mode = mode.unwrap_or(ParseMode::Html);
		let target = target.unwrap_or(self.owner_chat);
		let send = SendMessageParams::builder()
			.chat_id(target)
			.text(msg)
			.parse_mode(mode)
			.build();

		self.tg.send_message(&send).await?;





















		Ok(())
	}

	pub async fn check (&mut self, id: &i32, owner: i64, real: bool) -> Result<String> {
		let mut posted: i32 = 0;
		let mut conn = self.db.begin().await?;








|
|
|
|
|
|
>
>
|
|
|
|
<
>
|
>



















>
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145

146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
							let chars: Vec<u16> = text.encode_utf16().collect();
							for entity in entities {
								if entity.type_field == MessageEntityType::BotCommand && entity.offset != 0 {
									bail!("commands should be at message start");
								};
								let cmd = String::from_utf16_lossy(&chars[entity.offset as usize..entity.length as usize]);
								let words: Vec<&str> = text.split_whitespace().collect();
								let res = match cmd.as_ref() {
									"/check" | "/clean" | "/enable" | "/delete" | "/disable" => command::command(self, msg.chat.id, words).await,
									"/start" => command::start(self, msg.chat.id).await,
									"/list" => command::list(self, msg.chat.id).await,
									"/add" | "/update" => command::update(self, msg.chat.id, words).await,
									any => Err(anyhow!("Unknown command: {any}")),
								};
								if let Err(err) = res {
									if let Err(err2) = self.send(format!("\\#error\n```\n{err:?}\n```"),
										Some(msg.chat.id),
										Some(ParseMode::MarkdownV2)
									).await{

										dbg!(err2);
									};
								}
							};
						};
					};
				};
			}
		}
	}

	pub async fn send <S>(&self, msg: S, target: Option<i64>, mode: Option<ParseMode>) -> Result<()>
	where S: Into<String> {
		let msg = msg.into();

		let mode = mode.unwrap_or(ParseMode::Html);
		let target = target.unwrap_or(self.owner_chat);
		let send = SendMessageParams::builder()
			.chat_id(target)
			.text(msg)
			.parse_mode(mode)
			.build();
		loop {
			match self.tg.send_message(&send).await {
				Ok(_) => break,
				Err(err) => match err {
					FrankError::Api(ref resp) => {
						if resp.error_code == 429 {
							let mut my_delay = self.max_delay;
							if let Some(params) = resp.parameters {
								if let Some(delay) = params.retry_after {
									if delay < my_delay {
										my_delay = delay;
									}
								}
							}
							task::sleep(std::time::Duration::from_secs(my_delay.into())).await;
						} else {
							return Err(err.into());
						}
					},
					_ => return Err(err.into()),
				},
			}
		}
		Ok(())
	}

	pub async fn check (&mut self, id: &i32, owner: i64, real: bool) -> Result<String> {
		let mut posted: i32 = 0;
		let mut conn = self.db.begin().await?;