Report errors to server
This commit is contained in:
@ -10,9 +10,12 @@ use serenity::{
|
||||
};
|
||||
use sqlx::{MySql, Pool};
|
||||
|
||||
use crate::routes::dashboard::{
|
||||
create_reminder, generate_uid, ImportBody, JsonResult, Reminder, ReminderCsv,
|
||||
ReminderTemplateCsv, TodoCsv,
|
||||
use crate::routes::{
|
||||
dashboard::{
|
||||
create_reminder, generate_uid, ImportBody, Reminder, ReminderCsv, ReminderTemplateCsv,
|
||||
TodoCsv,
|
||||
},
|
||||
JsonResult,
|
||||
};
|
||||
|
||||
#[get("/api/guild/<id>/export/reminders")]
|
||||
|
@ -23,9 +23,12 @@ use crate::{
|
||||
MAX_EMBED_FOOTER_LENGTH, MAX_EMBED_TITLE_LENGTH, MAX_URL_LENGTH, MAX_USERNAME_LENGTH,
|
||||
MIN_INTERVAL,
|
||||
},
|
||||
routes::dashboard::{
|
||||
create_database_channel, create_reminder, template_name_default, DeleteReminder,
|
||||
DeleteReminderTemplate, JsonResult, PatchReminder, Reminder, ReminderTemplate,
|
||||
routes::{
|
||||
dashboard::{
|
||||
create_database_channel, create_reminder, template_name_default, DeleteReminder,
|
||||
DeleteReminderTemplate, PatchReminder, Reminder, ReminderTemplate,
|
||||
},
|
||||
JsonResult,
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -2,11 +2,7 @@ use std::collections::HashMap;
|
||||
|
||||
use chrono::{naive::NaiveDateTime, Utc};
|
||||
use rand::{rngs::OsRng, seq::IteratorRandom};
|
||||
use rocket::{
|
||||
http::CookieJar,
|
||||
response::Redirect,
|
||||
serde::json::{json, Value as JsonValue},
|
||||
};
|
||||
use rocket::{http::CookieJar, response::Redirect, serde::json::json};
|
||||
use rocket_dyn_templates::Template;
|
||||
use serde::{Deserialize, Deserializer, Serialize};
|
||||
use serenity::{
|
||||
@ -24,6 +20,7 @@ use crate::{
|
||||
MAX_EMBED_FIELD_VALUE_LENGTH, MAX_EMBED_FOOTER_LENGTH, MAX_EMBED_TITLE_LENGTH,
|
||||
MAX_URL_LENGTH, MAX_USERNAME_LENGTH, MIN_INTERVAL,
|
||||
},
|
||||
routes::JsonResult,
|
||||
Database, Error,
|
||||
};
|
||||
|
||||
@ -31,7 +28,6 @@ pub mod export;
|
||||
pub mod guild;
|
||||
pub mod user;
|
||||
|
||||
pub type JsonResult = Result<JsonValue, JsonValue>;
|
||||
type Unset<T> = Option<T>;
|
||||
|
||||
fn name_default() -> String {
|
||||
|
@ -1,11 +1,14 @@
|
||||
pub mod dashboard;
|
||||
pub mod login;
|
||||
pub mod report;
|
||||
|
||||
use std::collections::HashMap;
|
||||
|
||||
use rocket::request::FlashMessage;
|
||||
use rocket::{request::FlashMessage, serde::json::Value as JsonValue};
|
||||
use rocket_dyn_templates::Template;
|
||||
|
||||
pub type JsonResult = Result<JsonValue, JsonValue>;
|
||||
|
||||
#[get("/")]
|
||||
pub async fn index(flash: Option<FlashMessage<'_>>) -> Template {
|
||||
let mut map: HashMap<&str, String> = HashMap::new();
|
||||
|
48
web/src/routes/report.rs
Normal file
48
web/src/routes/report.rs
Normal file
@ -0,0 +1,48 @@
|
||||
use rocket::{
|
||||
http::CookieJar,
|
||||
serde::{
|
||||
json::{json, Json},
|
||||
Deserialize,
|
||||
},
|
||||
};
|
||||
|
||||
use crate::routes::JsonResult;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct ClientError {
|
||||
#[serde(rename = "reporterId")]
|
||||
reporter_id: String,
|
||||
url: String,
|
||||
#[serde(rename = "relativeTimestamp")]
|
||||
relative_timestamp: i64,
|
||||
#[serde(rename = "errorMessage")]
|
||||
error_message: String,
|
||||
#[serde(rename = "errorLine")]
|
||||
error_line: u64,
|
||||
#[serde(rename = "errorFile")]
|
||||
error_file: String,
|
||||
#[serde(rename = "errorType")]
|
||||
error_type: String,
|
||||
}
|
||||
|
||||
#[post("/report", data = "<client_error>")]
|
||||
pub async fn report_error(cookies: &CookieJar<'_>, client_error: Json<ClientError>) -> JsonResult {
|
||||
if let Some(user_id) = cookies.get_private("userid") {
|
||||
error!(
|
||||
"User {} reports a client-side error.
|
||||
{}, {}:{} at {}ms
|
||||
{}: {}
|
||||
Chain: {}",
|
||||
user_id,
|
||||
client_error.url,
|
||||
client_error.error_file,
|
||||
client_error.error_line,
|
||||
client_error.relative_timestamp,
|
||||
client_error.error_type,
|
||||
client_error.error_message,
|
||||
client_error.reporter_id
|
||||
);
|
||||
}
|
||||
|
||||
Ok(json!({}))
|
||||
}
|
Reference in New Issue
Block a user