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

Fix mismatched user IDs when combining completely different archives

Browse Source 
Closes #17
This commit is contained in:
chylex 2018-02-05 14:31:37 +01:00
parent 22993e60a9
commit a298061098
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tracker/savefile.js
View File

@ -211,8 +211,10 @@ SAVEFILE.prototype.countMessages = function(){
};
SAVEFILE.prototype.combineWith = function(obj){
var userMap = {};
for(var userId in obj.meta.users){
this.findOrRegisterUser(userId, obj.meta.users[userId].name);
userMap[obj.meta.userindex.findIndex(id => id == userId)] = this.findOrRegisterUser(userId, obj.meta.users[userId].name);
}
for(var channelId in obj.meta.channels){
@ -221,8 +223,14 @@ SAVEFILE.prototype.combineWith = function(obj){
}
for(var channelId in obj.data){
for(var messageId in obj.data[channelId]){
this.addMessage(channelId, messageId, obj.data[channelId][messageId]);
var oldChannel = obj.data[channelId];
for(var messageId in oldChannel){
var oldMessage = oldChannel[messageId];
var oldUser = oldMessage.u;
oldMessage.u = userMap[oldUser] || oldUser;
this.addMessage(channelId, messageId, oldMessage);
}
}
};