Commit 37f3c1bb authored by 神楽坂玲奈's avatar 神楽坂玲奈

尝试修复匹配积分不正确的问题

parent 132eef84
...@@ -83,10 +83,12 @@ export class AppsService { ...@@ -83,10 +83,12 @@ export class AppsService {
let appsURL = 'https://api.mycard.moe/apps.json'; let appsURL = 'https://api.mycard.moe/apps.json';
let keysURL = 'https://api.mycard.moe/keys'; let keysURL = 'https://api.mycard.moe/keys';
try { try {
let params = new URLSearchParams();
params.set('user_id', this.loginService.user.email);
let data = await this.http.get(appsURL).map((response) => response.json()).toPromise(); let data = await this.http.get(appsURL).map((response) => response.json()).toPromise();
let keys_data = await this.http.get(keysURL, { search: params }).map((response) => response.json()).toPromise(); let keys_data = await this.http.get(keysURL, {
search: {
user_id: this.loginService.user.email
}
}).map((response) => response.json()).toPromise();
for (let item of keys_data) { for (let item of keys_data) {
let app = data.find((app: any) => app.id === item.app_id); let app = data.find((app: any) => app.id === item.app_id);
if (app) { if (app) {
......
...@@ -385,10 +385,12 @@ export class YGOProComponent implements OnInit, OnDestroy { ...@@ -385,10 +385,12 @@ export class YGOProComponent implements OnInit, OnDestroy {
this.replays = await this.get_replays(); this.replays = await this.get_replays();
// https://mycard.moe/ygopro/api/user?username=ozxdno // https://mycard.moe/ygopro/api/user?username=ozxdno
let params = new URLSearchParams();
params.set('username', this.loginService.user.username);
try { try {
let points = await this.http.get('https://mycard.moe/ygopro/api/user', { search: params }) let points = await this.http.get('https://mycard.moe/ygopro/api/user', {
search: {
username: this.loginService.user.username
}
})
.map((response) => response.json()) .map((response) => response.json())
.toPromise(); .toPromise();
this.points.emit(points); this.points.emit(points);
...@@ -586,14 +588,14 @@ export class YGOProComponent implements OnInit, OnDestroy { ...@@ -586,14 +588,14 @@ export class YGOProComponent implements OnInit, OnDestroy {
let headers = new Headers(); let headers = new Headers();
headers.append('Authorization', headers.append('Authorization',
'Basic ' + Buffer.from(this.loginService.user.username + ':' + this.loginService.user.external_id).toString('base64')); 'Basic ' + Buffer.from(this.loginService.user.username + ':' + this.loginService.user.external_id).toString('base64'));
let search = new URLSearchParams();
search.set('arena', arena);
search.set('locale', this.settingsService.getLocale());
match_started_at = new Date(); match_started_at = new Date();
this.matching_arena = matching_arena = arena; this.matching_arena = matching_arena = arena;
this.matching = matching = this.http.post('https://api.mycard.moe/ygopro/match', null, { this.matching = matching = this.http.post('https://api.mycard.moe/ygopro/match', null, {
headers: headers, headers: headers,
search: search search: {
arena,
locale: this.settingsService.getLocale()
}
}).map(response => response.json()) }).map(response => response.json())
.subscribe((data) => { .subscribe((data) => {
this.join(data['password'], { address: data['address'], port: data['port'] }); this.join(data['password'], { address: data['address'], port: data['port'] });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment