Fix NPE condition. Update notification regex rules.

Author: Rustam Aliyev

modules/core/src/main/java/com/elasticinbox/core/cassandra/CassandraLabelDAO.java

@@ -84,7 +84,14 @@ public LabelMap getAllWithMetadata(final Mailbox mailbox)
 
 		for (int labelId : counters.keySet())
 		{
-			labels.get(labelId).setCounters(counters.get(labelId));
+			if (labels.containsId(labelId) && counters.containsKey(labelId)) {
+				labels.get(labelId).setCounters(counters.get(labelId));
+			} else if (labels.containsId(labelId) && !counters.containsKey(labelId)) {
+				// assume zeros for all counters if not yet initialised
+				labels.get(labelId).setCounters(new LabelCounters());
+			} else if (!labels.containsId(labelId) && counters.containsKey(labelId)) {
+				logger.warn("Found counters for label {}, but label does not exist.", labelId);
+			}
 		}
 
 		return labels;

modules/lmtp/src/main/java/com/elasticinbox/lmtp/filter/NotificationMailFilter.java

@@ -56,10 +56,18 @@ public Message filter(Message message)
 					|| from.matches("(.+)\\@pages\\.facebookmail\\.com")
 					|| from.matches("bezotveta\\@odnoklassniki\\.ru")
 					|| from.matches("admin\\@vkontakte\\.ru")
-					|| from.matches("(.+)\\-(.+)\\@postmaster\\.twitter\\.com")
+					|| from.matches("admin\\@notify\\.vk\\.com")
+					|| from.matches("(.+)\\@postmaster\\.twitter\\.com")
+					|| from.matches("(.+)\\@bounce\\.twitter\\.com")
+					|| from.matches("info\\@twitter\\.com")
+					|| from.matches("notify\\@twitter\\.com")
+					|| from.matches("(.+)\\@email\\.foursquare\\.com")
+					|| from.matches("(.+)\\@email\\.pinterest\\.com")
 					|| from.matches("(.+)\\@bounce\\.linkedin\\.com")
 					|| from.matches("(.+)\\@linkedin\\.com")
 					|| from.matches("noreply\\-(.+)\\@plus\\.google\\.com")
+					|| from.matches("notifications\\@meetmemail\\.com")
+					|| from.matches("notification\\+(.+)\\@netlogmail\\.com")
 					|| from.matches("notifications\\+(.+)\\@zyngamail\\.com"))
 			{
 				logger.debug("Applying filter for NOTIFICATIONS");