jmug/stoatchat
1
0
Fork 1
mirror of https://github.com/stoatchat/stoatchat.git synced 2026-07-14 13:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix broken merge conflict

Browse Source
This commit is contained in:
Zomatree
2023-04-01 23:09:29 +01:00
parent a60ae78176
commit 83429f9f65
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/quark/src/models/channels/message.rs
View File

@@ -1,7 +1,8 @@
use crate::{util::regex::RE_COLOUR, models::Webhook};
use crate::{models::Webhook, util::regex::RE_COLOUR};
use indexmap::{IndexMap, IndexSet};
use iso8601_timestamp::Timestamp;
use once_cell::sync::Lazy;
use regex::Regex;
use serde::{Deserialize, Serialize};
use validator::Validate;
@@ -19,6 +20,9 @@ pub fn if_false(t: &bool) -> bool {
!t
}
pub static RE_MENTION: Lazy<Regex> =
Lazy::new(|| Regex::new(r"<@([0-9A-HJKMNP-TV-Z]{26})>").unwrap());
/// # Reply
///
/// Representation of a message reply before it is sent.
@@ -278,8 +282,3 @@ pub struct DataMessageSend {
/// Information about how this message should be interacted with
pub interactions: Option<Interactions>,
}
lazy_static! {
// ignoring I L O and U is intentional
pub static ref RE_MENTION: Regex = Regex::new(r"<@([0-9A-HJKMNP-TV-Z]{26})>").unwrap();
}

2
crates/quark/src/util/ref.rs
View File

@@ -4,7 +4,7 @@ use schemars::schema::{InstanceType, Schema, SchemaObject, SingleOrVec};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use crate::models::{Bot, Channel, Emoji, Invite, Member, Message, Server, ServerBan, User, Webhook};
use crate::models::{Bot, Channel, Emoji, Invite, Member, Message, Server, ServerBan, User, Webhook, Report};
use crate::presence::presence_is_online;
use crate::{Database, Error, Result};