eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-16 10:40:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: eightball:52ebb7d9d1902075bd42bc23fc4b922211e4b428
Branches Tags
eightball:main
eightball:dependabot/cargo/time-0.3.47
eightball:dependabot/cargo/bytes-1.11.1
eightball:alyssa-dev
eightball:alyssa-econnreset-fix-test
eightball:skye-avatars
eightball:iris-dev
eightball:dependabot/cargo/rsa-0.9.10
eightball:skye-dev
eightball:dependabot/npm_and_yarn/dashboard/vite-5.4.20
eightball:iris-cv2
eightball:iris/modern-apikeys
eightball:new-ci
eightball:feat/application-commands
eightball:rustproxy
eightball:new-docs
eightball:legacy
..
compare: eightball:78606f4a9f45865ef7fd278b8519667bde9778d6
Branches Tags
eightball:main
eightball:dependabot/cargo/time-0.3.47
eightball:dependabot/cargo/bytes-1.11.1
eightball:alyssa-dev
eightball:alyssa-econnreset-fix-test
eightball:skye-avatars
eightball:iris-dev
eightball:dependabot/cargo/rsa-0.9.10
eightball:skye-dev
eightball:dependabot/npm_and_yarn/dashboard/vite-5.4.20
eightball:iris-cv2
eightball:iris/modern-apikeys
eightball:new-ci
eightball:feat/application-commands
eightball:rustproxy
eightball:new-docs
eightball:legacy

No commits in common. "52ebb7d9d1902075bd42bc23fc4b922211e4b428" and "78606f4a9f45865ef7fd278b8519667bde9778d6" have entirely different histories.
52ebb7d9d1 ... 78606f4a9f

7 changed files with 2 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ci/Dockerfile.rust
View file

@ -34,7 +34,6 @@ RUN cargo build --bin avatars --release --target x86_64-unknown-linux-musl
RUN cargo build --bin avatar_cleanup --release --target x86_64-unknown-linux-musl
RUN cargo build --bin scheduled_tasks --release --target x86_64-unknown-linux-musl
RUN cargo build --bin gdpr_worker --release --target x86_64-unknown-linux-musl
RUN cargo build --bin premium --release --target x86_64-unknown-linux-musl
FROM alpine:latest
@ -46,4 +45,3 @@ COPY --from=binary-builder /build/target/x86_64-unknown-linux-musl/release/avata
COPY --from=binary-builder /build/target/x86_64-unknown-linux-musl/release/avatar_cleanup /avatar_cleanup
COPY --from=binary-builder /build/target/x86_64-unknown-linux-musl/release/scheduled_tasks /scheduled_tasks
COPY --from=binary-builder /build/target/x86_64-unknown-linux-musl/release/gdpr_worker /gdpr_worker
COPY --from=binary-builder /build/target/x86_64-unknown-linux-musl/release/premium /premium

1
ci/rust-docker-target.sh
View file

@ -49,4 +49,3 @@ RUN apk add gcompat
EOF
)"
build gdpr_worker
build premium

8
crates/premium/src/auth.rs
View file

@ -171,14 +171,6 @@ pub async fn middleware(
});
}
}
"/info/" => {
let response = next.run(request).await;
if let Some(ref session) = session {
refresh_session_cookie(session, response)
} else {
response
}
}
"/login" => {
if let Some(ref session) = session {
// no session here because that shows the "you're logged in as" component

1
crates/premium/src/main.rs
View file

@ -61,7 +61,6 @@ fn router(ctx: ApiContext) -> Router {
// processed upside down (???) so we have to put middleware at the end
Router::new()
.route("/", get(home_handler))
.route("/info/", get(|| async { Html(include_str!("../templates/info.html")) }))
.route("/login/{token}", get(|| async {
"handled in auth middleware"

5
crates/premium/templates/cancel.html
View file

@ -25,8 +25,5 @@
{% endif %}
<br/><br/>
<span>for assistance please email us at <a href="mailto:billing@pluralkit.me">billing@pluralkit.me</a></span>
<br/>
<br/><a href="/info/">pricing/refunds</a>
<br/><a href="/">home</a>
<p>for assistance please email us at <a href="mailto:billing@pluralkit.me">billing@pluralkit.me</a></p>
</body>

5
crates/premium/templates/index.html
View file

@ -146,8 +146,5 @@ error initializing paddle client
{% endif %}
<br/><br/>
<span>for assistance please email us at <a href="mailto:billing@pluralkit.me">billing@pluralkit.me</a></span>
<br/>
<br/><a href="/info/">pricing/refunds</a>
<br/><a href="/">home</a>
<p>for assistance please email us at <a href="mailto:billing@pluralkit.me">billing@pluralkit.me</a></p>
</body>

19
crates/premium/templates/info.html
View file

@ -1,19 +0,0 @@
<!DOCTYPE html>
<head>
<title>Billing information - PluralKit Premium</title>
<link rel="stylesheet" href="/static/stylesheet.css" />
</head>
<body>
<h2>PluralKit Premium</h2>
<h3>Pricing</h3>
<p>PluralKit Premium costs $5/mo plus tax applied as per your region.<br/>For any plans longer than 1 month, the equivalent price is applied - for instance, a 3-month plan is $15/3mo plus tax, or a yearly plan is $60/year plus tax.<br/>There is no discount for pre-paying multiple months.</p>
<h3>Refund policy</h3>
<p>We will process any refund requests at our discretion, or where required by law.</p>
<br/><br/>
<span>for assistance please email us at <a href="mailto:billing@pluralkit.me">billing@pluralkit.me</a></span>
<br/>
<br/><a href="/info/">pricing/refunds</a>
<br/><a href="/">home</a>
</body>