anna
/
clemsbot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: anna:main
Branches Tags
anna:main
...
compare: anna:8b2a5d44aced729430903da3e5f93370a2c6b80a
Branches Tags
anna:main

No commits in common. "main" and "8b2a5d44aced729430903da3e5f93370a2c6b80a" have entirely different histories.
main ... 8b2a5d44ac

14 changed files with 642 additions and 934 deletions
Show Stats Expand all files Collapse all files

2
.envrc
View File

@ -1,2 +0,0 @@
unset RUSTC_WRAPPER
use nix

1069
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

14
Cargo.toml
View File

@ -7,22 +7,22 @@ edition = "2018"
[dependencies]
anyhow = "1"
askama = { version = "0.11", features = ["with-warp"] }
askama_warp = "0.12"
cached = { version = "0.34", default-features = false }
askama = { version = "0.10", features = ["with-warp"] }
askama_warp = "0.11"
cached = { version = "0.25", default-features = false }
chrono = "0.4"
cookie = { version = "0.16", features = ["percent-encode"] }
cookie = { version = "0.15", features = ["percent-encode"] }
futures = "0.3"
irc = "0.15"
parking_lot = "0.12"
parking_lot = "0.11"
reqwest = "0.11"
rhai = { version = "1", features = ["sync"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde_with = { version = "1", features = ["chrono"] }
toml = "0.5"
tokio-tungstenite = { version = "0.17", features = ["rustls-tls-webpki-roots"] }
twitch_api2 = { version = "0.6.0-rc.3", features = ["twitch_oauth2", "client", "reqwest_client", "helix", "pubsub", "unsupported"] }
tokio-tungstenite = { version = "0.15", features = ["rustls-tls"] }
twitch_api2 = { version = "0.6.0-rc.2", features = ["twitch_oauth2", "client", "reqwest_client", "helix", "pubsub", "unsupported"] }
url = "2"
uuid = { version = "0.8", features = ["v4", "serde"] }
warp = "0.3"

12
default.nix
View File

@ -1,12 +0,0 @@
let
sources = import ./nix/sources.nix { };
pkgs = import sources.nixpkgs { overlays = [ (import sources.mozilla) ]; };
in
pkgs.gcc10Stdenv.mkDerivation {
name = "shell";
buildInputs = [
(pkgs.rustChannelOf { date = "2022-02-23"; channel = "nightly"; }).rust
pkgs.openssl
pkgs.pkg-config
];
}

38
nix/sources.json
View File

@ -1,38 +0,0 @@
{
"mozilla": {
"branch": "master",
"description": "Mozilla overlay for Nixpkgs.",
"homepage": "",
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"rev": "15b7a05f20aab51c4ffbefddb1b448e862dccb7d",
"sha256": "0admybxrjan9a04wq54c3zykpw81sc1z1nqclm74a7pgjdp7iqv1",
"type": "tarball",
"url": "https://github.com/mozilla/nixpkgs-mozilla/archive/15b7a05f20aab51c4ffbefddb1b448e862dccb7d.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"niv": {
"branch": "master",
"description": "Easy dependency management for Nix projects",
"homepage": "https://github.com/nmattia/niv",
"owner": "nmattia",
"repo": "niv",
"rev": "9cb7ef336bb71fd1ca84fc7f2dff15ef4b033f2a",
"sha256": "1ajyqr8zka1zlb25jx1v4xys3zqmdy3prbm1vxlid6ah27a8qnzh",
"type": "tarball",
"url": "https://github.com/nmattia/niv/archive/9cb7ef336bb71fd1ca84fc7f2dff15ef4b033f2a.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
"branch": "release-20.03",
"description": "Nix Packages collection",
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "eb73405ecceb1dc505b7cbbd234f8f94165e2696",
"sha256": "06k21wbyhhvq2f1xczszh3c2934p0m02by3l2ixvd6nkwrqklax7",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb73405ecceb1dc505b7cbbd234f8f94165e2696.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}

174
nix/sources.nix
View File

@ -1,174 +0,0 @@
# This file has been generated by Niv.
let
#
# The fetchers. fetch_<type> fetches specs of type <type>.
#
fetch_file = pkgs: name: spec:
let
name' = sanitizeName name + "-src";
in
if spec.builtin or true then
builtins_fetchurl { inherit (spec) url sha256; name = name'; }
else
pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
fetch_tarball = pkgs: name: spec:
let
name' = sanitizeName name + "-src";
in
if spec.builtin or true then
builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
else
pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
fetch_git = name: spec:
let
ref =
if spec ? ref then spec.ref else
if spec ? branch then "refs/heads/${spec.branch}" else
if spec ? tag then "refs/tags/${spec.tag}" else
abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
in
builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
fetch_local = spec: spec.path;
fetch_builtin-tarball = name: throw
''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
$ niv modify ${name} -a type=tarball -a builtin=true'';
fetch_builtin-url = name: throw
''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
$ niv modify ${name} -a type=file -a builtin=true'';
#
# Various helpers
#
# https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
sanitizeName = name:
(
concatMapStrings (s: if builtins.isList s then "-" else s)
(
builtins.split "[^[:alnum:]+._?=-]+"
((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
)
);
# The set of packages used when specs are fetched using non-builtins.
mkPkgs = sources: system:
let
sourcesNixpkgs =
import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
hasThisAsNixpkgsPath = <nixpkgs> == ./.;
in
if builtins.hasAttr "nixpkgs" sources
then sourcesNixpkgs
else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
import <nixpkgs> {}
else
abort
''
Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
add a package called "nixpkgs" to your sources.json.
'';
# The actual fetching function.
fetch = pkgs: name: spec:
if ! builtins.hasAttr "type" spec then
abort "ERROR: niv spec ${name} does not have a 'type' attribute"
else if spec.type == "file" then fetch_file pkgs name spec
else if spec.type == "tarball" then fetch_tarball pkgs name spec
else if spec.type == "git" then fetch_git name spec
else if spec.type == "local" then fetch_local spec
else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
else if spec.type == "builtin-url" then fetch_builtin-url name
else
abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
# If the environment variable NIV_OVERRIDE_${name} is set, then use
# the path directly as opposed to the fetched source.
replace = name: drv:
let
saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
in
if ersatz == "" then drv else
# this turns the string into an actual Nix path (for both absolute and
# relative paths)
if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
# Ports of functions for older nix versions
# a Nix version of mapAttrs if the built-in doesn't exist
mapAttrs = builtins.mapAttrs or (
f: set: with builtins;
listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
);
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
concatMapStrings = f: list: concatStrings (map f list);
concatStrings = builtins.concatStringsSep "";
# https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
optionalAttrs = cond: as: if cond then as else {};
# fetchTarball version that is compatible between all the versions of Nix
builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
let
inherit (builtins) lessThan nixVersion fetchTarball;
in
if lessThan nixVersion "1.12" then
fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
else
fetchTarball attrs;
# fetchurl version that is compatible between all the versions of Nix
builtins_fetchurl = { url, name ? null, sha256 }@attrs:
let
inherit (builtins) lessThan nixVersion fetchurl;
in
if lessThan nixVersion "1.12" then
fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
else
fetchurl attrs;
# Create the final "sources" from the config
mkSources = config:
mapAttrs (
name: spec:
if builtins.hasAttr "outPath" spec
then abort
"The values in sources.json should not have an 'outPath' attribute"
else
spec // { outPath = replace name (fetch config.pkgs name spec); }
) config.sources;
# The "config" used by the fetchers
mkConfig =
{ sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
, sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
, system ? builtins.currentSystem
, pkgs ? mkPkgs sources system
}: rec {
# The sources, i.e. the attribute set of spec name to spec
inherit sources;
# The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
inherit pkgs;
};
in
mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

3
src/app.rs
View File

@ -395,11 +395,10 @@ pub fn run_rhai<S: Into<String>>(state: Arc<State>, script: S, fn_args: Vec<rhai
let mut output = rhai::Dynamic::from(ExecutorOutput::default());
state.rhai.call_fn_raw(
state.rhai.call_fn_dynamic(
&mut scope,
&ast,
true,
false,
"run",
Some(&mut output),
fn_args,

2
src/app/task/tokens.rs
View File

@ -13,7 +13,7 @@ pub async fn start_task(state: Arc<State>) {
eprintln!("could not get user token: {:?}", e);
}
tokio::time::sleep(Duration::minutes(5).to_std().unwrap()).await;
tokio::time::sleep(Duration::minutes(15).to_std().unwrap()).await;
}
});
}

121
src/app/twitch.rs
View File

@ -1,34 +1,20 @@
use std::sync::Arc;
use std::time::Instant;
use anyhow::Context;
use twitch_api2::{
TwitchClient,
types::UserId,
twitch_oauth2::UserToken,
};
use irc::{
client::prelude::Message,
proto::{Command, Response},
};
use tokio::sync::RwLock;
use tokio_tungstenite::tungstenite::Message as WsMessage;
use twitch_api2::{
pubsub::channel_points::Redemption,
twitch_oauth2::UserToken,
TwitchClient,
types::UserId,
};
use twitch_api2::helix::points::{CustomRewardRedemptionStatus, UpdateRedemptionStatusBody, UpdateRedemptionStatusRequest};
use twitch_api2::pubsub::{
channel_points::ChannelPointsChannelV1Reply,
Response as PubSubResponse,
TopicData,
};
use twitch_api2::pubsub::video_playback::VideoPlaybackReply;
use twitch_api2::twitch_oauth2::TwitchToken;
use crate::app::{
State,
config::CommandExecutor,
rhai_tools::ExecutorState,
State,
};
use crate::app::config::Config;
use std::sync::Arc;
pub struct Twitch {
pub client: TwitchClient<'static, reqwest::Client>,
@ -57,7 +43,7 @@ impl Twitch {
let mut user_token = self.config.read().await.user_token.as_ref().unwrap().clone();
if user_token.token.expires_in() <= std::time::Duration::from_secs(60 * 15) {
user_token.refresh_token(&reqwest::Client::new()).await?;
self.config.write().await.user_token.replace(user_token.clone());
self.config.write().await.bot_token.replace(user_token.clone());
}
Ok(user_token.token)
@ -171,6 +157,16 @@ async fn on_privmsg(state: Arc<State>, event: &Message, message: &str) -> anyhow
Ok(())
}
use twitch_api2::pubsub::{
Response as PubSubResponse,
TopicData,
channel_points::ChannelPointsChannelV1Reply,
};
use std::time::Instant;
use twitch_api2::pubsub::video_playback::VideoPlaybackReply;
use crate::app::config::Config;
use twitch_api2::twitch_oauth2::TwitchToken;
pub async fn handle_pubsub(state: Arc<State>, event: WsMessage) -> anyhow::Result<()> {
let json = match event {
WsMessage::Text(json) => json,
@ -180,7 +176,7 @@ pub async fn handle_pubsub(state: Arc<State>, event: WsMessage) -> anyhow::Resul
let response = twitch_api2::pubsub::Response::parse(&json)?;
match response {
PubSubResponse::Message { data } => match data {
PubSubResponse::Message {data} => match data {
TopicData::ChannelPointsChannelV1 { reply, .. } => handle_channel_points_reply(state, reply).await,
TopicData::VideoPlaybackById { reply, .. } => handle_stream_status(state, reply).await,
_ => Ok(()),
@ -189,91 +185,12 @@ pub async fn handle_pubsub(state: Arc<State>, event: WsMessage) -> anyhow::Resul
}
}
async fn rename_a_split(state: Arc<State>, redemption: &Redemption) {
let input = match &redemption.user_input {
Some(i) => i,
None => {
if let Err(e) = update_redemption_status(&*state, &redemption, CustomRewardRedemptionStatus::Canceled).await {
eprintln!("could not update redemption status: {:?}", e);
}
return;
}
};
let (old, new) = match input.split_once("=>")
.or_else(|| input.split_once("==>"))
.or_else(|| input.split_once("->"))
.or_else(|| input.split_once("-->"))
.or_else(|| input.split_once(">"))
.or_else(|| input.split_once(">>"))
{
Some(x) => x,
None => {
if let Err(e) = update_redemption_status(&*state, &redemption, CustomRewardRedemptionStatus::Canceled).await {
eprintln!("could not update redemption status: {:?}", e);
}
return;
}
};
let fulfilled = match reqwest::Client::new()
.post(&format!("{}/rename", state.user_config.livesplit.server))
.body(format!("{}\n{}", old.trim(), new.trim()))
.send()
.await
.and_then(|resp| resp.error_for_status())
{
Ok(_) => true,
Err(e) => {
eprintln!("could not do split rename: {:?}", e);
false
}
};
let status = if fulfilled {
CustomRewardRedemptionStatus::Fulfilled
} else {
CustomRewardRedemptionStatus::Canceled
};
if let Err(e) = update_redemption_status(&*state, &redemption, status).await {
eprintln!("could not update redemption status: {:?}", e);
}
}
async fn update_redemption_status(state: &State, redemption: &Redemption, status: CustomRewardRedemptionStatus) -> anyhow::Result<()> {
let req = UpdateRedemptionStatusRequest::builder()
.broadcaster_id(state.user_config.twitch.channel_id.to_string())
.reward_id(redemption.reward.id.clone())
.id(redemption.id.clone())
.build();
let body = UpdateRedemptionStatusBody::builder()
.status(status)
.build();
let token = state.twitch.user_token().await?;
state.twitch.client.helix.req_patch(req, body, &token).await
.context("could not update redemption status")?;
Ok(())
}
async fn handle_channel_points_reply(state: Arc<State>, reply: Box<ChannelPointsChannelV1Reply>) -> anyhow::Result<()> {
let redemption = match *reply {
ChannelPointsChannelV1Reply::RewardRedeemed { redemption, .. } => redemption,
_ => return Ok(()),
};
if redemption.reward.id.to_string() == "2205b59c-62d4-4dc1-bf27-2a96f3fcf2ca" {
let state = Arc::clone(&state);
let redemption = redemption.clone();
tokio::task::spawn(async move {
rename_a_split(state, &redemption).await;
});
}
let action = match state.config.read().await.redemptions.iter().find(|re| re.twitch_id == redemption.reward.id).map(Clone::clone) {
Some(a) => a,
None => return Ok(()),

6
src/app/user_config.rs
View File

@ -7,7 +7,6 @@ pub struct UserConfig {
pub twitch: Twitch,
pub bot: Bot,
pub web: Web,
pub livesplit: LiveSplit,
}
#[derive(Deserialize)]
@ -27,8 +26,3 @@ pub struct Web {
pub address: IpAddr,
pub port: u16,
}
#[derive(Deserialize)]
pub struct LiveSplit {
pub server: String,
}

56
src/app/web/route/livesplit.rs
View File

@ -15,8 +15,6 @@ pub fn livesplit_routes(state: Arc<State>) -> BoxedFilter<(impl Reply, )> {
.or(livesplit_split(Arc::clone(&state)))
.or(livesplit_reset(Arc::clone(&state)))
.or(livesplit_finish(Arc::clone(&state)))
.or(livesplit_open(Arc::clone(&state)))
.or(livesplit_close(Arc::clone(&state)))
)
.boxed()
}
@ -46,11 +44,6 @@ const REWARDS: &[RewardPauseInfo] = &[
},
];
const REQUIRE_OPEN_LIVESPLIT: &[&str] = &[
"2205b59c-62d4-4dc1-bf27-2a96f3fcf2ca",
"3ea308c5-eeb8-4c46-88a5-d12555257b61",
];
async fn set_reward_paused(state: Arc<State>, id: String, paused: bool) -> anyhow::Result<()> {
let request = UpdateCustomRewardRequest::builder()
.broadcaster_id(state.user_config.twitch.channel_id.to_string())
@ -61,24 +54,9 @@ async fn set_reward_paused(state: Arc<State>, id: String, paused: bool) -> anyho
.build();
state.twitch.client.helix.req_patch(request, body, &state.twitch.user_token().await?).await?;
Ok(())
}
async fn set_open_close_rewards_paused(state: Arc<State>, open: bool) -> Vec<anyhow::Result<()>> {
let mut results = Vec::with_capacity(REQUIRE_OPEN_LIVESPLIT.len());
for id in REQUIRE_OPEN_LIVESPLIT {
let is_paused = state.rewards_paused.read().await.get(*id).copied();
if is_paused == Some(!open) {
continue;
}
state.rewards_paused.write().await.insert(id.to_string(), !open);
results.push(set_reward_paused(Arc::clone(&state), id.to_string(), !open).await);
}
results
}
async fn set_rewards_paused(state: Arc<State>, data: LiveSplitBody, paused: bool) -> Vec<anyhow::Result<()>> {
let mut results = Vec::with_capacity(REWARDS.len());
for info in REWARDS {
@ -125,21 +103,6 @@ fn rewards_filter(state: Arc<State>, data: LiveSplitBody, paused: bool) -> impl
}
}
fn open_close_filter(state: Arc<State>, open: bool) -> impl Future<Output=Result<(), Rejection>> {
async move {
for result in set_open_close_rewards_paused(state, open).await {
if result.is_err() {
return Err(warp::reject::custom(CustomRejection::TwitchError));
}
}
Ok(())
}
}
fn livesplit_open(state: Arc<State>) -> BoxedFilter<(impl Reply, )> {
livesplit_open_close_route(state, "open", true)
}
fn livesplit_start(state: Arc<State>) -> BoxedFilter<(impl Reply, )> {
livesplit_route(state, "start", false)
}
@ -156,10 +119,6 @@ fn livesplit_finish(state: Arc<State>) -> BoxedFilter<(impl Reply, )> {
livesplit_route(state, "finish", true)
}
fn livesplit_close(state: Arc<State>) -> BoxedFilter<(impl Reply, )> {
livesplit_open_close_route(state, "close", false)
}
fn livesplit_route(state: Arc<State>, path: &'static str, paused: bool) -> BoxedFilter<(impl Reply,)> {
warp::path("livesplit")
.and(warp::path(path))
@ -184,21 +143,6 @@ fn livesplit_route(state: Arc<State>, path: &'static str, paused: bool) -> Boxed
.boxed()
}
fn livesplit_open_close_route(state: Arc<State>, path: &'static str, open: bool) -> BoxedFilter<(impl Reply, )> {
warp::path("livesplit")
.and(warp::path(path))
.and(warp::path::end())
.and_then(move || {
let state = Arc::clone(&state);
async move {
open_close_filter(state, open).await
}
})
.untuple_one()
.map(|| warp::reply())
.boxed()
}
#[derive(Deserialize)]
#[serde(rename_all = "PascalCase")]
#[allow(dead_code)]

57
src/app/web/route/redemptions.rs
View File

@ -1,5 +1,5 @@
use twitch_api2::{
helix::points::{CreateCustomRewardRequest, CreateCustomRewardBody, GetCustomRewardRequest, CustomReward},
helix::points::{GetCustomRewardRequest, CustomReward},
types::RewardId,
};
use warp::{
@ -13,7 +13,7 @@ use crate::app::{
config::Redemption,
web::{
CustomRejection,
template::redemptions::{RedemptionsTemplate, AddRedemptionTemplate, CreateRedemptionTemplate, ListRedemptionsTemplate},
template::redemptions::{RedemptionsTemplate, AddRedemptionTemplate, ListRedemptionsTemplate},
},
};
use std::{
@ -28,12 +28,10 @@ pub fn redemptions_routes(state: Arc<State>) -> BoxedFilter<(impl Reply, )> {
redemptions_get(Arc::clone(&state))
.or(redemptions_add_get())
.or(redemptions_list_get(Arc::clone(&state)))
.or(redemptions_create_get())
)
.or(warp::post().and(
redemptions_add_post(Arc::clone(&state))
.or(redemptions_delete_post(Arc::clone(&state)))
.or(redemptions_create_post(Arc::clone(&state)))
))
.boxed()
}
@ -96,57 +94,6 @@ fn redemptions_add_post(state: Arc<State>) -> BoxedFilter<(impl Reply, )> {
.boxed()
}
fn redemptions_create_get() -> BoxedFilter<(impl Reply, )> {
warp::path("redemptions")
.and(warp::path("create"))
.and(warp::path::end())
.map(|| CreateRedemptionTemplate)
.boxed()
}
fn redemptions_create_post(state: Arc<State>) -> BoxedFilter<(impl Reply, )> {
warp::path("redemptions")
.and(warp::path("create"))
.and(warp::path::end())
.and(warp::body::content_length_limit(1024 * 5))
.and(warp::body::form())
.and_then(move |mut form: HashMap<String, String>| {
let state = Arc::clone(&state);
async move {
let form_get = try {
let name = form.remove("name")?;
name
};
let name = match form_get {
Some(x) => x,
None => return Err(warp::reject::custom(CustomRejection::InvalidForm)),
};
let request = CreateCustomRewardRequest::builder()
.broadcaster_id(state.user_config.twitch.channel_id.to_string())
.build();
let body = CreateCustomRewardBody::builder()
.title(name)
.cost(100)
.build();
let token = match state.twitch.user_token().await {
Ok(token) => token,
Err(_) => return Err(warp::reject::custom(CustomRejection::TwitchError)),
};
let _reward: CustomReward = match state.twitch.client.helix.req_post(request, body, &token).await {
Ok(resp) => resp.data,
Err(_) => return Err(warp::reject::custom(CustomRejection::TwitchError)),
};
Ok(warp::redirect(Uri::from_static("/redemptions/list")))
}
})
.boxed()
}
fn redemptions_delete_post(state: Arc<State>) -> BoxedFilter<(impl Reply, )> {
warp::path("redemptions")
.and(warp::path("delete"))

4
src/app/web/template/redemptions.rs
View File

@ -17,7 +17,3 @@ pub struct AddRedemptionTemplate;
pub struct ListRedemptionsTemplate {
pub rewards: Vec<CustomReward>,
}
#[derive(Template)]
#[template(path = "create_redemption.html")]
pub struct CreateRedemptionTemplate;

18
templates/create_redemption.html
View File

@ -1,18 +0,0 @@
{% extends "_base.html" %}
{% block title %}Create redemption{% endblock %}
{% block body %}
<ul class="breadcrumbs">
<li><a href="/">Home</a></li>
<li><a href="/redemptions">Redemptions</a></li>
<li><a href="/redemptions/add">Add</a></li>
<li><a href="/redemptions/list">List</a></li>
<li class="current"><a href="/redemptions/create">Create</a></li>
</ul>
<form action="/redemptions/create" method="post">
<input type="text" name="name" placeholder="Name"/>
<button type="submit">Create</button>
</form>
{% endblock %}