mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Export: Properly generate directory names for nameless groups (#1421)

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-09-01 07:33:30 -07:00 • committed by GitHub
parent 94b63c39fd
commit 07abe2639f
1 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
js/backup.js
View file

@ -404,25 +404,13 @@
// 1. Human-readable, for easy use and verification by user (names not just ids) // 1. Human-readable, for easy use and verification by user (names not just ids)
// 2. Sorted just like the list of conversations in the left-pan (active_at) // 2. Sorted just like the list of conversations in the left-pan (active_at)
// 3. Disambiguated from other directories (active_at, truncated name, id) // 3. Disambiguated from other directories (active_at, truncated name, id)
function getPrivateConversationDirName(conversation) { function getConversationDirName(conversation) {
var name = conversation.active_at || 'never';
if (conversation.name) { if (conversation.name) {
return ' (' + conversation.name.slice(0, 30) + ' ' + conversation.id + ')'; return ' (' + conversation.name.slice(0, 30) + ' ' + conversation.id + ')';
} else { } else {
return ' (' + conversation.id + ')'; return ' (' + conversation.id + ')';
} }
}
function getGroupConversationDirName(conversation) {
return ' (' + conversation.name.slice(0, 30) + ' ' + conversation.id + ')';
}
function getConversationDirName(conversation) {
var name = conversation.active_at || 'never';
if (conversation.type === 'private') {
name += getPrivateConversationDirName(conversation);
} else {
name += getGroupConversationDirName(conversation);
}
return name; return name;
} }