nki/youmubot
1
0
Fork 0
mirror of https://github.com/natsukagami/youmubot.git synced 2025-04-21 01:38:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: nki:f9e8f3b90f3a24b831961180bbfa216aaec939dc
Branches Tags
nki:master
nki:osu-commands-with-editable
nki:arona
nki:osu-app-commands
nki:rosu-v2
nki:debug
nki:flake-module
nki:osu-check-paging
nki:random-fixes
nki:oppai-integration
..
compare: nki:70b1491e3bcb1670df5fe0d33fe34e24a8ebf9c8
Branches Tags
nki:master
nki:osu-commands-with-editable
nki:arona
nki:osu-app-commands
nki:rosu-v2
nki:debug
nki:flake-module
nki:osu-check-paging
nki:random-fixes
nki:oppai-integration

No commits in common. "f9e8f3b90f3a24b831961180bbfa216aaec939dc" and "70b1491e3bcb1670df5fe0d33fe34e24a8ebf9c8" have entirely different histories.
f9e8f3b90f ... 70b1491e3b

6 changed files with 487 additions and 990 deletions
Show stats Expand all files Collapse all files

1453
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

12
flake.lock generated
View file

@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1743315132, "lastModified": 1734424634,
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "52faf482a3889b7619003c0daec593a1912fddc1", "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -48,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743475035, "lastModified": 1734747996,
"narHash": "sha256-uLjVsb4Rxnp1zmFdPCDmdODd4RY6ETOeRj0IkC0ij/4=", "narHash": "sha256-0DUuObdcPITVOMMymq2y6YlM++QEWXZO3cTm6RGYgL8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "bee11c51c2cda3ac57c9e0149d94b86cc1b00d13", "rev": "f9086701f5f3d36b8e5f4a3b9c93579ebc2581e6",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
package.nix
View file

@ -19,10 +19,8 @@ rustPlatform.buildRustPackage {
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"poise-0.6.1" = "sha256-iXyp9sR/vzPsexGPdRjfuKyFcGqvDdqiBAXnuw/HFo8="; "poise-0.6.1" = "sha256-44pPe02JJ97GEpzAXdQmDq/9bb4KS9G7ZFVlBRC6EYs=";
"rosu-map-0.2.0" = "sha256-muCaRn/9qBxr2SJJ8F2HL9se4SLCL9ttI06tCoFfaNg="; "rosu-v2-0.9.0" = "sha256-dx0EwqqgkLaHwCPHyn5vMkhZ2NZcahH5SACFcsJKP1E=";
"rosu-v2-0.10.0" = "sha256-44J/gnlsADel8+P3qjIIvA6Rdlt3D4F5hPwW7HEV2js=";
"rosu-pp-2.0.0" = "sha256-1xQR6b7CFLaBECdbZcF5vflESCQjCtEiJNH7mmTkLl4=";
}; };
}; };

2
rust-toolchain.toml
View file

@ -1,2 +1,2 @@
[toolchain] [toolchain]
channel = "1.85.0" channel = "1.83.0"

2
youmubot-osu/Cargo.toml
View file

@ -17,7 +17,7 @@ dashmap = "5.3.4"
lazy_static = "1.4.0" lazy_static = "1.4.0"
regex = "1.5.6" regex = "1.5.6"
reqwest = "0.11.10" reqwest = "0.11.10"
rosu-pp = { git = "https://github.com/MaxOhn/rosu-pp", branch = "pp-update" } rosu-pp = "2.0.0"
rosu-v2 = { git = "https://github.com/MaxOhn/rosu-v2", branch = "lazer" } rosu-v2 = { git = "https://github.com/MaxOhn/rosu-v2", branch = "lazer" }
rosu-map = "0.1" rosu-map = "0.1"
time = "0.3" time = "0.3"

2
youmubot-osu/src/models/rosu.rs
View file

@ -113,7 +113,7 @@ impl From<rosu::score::Score> for Score {
fn from(s: rosu::score::Score) -> Self { fn from(s: rosu::score::Score) -> Self {
let legacy_stats = s.statistics.as_legacy(s.mode); let legacy_stats = s.statistics.as_legacy(s.mode);
let score = if s.set_on_lazer { let score = if s.set_on_lazer {
s.score as u64 s.score
} else { } else {
s.classic_score s.classic_score
} as u64; } as u64;