1 files changed, 57 insertions, 37 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/NotifParser.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/NotifParser.kt
index 8aa8e706..b8aa899b 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/NotifParser.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/NotifParser.kt
@@ -1,7 +1,27 @@
+/*
+ * Copyright 2018 Allan Wang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.pitchedapps.frost.facebook.parsers
 
 import com.pitchedapps.frost.dbflow.CookieModel
-import com.pitchedapps.frost.facebook.*
+import com.pitchedapps.frost.facebook.FB_EPOCH_MATCHER
+import com.pitchedapps.frost.facebook.FB_NOTIF_ID_MATCHER
+import com.pitchedapps.frost.facebook.FbItem
+import com.pitchedapps.frost.facebook.formattedFbUrl
+import com.pitchedapps.frost.facebook.get
 import com.pitchedapps.frost.services.NotificationContent
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -13,8 +33,8 @@ import org.jsoup.nodes.Element
 object NotifParser : FrostParser<FrostNotifs> by NotifParserImpl()
 
 data class FrostNotifs(
-        val notifs: List<FrostNotif>,
-        val seeMore: FrostLink?
+    val notifs: List<FrostNotif>,
+    val seeMore: FrostLink?
 ) : ParseNotification {
     override fun toString() = StringBuilder().apply {
         append("FrostNotifs {\n")
@@ -24,19 +44,19 @@ data class FrostNotifs(
     }.toString()
 
     override fun getUnreadNotifications(data: CookieModel) =
-            notifs.asSequence().filter(FrostNotif::unread).map {
-                with(it) {
-                    NotificationContent(
-                            data = data,
-                            id = id,
-                            href = url,
-                            title = null,
-                            text = content,
-                            timestamp = time,
-                            profileUrl = img
-                    )
-                }
-            }.toList()
+        notifs.asSequence().filter(FrostNotif::unread).map {
+            with(it) {
+                NotificationContent(
+                    data = data,
+                    id = id,
+                    href = url,
+                    title = null,
+                    text = content,
+                    timestamp = time,
+                    profileUrl = img
+                )
+            }
+        }.toList()
 }
 
 /**
@@ -49,14 +69,16 @@ data class FrostNotifs(
  * [timeString] text version of time from Facebook
  * [thumbnailUrl] optional thumbnail url if existent
  */
-data class FrostNotif(val id: Long,
-                      val img: String?,
-                      val time: Long,
-                      val url: String,
-                      val unread: Boolean,
-                      val content: String,
-                      val timeString: String,
-                      val thumbnailUrl: String?)
+data class FrostNotif(
+    val id: Long,
+    val img: String?,
+    val time: Long,
+    val url: String,
+    val unread: Boolean,
+    val content: String,
+    val timeString: String,
+    val thumbnailUrl: String?
+)
 
 private class NotifParserImpl : FrostParserBase<FrostNotifs>(false) {
 
@@ -67,8 +89,8 @@ private class NotifParserImpl : FrostParserBase<FrostNotifs>(false) {
     override fun parseImpl(doc: Document): FrostNotifs? {
         val notificationList = doc.getElementById("notifications_list") ?: return null
         val notifications = notificationList
-                .getElementsByAttributeValueMatching("id", ".*${FB_NOTIF_ID_MATCHER.pattern}.*")
-                .mapNotNull(this::parseNotif)
+            .getElementsByAttributeValueMatching("id", ".*${FB_NOTIF_ID_MATCHER.pattern}.*")
+            .mapNotNull(this::parseNotif)
         val seeMore = parseLink(doc.getElementsByAttributeValue("href", "/notifications.php?more").first())
         return FrostNotifs(notifications, seeMore)
     }
@@ -79,22 +101,20 @@ private class NotifParserImpl : FrostParserBase<FrostNotifs>(false) {
         val epoch = FB_EPOCH_MATCHER.find(abbr.attr("data-store"))[1]?.toLongOrNull() ?: -1L
         //fetch id
         val id = FB_NOTIF_ID_MATCHER.find(element.id())[1]?.toLongOrNull()
-                ?: System.currentTimeMillis() % FALLBACK_TIME_MOD
+            ?: System.currentTimeMillis() % FALLBACK_TIME_MOD
         val img = element.getInnerImgStyle()
         val timeString = abbr.text()
         val content = a.text().replace("\u00a0", " ").removeSuffix(timeString).trim() //remove &nbsp;
         val thumbnail = element.selectFirst("img.thumbnail")?.attr("src")
         return FrostNotif(
-                id = id,
-                img = img,
-                time = epoch,
-                url = a.attr("href").formattedFbUrl,
-                unread = !element.hasClass("acw"),
-                content = content,
-                timeString = timeString,
-                thumbnailUrl = if (thumbnail?.isNotEmpty() == true) thumbnail else null
+            id = id,
+            img = img,
+            time = epoch,
+            url = a.attr("href").formattedFbUrl,
+            unread = !element.hasClass("acw"),
+            content = content,
+            timeString = timeString,
+            thumbnailUrl = if (thumbnail?.isNotEmpty() == true) thumbnail else null
         )
     }
-
-
 }