From 23714ee0a607c2fb0ca4f83cc84d231ec7efd4d8 Mon Sep 17 00:00:00 2001
From: Evert <imsonotsleepy@gmail.com>
Date: Wed, 3 Jan 2018 19:40:23 +0200
Subject: [PATCH 1/9] Change parent of dialog

---
 src/script/component/OAuthClients.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/component/OAuthClients.vue b/src/script/component/OAuthClients.vue
index d049c1c..99d0a54 100644
--- a/src/script/component/OAuthClients.vue
+++ b/src/script/component/OAuthClients.vue
@@ -6,7 +6,7 @@
       pagination(:page="pagination.page" :pages="pagination.pages" v-on:page="getClients")
       .list.client
         o-auth-client(v-for="client in clients" v-bind="client" :key="client.id")
-        client-modal(:show="editing != 0" @close='editing = 0', :id='editing')
+    client-modal(:show="editing != 0" @close='editing = 0', :id='editing')
 </template>
 
 <script type="text/javascript">

From da200be57d03a62575c179392614fd70205652bf Mon Sep 17 00:00:00 2001
From: Evert <imsonotsleepy@gmail.com>
Date: Wed, 3 Jan 2018 19:41:32 +0200
Subject: [PATCH 2/9] it's current_year :p

---
 views/layout.pug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/layout.pug b/views/layout.pug
index 1e0410f..32cf33d 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -116,7 +116,7 @@ html
 							i.fa.fa-fw.fa-twitter
 						a.socialbtn#discord(href="https://discord.gg/Xe7MKSx" target="_blank")
 							span.discordlogo
-					span &copy; 2017 - Icy Network - Some Rights Reserved
+					span &copy; 2018 - Icy Network - Some Rights Reserved
 					br
 					span 
 						a(href="/docs/terms-of-service") Terms of Service

From 23551fc6bb9a43bb5ee50e0ea3bddad47c196cb3 Mon Sep 17 00:00:00 2001
From: Evert <imsonotsleepy@gmail.com>
Date: Wed, 3 Jan 2018 19:55:55 +0200
Subject: [PATCH 3/9] Add NoScript

---
 src/script/main.js      |  2 ++
 src/style/main.styl     | 10 ++++++++++
 views/index.pug         |  6 ++----
 views/layout.pug        |  3 +++
 views/user/settings.pug |  4 +---
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/script/main.js b/src/script/main.js
index fa7cc44..5bafa62 100644
--- a/src/script/main.js
+++ b/src/script/main.js
@@ -48,6 +48,7 @@ $(document).ready(function () {
   }
 
   function loadAuthorizations () {
+    $('#clientlist').html('<span class="load"><i class="fa fa-spin fa-spinner fa-2x"></i><span>Loading list</span></span>')
     $.get({
       url: '/api/oauth2/authorized-clients',
       dataType: 'json',
@@ -185,6 +186,7 @@ $(document).ready(function () {
   }
 
   if ($('.newsfeed').length) {
+    $('.newsfeed').html('<span class="load"><i class="fa fa-spin fa-spinner fa-2x"></i><span>Loading feed</span></span>')
     $.ajax({
       type: 'get',
       url: '/api/news',
diff --git a/src/style/main.styl b/src/style/main.styl
index 92959b7..c8d41a5 100644
--- a/src/style/main.styl
+++ b/src/style/main.styl
@@ -584,6 +584,16 @@ select
             display: inline-block
             vertical-align: top
 
+noscript
+    position: fixed
+    display: block
+    width: 100%
+    background-color: rgba(255, 95, 95, 0.6)
+    color: #fff
+    text-shadow: 1px 1px 3px #000
+    text-align: center
+    z-index: 100
+
 @media all and (max-width: 800px)
     .navigator
         padding: 0 10px
diff --git a/views/index.pug b/views/index.pug
index 52ed2ef..3d1138a 100644
--- a/views/index.pug
+++ b/views/index.pug
@@ -23,7 +23,5 @@ block body
 		.content
 			h1 Icy Network News
 			.newsfeed
-				span.load
-					i.fa.fa-spin.fa-spinner.fa-2x
-					span Loading feed
-			a.older(href="/news") View older articles
+				p Please enable JavaScript to view this content.
+			a.older(href="/news") View all articles
diff --git a/views/layout.pug b/views/layout.pug
index 32cf33d..d8f32fa 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -44,6 +44,9 @@ html
 		title
 			block title
 	body
+		noscript
+			h2 This site requires JavaScript to work properly!
+			p Please consider enabling JavaScript for the full experience.
 		block banner
 			.banner
 				.logo
diff --git a/views/user/settings.pug b/views/user/settings.pug
index ab84f12..8a63c7a 100644
--- a/views/user/settings.pug
+++ b/views/user/settings.pug
@@ -69,6 +69,4 @@ block body
 					h2 Authorized Applications
 						.specify(title="Applications which have access to basic user information. You may restrict access at any time by pressing the red icon on the top right of the application card.") ?
 					.cl#clientlist
-						span.load
-							i.fa.fa-spin.fa-spinner.fa-2x
-							span Loading list
+						p Please enable JavaScript to view this content.

From fcc6dceb1dc1db3485da4b4809ae2f9096394e3f Mon Sep 17 00:00:00 2001
From: Evert <imsonotsleepy@gmail.com>
Date: Wed, 3 Jan 2018 19:58:11 +0200
Subject: [PATCH 4/9] Change text on the Donate dialog

---
 views/donate.pug | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/donate.pug b/views/donate.pug
index 86d0325..6d22ca4 100644
--- a/views/donate.pug
+++ b/views/donate.pug
@@ -7,7 +7,7 @@ block body
 		.boxcont
 			.box#donate
 				h1 Donate
-				p Donating any amount would be highly appreciated!
+				p Donations help us pay for the services required to keep Icy Network running. Donating any amount would be highly appreciated!
 				
 				- var formurl = "https://www.paypal.com/cgi-bin/webscr"
 				if sandbox
@@ -42,4 +42,4 @@ block body
 							i.fa.fa-fw.fa-paypal
 							|Donate
 					br
-					b Currently you can only donate using a PayPal account.
+					b Currently you can only donate using PayPal.

From 0f8205a75d9cdd5a215dacd73185c520001b6ff4 Mon Sep 17 00:00:00 2001
From: Evert <imsonotsleepy@gmail.com>
Date: Thu, 4 Jan 2018 15:01:59 +0200
Subject: [PATCH 5/9] Add changed date to ToS and Privacy

---
 documents/privacy-policy.html   | 1 +
 documents/terms-of-service.html | 2 ++
 src/style/main.styl             | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/documents/privacy-policy.html b/documents/privacy-policy.html
index e0f84c0..20a3a65 100644
--- a/documents/privacy-policy.html
+++ b/documents/privacy-policy.html
@@ -1,5 +1,6 @@
 <div class="tos">
 <h1>Privacy Policy</h1>
+<span class="last-modified">Last modified: Friday, 13 Oct 2017</span>
 <p>By using Services of Icy Network, you acknowledge and agree to these policies.</p>
 <h2>Information We Collect and Use</h2>
 <p>Icy Network may collect and save some information about our users.</p>
diff --git a/documents/terms-of-service.html b/documents/terms-of-service.html
index 5878d56..62b97b6 100644
--- a/documents/terms-of-service.html
+++ b/documents/terms-of-service.html
@@ -1,5 +1,6 @@
 <div class="tos">
 <h1>Terms of Service</h1>
+<span class="last-modified">Last modified: Wednesday, 03 Jan 2018</span>
 <p>Please read the following Terms and Conditions carefully. By using Icy Network services, you signify that you have read, understood and agreed to be bound by these Terms and Conditions. Icy Network reserves the right to modify, replace or remove any of the Terms and Conditions written in this document at any given time without restrictions. We will try to notify you of any such amendments. If you do not agree to these Terms and Conditions, you may not use any of the services provided by Icy Network.</p>
 <p>Separate entities owned by Icy Network may have their own Terms and Conditions which you must read and comply with.</p>
 <h2>Who May Use the Services</h2>
@@ -16,4 +17,5 @@
 <h4>Credits</h4>
 <p>Google Play and the Google Play logo are trademarks of Google Inc.</p>
 <p>Apple and the Apple logo are trademarks of Apple Inc., registered in the U.S. and other countries. App Store is a service mark of Apple Inc., registered in the U.S. and other countries.</p>
+<p>Font Awesome by Dave Gandy - <a href="http://fontawesome.io" target="_blank" rel="_nofollow">http://fontawesome.io</a></p>
 </div>
diff --git a/src/style/main.styl b/src/style/main.styl
index c8d41a5..f3d1438 100644
--- a/src/style/main.styl
+++ b/src/style/main.styl
@@ -594,6 +594,11 @@ noscript
     text-align: center
     z-index: 100
 
+.last-modified
+    font-style: italic
+    color: #7d7d7d
+    display: block
+
 @media all and (max-width: 800px)
     .navigator
         padding: 0 10px

From 8000270a6483bf557feb4421e7e680de4303379b Mon Sep 17 00:00:00 2001
From: Evert <imsonotsleepy@gmail.com>
Date: Thu, 4 Jan 2018 16:09:48 +0200
Subject: [PATCH 6/9] Attempt to make a better mobile navigation

---
 src/script/main.js  |  5 ---
 src/style/main.styl | 91 +++++++++++++++++++++++++--------------------
 views/layout.pug    | 38 ++++++-------------
 3 files changed, 62 insertions(+), 72 deletions(-)

diff --git a/src/script/main.js b/src/script/main.js
index 5bafa62..5cf8937 100644
--- a/src/script/main.js
+++ b/src/script/main.js
@@ -165,11 +165,6 @@ $(document).ready(function () {
     }, 1000, 'swing')
   })
 
-  $('#mobile').click(function (e) {
-    e.preventDefault()
-    $('.flexview').toggleClass('extended')
-  })
-
   $('body').click(function (e) {
     if (!$(e.target).is('#mobile') && !$(e.target).is('#mobile i') && $('.flexview').hasClass('extended')) {
       $('.flexview').removeClass('extended')
diff --git a/src/style/main.styl b/src/style/main.styl
index f3d1438..d8867f9 100644
--- a/src/style/main.styl
+++ b/src/style/main.styl
@@ -45,10 +45,13 @@ a
     display: none !important
 
 .navigator
+    position: relative
     padding: 0 50px
     transition: background-color 0.1s linear
     background-color: rgb(0, 219, 247)
     z-index: 5
+    height: 68px
+    
     &.fix
         top: 0
         left: 0
@@ -57,6 +60,7 @@ a
         background-color: rgba(0, 219, 247, 0.67)
 
     #navlogo
+        float: left
         &.hidden
             display: none
 
@@ -83,6 +87,19 @@ a
             transition: background-color 0.1s linear
             &:hover
                 background-color: rgba(255, 255, 255, 0.25)
+    
+    .showButton
+        margin: 0
+        padding: 20px
+        display: none
+        float: right
+        font-size: 150%
+        position: relative
+        cursor: pointer
+        color: green
+    
+    .menu:hover > .list
+        max-height: 500px
 
 section
     font-family: "Open Sans"
@@ -146,41 +163,9 @@ section
     width: 60%
     font-size: 120%
 
-//.cssextend:hover > .flexview
-//    display: block
-//    left: 40%
-
 .g-recaptcha
     margin-top: 10px
 
-ul.flexview
-    position: fixed
-    right: 0
-    left: 100%
-    width: auto
-    top: 68px
-    bottom: 0
-    background-color: rgba(53, 53, 53, 0.8)
-    z-index: 1
-    overflow: hidden
-    transition: all 0.1s linear
-
-    .division
-        border-top: 1px solid #a7a7a7
-
-    li
-        display: block
-        min-width: 100px
-        a
-            display: block
-            padding: 5px 20px
-            color: #fff
-            font-weight: normal
-            text-transform: none
-    &.extended
-        display: block
-        left: 40%
-
 code
     white-space: pre
 
@@ -222,7 +207,7 @@ button, .button, input[type="submit"]
         box-shadow: 5px 5px 15px #868686
         border: 1px solid #ddd
         margin-bottom: 10%
-        h1:first-child, h2:first-child, h3:first-child
+        h1:first-child, h3:first-child
             margin-top: 0
         .left, .right
             display: inline-block
@@ -316,7 +301,7 @@ button, .button, input[type="submit"]
     border: 1px solid #ddd
     border-radius: 5px
     text-decoration: none
-    display: inline-block
+    display: block
     cursor: pointer
     i
         color: #fff
@@ -397,11 +382,14 @@ span.divider
     .info
         margin-left: 130px
         .name
-            font-size: 150%
+            font-size: 120%
             font-weight: bold
+            text-overflow: ellipsis
+            overflow: hidden
         .description
             font-size: 80%
             font-style: italic
+            word-wrap: break-word
         .url
             display: block
             text-overflow: ellipsis
@@ -602,14 +590,37 @@ noscript
 @media all and (max-width: 800px)
     .navigator
         padding: 0 10px
+    .showButton
+        display: inline-block !important
+        
+    .menu
+        .list
+            display: block
+            position: absolute
+            top: 68px
+            left: 0
+            right: 0
+            background-color: rgba(0, 188, 212, 0.72)
+            transition: max-height 0.1s linear
+            max-height: 0
+            overflow: hidden
+            
+            ul, li, li a
+                display: block
+            
+            li a
+                padding: 6px 20px
+                color: #ffffff
+                text-transform: none
+            
+            .floating
+                float: none !important
+                border-top: 2px solid #00a1b5
+
     #navlogo
         display: inline-block !important
     .banner
         display: none
-    .fullview 
-        display: none !important
-    .mobview
-        display: inline-block !important
     .logo
         font-size: 10vw
     .document
@@ -635,7 +646,7 @@ noscript
             float: initial !important
             display: block !important
             border: 0 !important
-            width: fit-content !important
+            width: 300px !important
             margin: auto
     .dialog
         width: 100vw !important
diff --git a/views/layout.pug b/views/layout.pug
index d8f32fa..74f5e02 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -63,39 +63,23 @@ html
 		block nav
 			.anchor
 			nav.navigator
-				ul
-					li.hidden#navlogo
-						a(href="/")
-							.logo.small
-								.part1 Icy
-								.part2 Network
-					li.fullview
-						a.scroll(href="/#home") Home
-					li.fullview
-						a.scroll(href="/#news") News
-					li.fullview
-						a(href="https://forum.icynet.eu/") Forum
-				ul.fullview.floating
-					if user
-						li#user
-							a(href="/user/manage") #{user.display_name}
-						li
-							a(href="/logout") Log out
-					else
-						li
-							a(href="/login") Log in
-				ul.mobview.floating
-					li.cssextend
-						a#mobile(href="#")
-							i.fa.fa-fw.fa-bars
-						ul.flexview
+				li.hidden#navlogo
+					a(href="/")
+						.logo.small
+							.part1 Icy
+							.part2 Network
+				.menu
+					.showButton(for="show-menu")
+						i.fa.fa-fw.fa-bars
+					.list
+						ul
 							li
 								a.scroll(href="/#home") Home
 							li
 								a.scroll(href="/#news") News
 							li
 								a(href="https://forum.icynet.eu/") Forum
-							.division
+						ul.floating
 							if user
 								li#user
 									a(href="/user/manage") #{user.display_name}

From 57605c7424bbea34761b032f4042ea59842aa73c Mon Sep 17 00:00:00 2001
From: Evert <imsonotsleepy@gmail.com>
Date: Thu, 4 Jan 2018 16:16:48 +0200
Subject: [PATCH 7/9] Toggle navigation

---
 src/script/main.js  | 8 ++++++++
 src/style/main.styl | 7 +++++--
 views/layout.pug    | 3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/script/main.js b/src/script/main.js
index 5cf8937..65b4160 100644
--- a/src/script/main.js
+++ b/src/script/main.js
@@ -120,6 +120,14 @@ $(document).ready(function () {
     })
   }
 
+  $('body').click(function (e) {
+    $('#show-menu').prop('checked', false)
+  })
+
+  $('.menu').click(function (e) {
+    e.stopPropagation()
+  })
+
   $('#dialog #close').click(function (e) {
     window.Dialog.close()
   })
diff --git a/src/style/main.styl b/src/style/main.styl
index d8867f9..be20dca 100644
--- a/src/style/main.styl
+++ b/src/style/main.styl
@@ -98,8 +98,11 @@ a
         cursor: pointer
         color: green
     
-    .menu:hover > .list
-        max-height: 500px
+    input[type=checkbox]
+        display: none
+
+        &:checked ~ .list
+            max-height: 500px
 
 section
     font-family: "Open Sans"
diff --git a/views/layout.pug b/views/layout.pug
index 74f5e02..d1be3d5 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -69,8 +69,9 @@ html
 							.part1 Icy
 							.part2 Network
 				.menu
-					.showButton(for="show-menu")
+					label.showButton(for="show-menu")
 						i.fa.fa-fw.fa-bars
+					input(type="checkbox" id="show-menu")
 					.list
 						ul
 							li

From 4df05ad316adb79db7fc3b42c9a50527dffb33b2 Mon Sep 17 00:00:00 2001
From: Evert <imsonotsleepy@gmail.com>
Date: Sat, 27 Jan 2018 12:19:06 +0200
Subject: [PATCH 8/9] Slight style changes, piwik is now matomo

---
 config.example.toml |  6 ++++++
 server/server.js    |  4 ++--
 src/style/main.styl | 24 +++++++++++++++++-------
 views/layout.pug    | 11 ++++++++---
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/config.example.toml b/config.example.toml
index 19f5469..d5d8808 100644
--- a/config.example.toml
+++ b/config.example.toml
@@ -85,3 +85,9 @@
 [logger]
 	write=true
 	file="/var/log/icynet.log"
+
+# Matomo tracking
+#[matomo]
+#	site_id=
+#	site_domain="icynet.eu"
+#	track_url="//analytics.icynet.eu/"
diff --git a/server/server.js b/server/server.js
index 82a8549..1415559 100644
--- a/server/server.js
+++ b/server/server.js
@@ -53,8 +53,8 @@ app.use((req, res, next) => {
   })
 
   // Add Piwik tracker if configured
-  if (config.piwik && config.piwik.site_id) {
-    res.locals.piwik = config.piwik
+  if (config.matomo && config.matomo.site_id) {
+    res.locals.matomo = config.matomo
   }
 
   next()
diff --git a/src/style/main.styl b/src/style/main.styl
index be20dca..af880f2 100644
--- a/src/style/main.styl
+++ b/src/style/main.styl
@@ -69,8 +69,6 @@ a
         margin: 0
         display: inline-block
         list-style-type: none
-        &.floating
-            float: right
 
     li
         font-size: 30px
@@ -98,6 +96,13 @@ a
         cursor: pointer
         color: green
     
+    .list
+        display: flex
+        flex-direction: row
+        
+        .floating
+            margin-left: auto
+
     input[type=checkbox]
         display: none
 
@@ -154,12 +159,13 @@ section
 .wrapper
     overflow: hidden
     min-height: 100vh
+    width: 100%
 
 .document
     overflow: hidden
-    min-height: 100vh;
-    padding: 50px;
-    background-color: #fff;
+    min-height: 100vh
+    padding: 50px
+    background-color: #fff
 
 .tos
     display: inline-block
@@ -182,6 +188,7 @@ input:not([type="submit"])
     border-radius: 5px
     border: 1px solid #c1c1c1
     background-color: #f5f5f5
+    color: #000
     box-shadow: inset 2px 2px 5px #ddd
     transition: border 0.1s linear
 
@@ -189,6 +196,7 @@ button, .button, input[type="submit"]
     display: block
     padding: 5px 10px
     background-color: #fbfbfb
+    color: #000
     border: 1px solid #c1c1c1
     border-radius: 5px
     font-size: 120%
@@ -197,6 +205,9 @@ button, .button, input[type="submit"]
     &.active
         background-color: #ddd
 
+input[disabled]
+    color: #959595
+
 .button
     display: inline-block
     margin-right: 5px
@@ -617,7 +628,6 @@ noscript
                 text-transform: none
             
             .floating
-                float: none !important
                 border-top: 2px solid #00a1b5
 
     #navlogo
@@ -649,7 +659,7 @@ noscript
             float: initial !important
             display: block !important
             border: 0 !important
-            width: 300px !important
+            width: auto !important
             margin: auto
     .dialog
         width: 100vw !important
diff --git a/views/layout.pug b/views/layout.pug
index d1be3d5..2c4433e 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -3,16 +3,18 @@ html
 	head
 		meta(charset="utf8")
 		meta(name="viewport", content="width=device-width, initial-scale=1")
-		if piwik
+		if matomo
 			script(type="text/javascript").
 				var _paq = _paq || [];
 				  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+				_paq.push(["setCookieDomain", "*.#{matomo.site_domain}"]);
+				_paq.push(["setDomains", ["*.#{matomo.site_domain}"]]);
 				_paq.push(['trackPageView']);
 				_paq.push(['enableLinkTracking']);
 				(function() {
-					var u="#{piwik.track_url}";
+					var u="#{matomo.track_url}";
 					_paq.push(['setTrackerUrl', u+'piwik.php']);
-					_paq.push(['setSiteId', '#{piwik.site_id}']);
+					_paq.push(['setSiteId', '#{matomo.site_id}']);
 					var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
 					g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
 				})();
@@ -47,6 +49,9 @@ html
 		noscript
 			h2 This site requires JavaScript to work properly!
 			p Please consider enabling JavaScript for the full experience.
+			if matomo
+				p
+					img(src="#{matomo.track_url}piwik.php?idsite=1&rec=1" style="border:0;" alt="")
 		block banner
 			.banner
 				.logo

From 265acc187f11b5d98885ac414712334aa3f34a18 Mon Sep 17 00:00:00 2001
From: Evert <imsonotsleepy@gmail.com>
Date: Sat, 27 Jan 2018 13:07:36 +0200
Subject: [PATCH 9/9] Implement Atom feed for news page

---
 package-lock.json      | 15 +++++++++-
 package.json           |  1 +
 server/api/news.js     | 63 ++++++++++++++++++++++++++++++++++++++----
 server/routes/index.js | 14 ++++++++++
 src/script/main.js     |  2 +-
 views/layout.pug       |  8 ++++++
 views/news/article.pug | 13 +++++++++
 views/news/news.pug    |  3 ++
 8 files changed, 112 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index efb7f42..3255d55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "icynet.eu",
-  "version": "0.0.1-alpha1",
+  "version": "0.9.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2679,6 +2679,14 @@
         "pend": "1.2.0"
       }
     },
+    "feed": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/feed/-/feed-1.1.1.tgz",
+      "integrity": "sha1-kUiXUX6U+jJ8xvc7tYWkfEqe0yE=",
+      "requires": {
+        "xml": "1.0.1"
+      }
+    },
     "figures": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
@@ -7740,6 +7748,11 @@
         "mkdirp": "0.5.1"
       }
     },
+    "xml": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
+      "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU="
+    },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
diff --git a/package.json b/package.json
index 1b1dd65..f7b64d7 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "express": "^4.16.2",
     "express-rate-limit": "^2.9.0",
     "express-session": "^1.15.6",
+    "feed": "^1.1.1",
     "fs-extra": "^4.0.2",
     "gm": "^1.23.0",
     "knex": "^0.13.0",
diff --git a/server/api/news.js b/server/api/news.js
index 3ccb650..41d88da 100644
--- a/server/api/news.js
+++ b/server/api/news.js
@@ -1,8 +1,13 @@
 import API from './index'
 import Models from './models'
+import config from '../../scripts/load-config'
+
+import Feed from 'feed'
 
 const perPage = 8
 
+let feed
+
 function slugify (title) {
   return title.toLowerCase().replace(/\W/g, '-').substring(0, 32)
 }
@@ -22,13 +27,12 @@ async function cleanArticle (entry, shortenContent = false) {
   if (poster) {
     article.author = {
       id: poster.id,
-      display_name: poster.display_name
+      display_name: poster.display_name,
+      email: poster.email
     }
   }
 
-  if (shortenContent) {
-    article.content = article.content.replace(/(<([^>]+)>)/ig, '').substring(0, 128) + '...'
-  }
+  article.description = article.content.replace(/(<([^>]+)>)/ig, '').replace(/\n/g, ' ').substring(0, 197) + '...'
 
   return article
 }
@@ -43,7 +47,7 @@ const News = {
     let articles = []
     for (let i in news) {
       let entry = news[i]
-      articles.push(await cleanArticle(entry, true))
+      articles.push(await cleanArticle(entry))
     }
 
     return articles
@@ -102,6 +106,55 @@ const News = {
     let result = await Models.News.query().patchAndFetchById(id, patch)
     if (!result) throw new Error('Something went wrong.')
     return {}
+  },
+  generateFeed: async () => {
+    if (feed && new Date(feed.options.updated).getTime() > Date.now() - 3600000) return feed // Update feed hourly
+
+    let posts = await Models.News.query().orderBy('created_at', 'desc').limit(perPage)
+    let cleanNews = []
+
+    for (let i in posts) {
+      cleanNews.push(await cleanArticle(posts[i]))
+    }
+
+    feed = new Feed({
+      title: 'Icy Network News',
+      description: 'Icy Network News',
+      id: config.server.domain + '/news',
+      link: config.server.domain + '/news',
+      image: config.server.domain + '/static/image/icynet-icon.png',
+      favicon: config.server.domain + '/favicon.ico',
+      copyright: '2018 Icy Network - Some Rights Reserved',
+      updated: new Date(),
+      feedLinks: {
+        json: config.server.domain + '/news/feed.json',
+        atom: config.server.domain + '/news/atom.xml'
+      },
+      author: {
+        name: 'Icy Network',
+        email: 'icynet@lunasqu.ee',
+        link: config.server.domain
+      }
+    })
+
+    for (let i in cleanNews) {
+      let post = cleanNews[i]
+
+      feed.addItem({
+        title: post.title,
+        id: post.id,
+        link: `${config.server.domain}/news/${post.id}-${slugify(post.title)}`,
+        description: post.description,
+        content: post.content,
+        author: [{
+          name: post.author.display_name,
+          email: post.author.email
+        }],
+        date: new Date(post.updated_at)
+      })
+    }
+
+    return feed
   }
 }
 
diff --git a/server/routes/index.js b/server/routes/index.js
index 93f1947..0fd035e 100644
--- a/server/routes/index.js
+++ b/server/routes/index.js
@@ -797,6 +797,20 @@ router.get('/news/', wrap(async (req, res) => {
   res.render('news/news', {news: news})
 }))
 
+router.get('/news/atom.xml', wrap(async (req, res) => {
+  let feed = await News.generateFeed()
+
+  res.set('Content-Type', 'application/atom+xml')
+  res.send(feed.atom1())
+}))
+
+router.get('/news/feed.json', wrap(async (req, res) => {
+  let feed = await News.generateFeed()
+
+  res.set('Content-Type', 'application/json')
+  res.send(feed.json1())
+}))
+
 // Render partials
 router.get('/partials/:view', (req, res, next) => {
   if (!req.params.view) return next()
diff --git a/src/script/main.js b/src/script/main.js
index 65b4160..b510445 100644
--- a/src/script/main.js
+++ b/src/script/main.js
@@ -204,7 +204,7 @@ $(document).ready(function () {
           html += '<div class="prvarticle">'
           html += '<a class="title" href="/news/' + article.id + '-' + article.slug + '">' + article.title + '</a>'
           html += '<span class="timestamp">Published at ' + new Date(article.created_at) + '</span>'
-          html += '<div class="prvcontent">' + article.content + '</div>'
+          html += '<div class="prvcontent">' + article.description + '</div>'
           html += '<a href="/news/' + article.id + '-' + article.slug + '">Read More</a>'
           html += '</div>'
         }
diff --git a/views/layout.pug b/views/layout.pug
index 2c4433e..2edeb80 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -3,6 +3,14 @@ html
 	head
 		meta(charset="utf8")
 		meta(name="viewport", content="width=device-width, initial-scale=1")
+		block meta
+			meta(name="og:title", content="Icy Network")
+			meta(name="og:description", content="Icy Network is a Global Network of Communities and Websites, United by a Single Login")
+			meta(name="og:image", content="https://icynet.eu/static/image/icynet-icon.png")
+			meta(name="og:type", content="website")
+			meta(name="twitter:card", content="summary")
+			meta(name="twitter:title", content="Icy Network")
+			meta(name="twitter:description", content="Icy Network is a Global Network of Communities and Websites, United by a Single Login")
 		if matomo
 			script(type="text/javascript").
 				var _paq = _paq || [];
diff --git a/views/news/article.pug b/views/news/article.pug
index 65ad88b..4e3c647 100644
--- a/views/news/article.pug
+++ b/views/news/article.pug
@@ -1,5 +1,18 @@
 extends ../layout.pug
 
+block meta
+	if article
+		meta(name="description", content=article.description)
+		meta(name="og:title", content=article.title)
+		meta(name="og:description", content=article.description)
+		meta(name="og:image", content="https://icynet.eu/static/image/icynet-icon.png")
+		meta(name="og:type", content="article")
+		meta(name="og:updated_time", content=article.updated_at)
+		meta(name="twitter:card", content="summary")
+		meta(name="twitter:title", content=article.title)
+		meta(name="twitter:description", content=article.description)
+		link(rel="alternate", href="/news/atom.xml", title="Icy Network News", type="application/atom+xml")
+
 block append links
 	if editing
 		script(src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.7.2/ckeditor.js")
diff --git a/views/news/news.pug b/views/news/news.pug
index f099aab..2caf28a 100644
--- a/views/news/news.pug
+++ b/views/news/news.pug
@@ -1,5 +1,8 @@
 extends ../layout.pug
 
+block append meta
+	link(rel="alternate", href="/news/atom.xml", title="Icy Network News", type="application/atom+xml")
+
 block title
 	|Icy Network - News