third-party-mirrors/Discord-History-Tracker
1
0
Fork 0
mirror of https://github.com/chylex/Discord-History-Tracker.git synced 2025-04-15 08:00:33 +03:00
Code Issues Projects Releases Wiki Activity

Fix 'Upload & Combine' using wrong user if that user's index was 0

Browse Source 
Closes #40
This commit is contained in:
chylex 2019-09-19 19:43:16 +02:00
parent 9c69ea6135
commit 9ba966ff8b
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/tracker/savefile.js
View File

@ -233,6 +233,7 @@ class SAVEFILE{
combineWith(obj){
var userMap = {};
var shownError = false;
for(var userId in obj.meta.users){
userMap[obj.meta.userindex.findIndex(id => id == userId)] = this.findOrRegisterUser(userId, obj.meta.users[userId].name);
@ -250,8 +251,23 @@ class SAVEFILE{
var oldMessage = oldChannel[messageId];
var oldUser = oldMessage.u;
oldMessage.u = userMap[oldUser] || oldUser;
this.addMessage(channelId, messageId, oldMessage);
if (oldUser in userMap){
oldMessage.u = userMap[oldUser];
this.addMessage(channelId, messageId, oldMessage);
}
else{
if (!shownError){
shownError = true;
alert("The uploaded archive appears to be corrupted, some messages will be skipped. See console for details.");
console.error("User list:", obj.meta.users);
console.error("User index:", obj.meta.userindex);
console.error("Generated mapping:", userMap);
console.error("Missing user for the following messages:");
}
console.error(oldMessage);
}
}
}
}