From e201630a9a02fe54ddd6547abef3e444c1e36685 Mon Sep 17 00:00:00 2001
From: evannregnault <evann.regnault@pm.me>
Date: Thu, 19 Oct 2023 11:34:21 +0200
Subject: [PATCH] Fixed Format

---
 .github/workflows/main.yml | 4 +---
 Cargo.lock                 | 2 +-
 Cargo.toml                 | 2 +-
 src/commands/events.rs     | 3 ++-
 src/data/character.rs      | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e233a9e..ff04bfd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,7 +10,6 @@ env:
   DOCKER_REGISTRY: r.regnault.dev
   DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-  PORTAINER_API_KEY: ${{ secrets.PORTAINER_API_KEY }}
   PORTAINER_API_WEBHOOK: ${{ secrets.PORTAINER_API_WEBHOOK }}
 
 jobs:
@@ -55,7 +54,6 @@ jobs:
       - name: Deploy to production
         uses: fjogeleit/http-request-action@v1.14.1
         with:
-          url: ${{ env.PORTAINER_API_WEBHOOK }}
+          url: ${{ format('{0}?tag={1}',env.PORTAINER_API_WEBHOOK, env.VERSION) }}
           method: 'POST'
-          customHeaders: ${{ env.PORTAINER_API_KEY }}
           preventFailureOnNoResponse: true
diff --git a/Cargo.lock b/Cargo.lock
index cfaa0ff..a37156a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1390,7 +1390,7 @@ dependencies = [
 
 [[package]]
 name = "obsessed-yanqing"
-version = "1.4.0"
+version = "1.4.3"
 dependencies = [
  "chrono",
  "levenshtein",
diff --git a/Cargo.toml b/Cargo.toml
index 9b10f12..d2046e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "obsessed-yanqing"
-version = "1.4.2"
+version = "1.4.3"
 edition = "2021"
 authors = ["Evann Regnault"]
 license = "MIT"
diff --git a/src/commands/events.rs b/src/commands/events.rs
index 12cddd6..c390325 100644
--- a/src/commands/events.rs
+++ b/src/commands/events.rs
@@ -132,7 +132,8 @@ fn get_date(date_string: &str) -> Option<String> {
 fn get_time(event: Node) -> EventTime {
     event.find(Class("duration")).next().map(|x| {
         let text = x.text();
-        let dates = Regex::new(r" [-–] ").expect("Can't create split time regex").split(text.as_str()).collect::<Vec<&str>>();
+        let dates = Regex::new(r"[-—–]").expect("Can't create split time regex").split(text.as_str()).collect::<Vec<&str>>();
+        println!("{:?}", dates);
         let start_date_text = dates.first().expect("Cannot get start date string").to_owned();
         let end_date_text = dates.get(1).expect("Cannot get end date string").to_owned();
         let start = get_date(start_date_text).map(|x| {
diff --git a/src/data/character.rs b/src/data/character.rs
index b4be267..de77347 100644
--- a/src/data/character.rs
+++ b/src/data/character.rs
@@ -29,7 +29,7 @@ pub struct Character {
     pub full_image: FullImage,
     pub description: Option<Description>,
     pub default_role: String,
-    pub affiliation: String,
+    pub affiliation: Option<String>,
     pub rarity: String,
     pub element: String,
     pub path: String,