From 83429f9f652a0d75cb07529e57bb514aa5244740 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Sat, 1 Apr 2023 23:09:29 +0100
Subject: [PATCH] fix broken merge conflict

---
 crates/quark/src/models/channels/message.rs | 11 +++++------
 crates/quark/src/util/ref.rs                |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/crates/quark/src/models/channels/message.rs b/crates/quark/src/models/channels/message.rs
index f8912e73..375bfb91 100644
--- a/crates/quark/src/models/channels/message.rs
+++ b/crates/quark/src/models/channels/message.rs
@@ -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();
-}
diff --git a/crates/quark/src/util/ref.rs b/crates/quark/src/util/ref.rs
index 5e2d863e..5136ed23 100644
--- a/crates/quark/src/util/ref.rs
+++ b/crates/quark/src/util/ref.rs
@@ -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};