e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

nanka iroiro

Browse source
This commit is contained in:
syuilo 2017-02-09 01:07:06 +09:00
parent 5ad6877090
commit a68efc1e5e
4 changed files with 52 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/common/text/elements/code.js Normal file
View file

@ -0,0 +1,17 @@
/**
* Code
*/
const regexp = /```([\s\S]+?)```/;
module.exports = {
test: x => new RegExp('^' + regexp.source).test(x),
parse: text => {
const code = text.match(new RegExp('^' + regexp.source))[0];
return {
type: 'code',
content: code,
code: code.substr(3, code.length - 6).trim()
};
}
};

3
src/common/text/index.js
View file

@ -6,7 +6,8 @@ const elements = [
require('./elements/bold'),
require('./elements/url'),
require('./elements/mention'),
require('./elements/hashtag')
require('./elements/hashtag'),
require('./elements/code')
];
function analyze(source) {

35
src/web/app/common/scripts/text-compiler.js
View file

@ -1,12 +1,18 @@
const riot = require('riot');
const nyaize = require('nyaize').default;
module.exports = function(tokens, shouldBreak, escape) {
const escape = function(text) {
return text
.replace(/>/g, '>')
.replace(/</g, '&lt;');
};
module.exports = function(tokens, shouldBreak, shouldEscape) {
if (shouldBreak == null) {
shouldBreak = true;
}
if (escape == null) {
escape = true;
if (shouldEscape != null) {
alert('do not use this option')
}
const me = riot.mixin('i').me;
@ -14,26 +20,23 @@ module.exports = function(tokens, shouldBreak, escape) {
let text = tokens.map(function(token) {
switch (token.type) {
case 'text':
if (escape) {
return token.content
.replace(/>/g, '&gt;')
.replace(/</g, '&lt;')
.replace(/(\r\n|\n|\r)/g, shouldBreak ? '<br>' : ' ');
} else {
return token.content
.replace(/(\r\n|\n|\r)/g, shouldBreak ? '<br>' : ' ');
}
return escape(token.content)
.replace(/(\r\n|\n|\r)/g, shouldBreak ? '<br>' : ' ');
case 'bold':
return '<strong>' + token.bold + '</strong>';
return '<strong>' + escape(token.bold) + '</strong>';
case 'link':
return '<mk-url href="' + token.content + '" target="_blank"></mk-url>';
return '<mk-url href="' + escape(token.content) + '" target="_blank"></mk-url>';
case 'mention':
return '<a href="' + CONFIG.url + '/' + token.username + '" target="_blank" data-user-preview="' + token.content + '">' + token.content + '</a>';
return '<a href="' + CONFIG.url + '/' + escape(token.username) + '" target="_blank" data-user-preview="' + token.content + '">' + token.content + '</a>';
case 'hashtag': // TODO
return '<a>' + token.content + '</a>';
return '<a>' + escape(token.content) + '</a>';
case 'code':
return '<pre><code>' + escape(token.code) + '</code></pre>';
}
}).join('');
text = text.replace(/<br><code><pre>/g, '<code><pre>').replace(/<\/code><\/pre><br>/g, '</code></pre>');
if (me && me.data && me.data.nya) {
text = nyaize(text);
}

17
src/web/app/desktop/tags/timeline-post.tag
View file

@ -30,11 +30,11 @@
</div>
</header>
<div class="body">
<div class="text">
<div class="text" ref="text">
<a class="reply" if={ p.reply_to }>
<i class="fa fa-reply"></i>
</a>
<span ref="text"></span>
<p>DUMMY</p>
<a class="quote" if={ p.repost != null }>RP:</a>
</div>
<div class="media" if={ p.media }>
@ -228,6 +228,17 @@
font-style oblique
color #a0bf46
pre
padding 16px
overflow auto
font-size 80%
color #525252
background #f8f8f8
border-radius 2px
> code
font-family Consolas, 'Courier New', Courier, Monaco, monospace
> .media
> img
display block
@ -304,7 +315,7 @@
then @analyze @p._highlight
else @analyze @p.text
@refs.text.innerHTML = if @p._highlight?
@refs.text.innerHTML = @refs.text.innerHTML.replace \<p>DUMMY</p> if @p._highlight?
then @compile tokens, true, false
else @compile tokens