This commit is contained in:
Natsumi
2022-02-13 12:21:15 +13:00
parent 9349dc3fad
commit bf365ff63c

View File

@@ -5986,16 +5986,16 @@ speechSynthesis.getVoices();
}) })
.then(() => { .then(() => {
API.login({ API.login({
username: loginParmas.username, username: loginParmas.username,
password: loginParmas.password, password: loginParmas.password,
endpoint: loginParmas.endpoint endpoint: loginParmas.endpoint
})
.catch(() => {
this.loginForm.loading = false;
API.logout();
}) })
.catch(() => { .then(() => {
this.loginForm.loading = false; this.loginForm.loading = false;
API.logout();
})
.then(() => {
this.loginForm.loading = false;
}); });
}); });
} }
@@ -10581,13 +10581,13 @@ speechSynthesis.getVoices();
var friendLogHistory = { var friendLogHistory = {
created_at: new Date().toJSON(), created_at: new Date().toJSON(),
type: 'Unfriend', type: 'Unfriend',
userId: id, userId: id,
displayName: ctx.displayName displayName: ctx.displayName
}; };
this.friendLogTable.data.push(friendLogHistory); this.friendLogTable.data.push(friendLogHistory);
database.addFriendLogHistory(friendLogHistory); database.addFriendLogHistory(friendLogHistory);
this.queueFriendLogNoty(friendLogHistory); this.queueFriendLogNoty(friendLogHistory);
this.friendLog.delete(id); this.friendLog.delete(id);
database.deleteFriendLogCurrent(id); database.deleteFriendLogCurrent(id);
this.notifyMenu('friendLog'); this.notifyMenu('friendLog');
this.updateSharedFeed(true); this.updateSharedFeed(true);
@@ -10624,30 +10624,30 @@ speechSynthesis.getVoices();
if (ctx.displayName) { if (ctx.displayName) {
var friendLogHistory = { var friendLogHistory = {
created_at: new Date().toJSON(), created_at: new Date().toJSON(),
type: 'DisplayName', type: 'DisplayName',
userId: ref.id, userId: ref.id,
displayName: ref.displayName, displayName: ref.displayName,
previousDisplayName: ctx.displayName previousDisplayName: ctx.displayName
}; };
} else { } else {
var friendLogHistory = { var friendLogHistory = {
created_at: new Date().toJSON(), created_at: new Date().toJSON(),
type: 'Friend', type: 'Friend',
userId: ref.id, userId: ref.id,
displayName: ref.displayName displayName: ref.displayName
}; };
} }
this.friendLogTable.data.push(friendLogHistory); this.friendLogTable.data.push(friendLogHistory);
database.addFriendLogHistory(friendLogHistory); database.addFriendLogHistory(friendLogHistory);
this.queueFriendLogNoty(friendLogHistory); this.queueFriendLogNoty(friendLogHistory);
var friendLogCurrent = { var friendLogCurrent = {
userId: ref.id, userId: ref.id,
displayName: ref.displayName, displayName: ref.displayName,
trustLevel: ref.$trustLevel trustLevel: ref.$trustLevel
}; };
this.friendLog.set(ref.id, friendLogCurrent); this.friendLog.set(ref.id, friendLogCurrent);
database.setFriendLogCurrent(friendLogCurrent); database.setFriendLogCurrent(friendLogCurrent);
ctx.displayName = ref.displayName; ctx.displayName = ref.displayName;
this.notifyMenu('friendLog'); this.notifyMenu('friendLog');
this.updateSharedFeed(true); this.updateSharedFeed(true);
} }