diff --git a/html/account-me.ejs b/html/account-me.ejs index 5fc4b73a..63109dee 100644 --- a/html/account-me.ejs +++ b/html/account-me.ejs @@ -5,220 +5,195 @@ Poke | Subscriptions - + + @@ -229,101 +204,306 @@ h1 {

My subscriptions

- User: <%= userid %> + + + + User: + + + <%= userid %> +
-
-
+ <% + const subKeys = (userSubs && Object.keys(userSubs)) || []; + const subCount = subKeys.length; + const groups = {}; + subKeys.forEach(function(channelID){ + const c = userSubs[channelID] || {}; + const nm = (c.channelName || '').trim(); + const first = (nm[0] || '#').toUpperCase(); + const key = /^[A-Z]$/.test(first) ? first : '#'; + if(!groups[key]) groups[key] = []; + groups[key].push({ id: channelID, c: c }); + }); + const letters = Object.keys(groups).sort(); + letters.forEach(function(L){ + groups[L].sort(function(a,b){ + const an = (a.c.channelName||'').toLowerCase(); + const bn = (b.c.channelName||'').toLowerCase(); + return an.localeCompare(bn,'en',{sensitivity:'base'}); + }); + }); + %> + + +
+ - 0 subscriptions + + <%= subCount %> <%= subCount === 1 ? 'subscription' : 'subscriptions' %> -
- -
- <% if (userSubs && Object.keys(userSubs).length) { %> - <% Object.keys(userSubs).forEach(function(channelID){ const c = userSubs[channelID]; %> -
- Avatar of <%= c.channelName %> -
<%= c.channelName %>
-
- unsub - view + + + + +
+ <% letters.forEach(function(L){ %> +

<%= L %>

+
+ <% groups[L].forEach(function(entry){ const c = entry.c; const channelID = entry.id; %> +
+ Avatar of <%= c.channelName %> +
<%= c.channelName %>
+
+ unsub + view +
-
- <% }) %> - <% } %> + <% }) %> +
+ <% }) %>
+ + + +