urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-01 06:35:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

links: link-item retains hostname detection

Browse Source
This commit is contained in:
Matilde Park 2020-09-24 18:53:49 -04:00
parent 41267a25f1
commit 75e65573d3
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/interface/src/views/apps/links/components/lib/link-item.js
View File

@ -1,4 +1,4 @@
import React, { Component } from 'react';
import React from 'react';
import { Sigil } from '~/logic/lib/sigil';
import { Link } from 'react-router-dom';
@ -15,10 +15,15 @@ export const LinkItem = (props) => {
hideNicknames
} = props;
const URLparser = new RegExp(
/((?:([\w\d\.-]+)\:\/\/?){1}(?:(www)\.?){0,1}(((?:[\w\d-]+\.)*)([\w\d-]+\.[\w\d]+))){1}(?:\:(\d+)){0,1}((\/(?:(?:[^\/\s\?]+\/)*))(?:([^\?\/\s#]+?(?:.[^\?\s]+){0,1}){0,1}(?:\?([^\s#]+)){0,1})){0,1}(?:#([^#\s]+)){0,1}/
);
const author = node.post.author;
const index = node.post.index.split('/').join('-');
const size = node.children ? node.children.size : 0;
const contents = node.post.contents;
const hostname = URLparser.exec(contents[1].url) ? URLparser.exec(contents[1].url)[4] : null;
const showAvatar = avatar && !hideAvatars;
const showNickname = nickname && !hideNicknames;
@ -30,28 +35,29 @@ export const LinkItem = (props) => {
: <Sigil ship={`~${author}`} size={38} color={'#' + color} />;
return (
<div className="w-100 pv3 flex bg-white bg-gray0-d lh-solid">
<div className='w-100 pv3 flex bg-white bg-gray0-d lh-solid'>
{img}
<div className="flex flex-column ml2 flex-auto">
<a href={contents[1].url}
className="w-100 flex"
target="_blank"
rel="noopener noreferrer">
<p className="f8 truncate">{props.title}</p>
<span className="gray2 dib v-btm ml2 f8 flex-shrink-0">
{contents[0].text} ↗
<div className='flex flex-column ml2 flex-auto'>
<a
href={contents[1].url}
className='w-100 flex'
target='_blank'
rel='noopener noreferrer'>
<p className='f8 truncate'>{contents[0].text}</p>
<span className='gray2 ml2 f8 dib v-btm flex-shrink-0'>
{hostname} ↗
</span>
</a>
<div className="w-100">
<span className={'f9 pr2 pl2 dib ' + mono} title={author}>
{ showNickname ? nickname : cite(author) }
<div className='w-100'>
<span className={'f9 pr2 white-d dib ' + mono} title={author}>
{showNickname ? props.nickname : cite(author)}
</span>
<Link to={`/~link/${resource}/${index}`}>
<span className="f9 inter gray2 dib">{size} comments</span>
<span className='f9 inter gray2 dib'>{size} comments</span>
</Link>
</div>
</div>
</div>
);
}
};