git.iko.soy/webring
on master help sign in
Merge branch 'master' into master
179ba06Лu Лinveгa
links/main.css+2
compare with master
unifiedsplit
@@ -40,6 +40,8 @@ body #hallway .entry .body { display: block;border-bottom: 1px solid #333;paddin
40body #hallway .entry .body a { text-decoration: underline; }
40body #hallway .entry .body a { text-decoration: underline; }
41body #hallway .entry .body .channel { display: inline-block;border-radius: 1px;font-family: 'input_mono_medium';color: #777; }
41body #hallway .entry .body .channel { display: inline-block;border-radius: 1px;font-family: 'input_mono_medium';color: #777; }
42body #hallway .entry .body .user { display: inline-block;border-radius: 1px;font-family: 'input_mono_medium';color: #777; }
42body #hallway .entry .body .user { display: inline-block;border-radius: 1px;font-family: 'input_mono_medium';color: #777; }
43+body #hallway .entry .body .user.local::before { content:'@';color: #777; }
44+body #hallway .entry .body .user.external::before { content:'^';color: #777; }
43body #hallway .entry .body .tag { display: inline-block;border-radius: 1px;font-family: 'input_mono_medium';color: #777; }
45body #hallway .entry .body .tag { display: inline-block;border-radius: 1px;font-family: 'input_mono_medium';color: #777; }
44body #hallway .entry.highlight .author { color:#555; }
46body #hallway .entry.highlight .author { color:#555; }
45body #hallway .entry:hover .author { color:#ccc; }
47body #hallway .entry:hover .author { color:#ccc; }
scripts/hallway.js+4−3
@@ -48,7 +48,8 @@ function Hallway (sites) {
48 </ul>
48 </ul>
49 <div id='pagination'>
49 <div id='pagination'>
50 ${[...Array(Math.ceil(relevantEntries.length / 20)).keys()].reduce((acc, num) => `${acc}<span class='${Number(hallway.finder.page) === num + 1 ? 'selected' : ''}' onclick='filter("${this.finder.filter}^${num + 1}")'>${num + 1}</span>`, '')}
50 ${[...Array(Math.ceil(relevantEntries.length / 20)).keys()].reduce((acc, num) => `${acc}<span class='${Number(hallway.finder.page) === num + 1 ? 'selected' : ''}' onclick='filter("${this.finder.filter}^${num + 1}")'>${num + 1}</span>`, '')}
51− </div>`
51+ </div>
52+ <a id='showbar' onclick="toggleVisibility('sidebar');"></a>`
52
53
53 this._sidebar.innerHTML = `
54 this._sidebar.innerHTML = `
54 <a id='hidebar' onclick="toggleVisibility('sidebar');"></a>
55 <a id='hidebar' onclick="toggleVisibility('sidebar');"></a>
@@ -101,7 +102,7 @@ function Hallway (sites) {
101
102
102 this.findMention = function (found) {
103 this.findMention = function (found) {
103 const mention = Object.keys(feeds).filter(user => found.indexOf(feeds[user].path) > -1)
104 const mention = Object.keys(feeds).filter(user => found.indexOf(feeds[user].path) > -1)
104− return mention.length === 1 ? ` <span class='user'>@${mention[0]}</span>` : ` <span class='user'>${found}</span>`
105+ return mention.length === 1 ? ` <span class='user local'>${mention[0]}</span>` : ` <span class='user external'>${found.substr(5).split(' ')[0]}</span>`
105 }
106 }
106
107
107 this.templateEntry = function (entry) {
108 this.templateEntry = function (entry) {
@@ -155,7 +156,7 @@ function Hallway (sites) {
155 for (const id in lines) {
156 for (const id in lines) {
156 const line = lines[id].trim()
157 const line = lines[id].trim()
157 if (line === '') { continue }
158 if (line === '') { continue }
158− const parts = line.replace(' ', '\t').split('\t')
159+ const parts = line.replace(' ', '\t').split('\t')
159 const date = parts[0].trim()
160 const date = parts[0].trim()
160 const body = escapeHtml(parts[1].trim()).trim()
161 const body = escapeHtml(parts[1].trim()).trim()
161 const channel = body.substr(0, 1) === '/' ? body.split(' ')[0].substr(1).toLowerCase() : body.substr(0, 1) === '@' ? 'veranda' : 'lobby'
162 const channel = body.substr(0, 1) === '/' ? body.split(' ')[0].substr(1).toLowerCase() : body.substr(0, 1) === '@' ? 'veranda' : 'lobby'
scripts/sites.js+8−6
@@ -7,11 +7,10 @@ const sites = [
7 { url: 'https://wiki.xxiivv.com', title: 'xxiivv', type: 'wiki', author: 'neauoire', contact: 'aliceffekt@gmail.com', rss: 'https://wiki.xxiivv.com/links/rss.xml', feed: 'https://wiki.xxiivv.com/twtxt.txt', feed: 'https://wiki.xxiivv.com/twtxt.txt', wiki: 'https://wiki.xxiivv.com/scripts/database/glossary.ndtl' },
7 { url: 'https://wiki.xxiivv.com', title: 'xxiivv', type: 'wiki', author: 'neauoire', contact: 'aliceffekt@gmail.com', rss: 'https://wiki.xxiivv.com/links/rss.xml', feed: 'https://wiki.xxiivv.com/twtxt.txt', feed: 'https://wiki.xxiivv.com/twtxt.txt', wiki: 'https://wiki.xxiivv.com/scripts/database/glossary.ndtl' },
8 { url: 'http://estevancarlos.com' },
8 { url: 'http://estevancarlos.com' },
9 { url: 'https://electro.pizza', title: 'electro pizza', type: 'blog', author: 'rho', rss: 'https://electro.pizza/feed.xml', feed: 'https://electro.pizza/twtxt.txt' },
9 { url: 'https://electro.pizza', title: 'electro pizza', type: 'blog', author: 'rho', rss: 'https://electro.pizza/feed.xml', feed: 'https://electro.pizza/twtxt.txt' },
10− { url: 'https://ianjbattaglia.co' },
11 { url: 'https://avanier.now.sh', title: 'Arachne', type: 'wiki', author: 'joshavanier', contact: 'joshavanier@protonmail.com', feed: 'https://avanier.now.sh/tw.txt' },
10 { url: 'https://avanier.now.sh', title: 'Arachne', type: 'wiki', author: 'joshavanier', contact: 'joshavanier@protonmail.com', feed: 'https://avanier.now.sh/tw.txt' },
12 { url: 'http://kaemura.com', title: 'kaemura.com', type: 'blog', author: 'kaemura', contact: 'chimera1190@gmail.com', feed: 'https://kaemura.com/twttxt.txt' },
11 { url: 'http://kaemura.com', title: 'kaemura.com', type: 'blog', author: 'kaemura', contact: 'chimera1190@gmail.com', feed: 'https://kaemura.com/twttxt.txt' },
13 { url: 'https://liamcooke.com' },
12 { url: 'https://liamcooke.com' },
14− { url: 'https://electricgecko.de' },
13+ { url: 'https://electricgecko.de', title: 'electricgecko', type: 'blog', author: 'electricgecko', contact: 'desk@electricgecko.de', rss: 'https://electricgecko.de/feed' },
15 { url: 'https://wichniow.ski' },
14 { url: 'https://wichniow.ski' },
16 { url: 'https://hraew.autophagy.io' },
15 { url: 'https://hraew.autophagy.io' },
17 { url: 'http://evenunto.net' },
16 { url: 'http://evenunto.net' },
@@ -21,7 +20,6 @@ const sites = [
21 { url: 'https://felipecortez.net' },
20 { url: 'https://felipecortez.net' },
22 { url: 'http://luminghao.com' },
21 { url: 'http://luminghao.com' },
23 { url: 'https://turelio.github.io' },
22 { url: 'https://turelio.github.io' },
24− { url: 'https://spaceshipsin.space', title: 'spaceshipsin.space', type: 'hybrid', author: 'gaeel', contact: 'gaeel@spaceshipsin.space', feed: 'https://spaceshipsin.space/twtxts/hallway.txt' },
25 { url: 'https://log.lectronice.com', title: 'lectrolog.', type: 'blog', author: 'lectronice', contact: 'i.love.spam@lectronice.com', feed: 'https://lectronice.com/hallway/twtxt.txt' },
23 { url: 'https://log.lectronice.com', title: 'lectrolog.', type: 'blog', author: 'lectronice', contact: 'i.love.spam@lectronice.com', feed: 'https://lectronice.com/hallway/twtxt.txt' },
26 { url: 'https://craze.co.uk' },
24 { url: 'https://craze.co.uk' },
27 { url: 'https://shaneckel.com' },
25 { url: 'https://shaneckel.com' },
@@ -72,7 +70,7 @@ const sites = [
72 { url: 'https://gndclouds.cc' },
70 { url: 'https://gndclouds.cc' },
73 { url: 'https://xuv.be' },
71 { url: 'https://xuv.be' },
74 { url: 'https://dsdshcym.github.io' },
72 { url: 'https://dsdshcym.github.io' },
75− { url: 'https://wiki.chronica.xyz', title: 'chronica', type: 'wiki', author: 'ckipp', contact: 'ckipp@pm.me', feed: 'https://chronica.xyz/hallway.txt' },
73+ { url: 'https://wiki.chronica.xyz', title: 'chronica', type: 'wiki', author: 'ckipp', contact: 'ckipp@pm.me', feed: 'https://chronica.xyz/hallway.txt', wiki: 'https://chronica.xyz/glossary.ndtl' },
76 { url: 'https://boffosocko.com' },
74 { url: 'https://boffosocko.com' },
77 { url: 'https://hex22.org', title: 'hex22', author: 'kodedninja', contact: 'karamanhunor@pm.me', feed: 'https://t.seed.hex22.org/twtxt.txt' },
75 { url: 'https://hex22.org', title: 'hex22', author: 'kodedninja', contact: 'karamanhunor@pm.me', feed: 'https://t.seed.hex22.org/twtxt.txt' },
78 { url: 'https://patrikarvidsson.com' },
76 { url: 'https://patrikarvidsson.com' },
@@ -80,12 +78,12 @@ const sites = [
80 { url: 'https://xinniw.github.io' },
78 { url: 'https://xinniw.github.io' },
81 { url: 'https://mboxed.github.io/forida' },
79 { url: 'https://mboxed.github.io/forida' },
82 { url: 'https://letters.vexingworkshop.com' },
80 { url: 'https://letters.vexingworkshop.com' },
83− { url: 'https://tom.org.nz', title: 'Tom Hackshaw', type: 'Portfolio', author: 'tomupom', contact: 'tom@tomhackshaw.com', feed: 'https://tom.org.nz/scripts/twtxt.txt' },
81+ { url: 'https://tom.org.nz', title: 'Tom Hackshaw', type: 'portfolio', author: 'tomupom', contact: 'tom@tomhackshaw.com', wiki: 'https://a.tom.org.nz/glossary.ndtl' },
84 { url: 'https://teknari.com' },
82 { url: 'https://teknari.com' },
85 { url: 'https://colectivo-de-livecoders.gitlab.io', title: 'Colectivo de Livecoders', type: 'blog', author: 'clic', contact: 'https://t.me/clic_laplata' },
83 { url: 'https://colectivo-de-livecoders.gitlab.io', title: 'Colectivo de Livecoders', type: 'blog', author: 'clic', contact: 'https://t.me/clic_laplata' },
86 { url: 'https://www.madewithtea.com', title: 'madewithtea.com', type: 'blog' },
84 { url: 'https://www.madewithtea.com', title: 'madewithtea.com', type: 'blog' },
87 { url: 'https://amorris.ca', title: 'amorris', author: 'amorris', type: 'blog', feed: 'https://feed.amorris.ca/hallway.txt' },
85 { url: 'https://amorris.ca', title: 'amorris', author: 'amorris', type: 'blog', feed: 'https://feed.amorris.ca/hallway.txt' },
88− { url: 'http://www.miha-co.ca', title: 'miha-co', type: 'Portfolio' },
86+ { url: 'http://www.miha-co.ca', title: 'miha-co', type: 'portfolio' },
89 { url: 'https://buzzert.net', title: 'buzzert.net', author: 'buzzert', type: 'blog' },
87 { url: 'https://buzzert.net', title: 'buzzert.net', author: 'buzzert', type: 'blog' },
90 { url: 'https://notes.stuartpb.com/', title: 'notes.stuartpb.com', type: 'wiki', author: 'stuartpb', contact: 's@stuartpb.com', feed: 'https://twtxt.stuartpb.com/xxiivv.txt' },
88 { url: 'https://notes.stuartpb.com/', title: 'notes.stuartpb.com', type: 'wiki', author: 'stuartpb', contact: 's@stuartpb.com', feed: 'https://twtxt.stuartpb.com/xxiivv.txt' },
91 { url: 'https://xxiii.co', title: 'xxiii', type: 'portfolio', author: 'serocell', contact: 'psignal@s900.net', rss: 'https://serocell.com/feeds/serocell.xml', feed: 'https://xxiii.co/twtxt.txt' },
89 { url: 'https://xxiii.co', title: 'xxiii', type: 'portfolio', author: 'serocell', contact: 'psignal@s900.net', rss: 'https://serocell.com/feeds/serocell.xml', feed: 'https://xxiii.co/twtxt.txt' },
@@ -93,5 +91,9 @@ const sites = [
93 { url: 'https://lublin.se', author: 'quite', contact: 'quite@hack.org', feed: 'https://lublin.se/twtxt.txt' },
91 { url: 'https://lublin.se', author: 'quite', contact: 'quite@hack.org', feed: 'https://lublin.se/twtxt.txt' },
94 { url: 'https://zanneth.com', title: 'zanneth.com', author: 'zanneth', type: 'blog', contact: 'root@zanneth.com' },
92 { url: 'https://zanneth.com', title: 'zanneth.com', author: 'zanneth', type: 'blog', contact: 'root@zanneth.com' },
95 { url: 'https://eli.li', title: 'eli.li', author: 'eli_oat', type: 'blog', contact: 'hi@eli.li', rss: 'https://eli.li/feed.rss', feed: 'https://txt.eli.li/twtxt/twtxt.txt' },
93 { url: 'https://eli.li', title: 'eli.li', author: 'eli_oat', type: 'blog', contact: 'hi@eli.li', rss: 'https://eli.li/feed.rss', feed: 'https://txt.eli.li/twtxt/twtxt.txt' },
94+ { url: 'https://gueorgui.net', title: 'Gueorgui Tcherednitchenko', author: 'gueorgui', type: 'portfolio', contact: 'hello@gueorgui.net' },
95+ { url: 'https://www.gkbrk.com', title: 'Leo', author: 'Leo', type: 'blog', contact: 'webring@gkbrk.com', rss: 'https://www.gkbrk.com/feed.xml', feed: 'https://www.gkbrk.com/twtxt.txt' },
96+ { url: 'https://www.tatecarson.com', title: 'Tate Carson', type: 'portfolio', author: 'Tate Carson', contact: 'tatecarson@gmail.com' },
97+ { url: 'https://azlen.me', title: 'azlen.me', author: 'azlen', type: 'wiki', contact: 'webring@azlen.me', feed: 'https://azlen.me/twtxt.txt', wiki: 'https://azlen.me/glossary.ndtl' },
96 { url: 'https://opinionatedguide.github.io/', title: 'OpGuides', contact: 'vegac@protonmail.com', feed: 'https://opinionatedguide.github.io/twtxt.txt' }
98 { url: 'https://opinionatedguide.github.io/', title: 'OpGuides', contact: 'vegac@protonmail.com', feed: 'https://opinionatedguide.github.io/twtxt.txt' }
97]
99]