Skip to content

Commit 2c71541

Browse files
authored
Fix S8 permalink (#1427)
* Update permalink * Parse S8 versioning
1 parent 1f37b97 commit 2c71541

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

src/services/logic-loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class LogicLoader {
2727
}
2828

2929
static #logicFileUrl(fileName) {
30-
return `https://raw.githubusercontent.com/LagoLunatic/wwrando/${Settings.getVersion()}/logic/${fileName}`;
30+
return `https://raw.githubusercontent.com/tanjo3/wwrando/${Settings.getVersion()}/logic/${fileName}`;
3131
}
3232
}
3333

src/services/permalink.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Permalink {
2929
[this.OPTIONS.SWORD_MODE]: SWORD_MODE_OPTIONS,
3030
};
3131

32-
static DEFAULT_PERMALINK = 'eJwLtlAIyS8tykvMTc0rUSgzjDdJMTc3szRlcGS4+7mIo8GYQcDBkQEIGoCon1EAxJRgsnOuN/gov+F/tgkDGNzxaOBweXJa3cZWnkHA4x8TUI0DgwiDK2OFBhcAM80Y0g==';
32+
static DEFAULT_PERMALINK = 'eJwLtlAIyS8tykvMTc0rUSgzYnBkuPu5iKPBmEHAwZEBCBqAqJ9RAMSUYLJzrjf4KL/hf7YJAxjc8WjgcHlyWt3GVp5BwOMfE1CNA4MIgytjhQYXAGZ7Fso=';
3333

3434
static getVersion(binaryString) {
3535
const clonedString = binaryString.clone();

src/services/settings.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,13 @@ class Settings {
144144
};
145145

146146
static #parseVersion(version) {
147-
const commitHashMatch = version.match(/([a-f\d]){7,}/);
148-
const versionMatch = version.match(/^[0-9.]+$/);
147+
const s8VersionMatch = version.match(/(v\d+)/);
148+
if (_.first(s8VersionMatch)) {
149+
return `s8-${_.first(s8VersionMatch)}`;
150+
}
149151

150-
return _.first(commitHashMatch) || _.first(versionMatch) || 'master';
152+
const commitHashMatch = version.match(/([a-f\d]){7,}/);
153+
return _.first(commitHashMatch) || 'master';
151154
}
152155
}
153156

0 commit comments

Comments
 (0)