urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-24 20:47:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'la-chat-sidebar' (#1885)

Browse Source 
* la-chat-sidebar:
  chat-ui: fix image previews from url types
  chat-js: make clicking a url message open in a new tab
  chat-js: fix chat sorting and selection in sidebar

Signed-off-by: Jared Tobin <jared@tlon.io>
This commit is contained in:
Jared Tobin 2019-10-25 10:23:30 +08:00
commit 7add660077
No known key found for this signature in database
GPG Key ID: 0E4647D58F8A69E4
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/arvo/app/chat/js/index.js
View File

File diff suppressed because one or more lines are too long

2
pkg/arvo/app/chat/js/tile.js
View File

File diff suppressed because one or more lines are too long

22
pkg/interface/chat/src/js/components/lib/message.js
View File

@ -29,9 +29,27 @@ export class Message extends Component {
</span>
);
} else if ('url' in letter) {
let imgMatch =
/(jpg|img|png|gif|tiff|jpeg|JPG|IMG|PNG|TIFF|GIF|webp|WEBP|webm|WEBM)$/
.exec(letter.url);
let contents = letter.url;
if (imgMatch) {
contents = (
<img
src={letter.url}
style={{
width: "50%",
maxWidth: "250px"
}}
></img>
);
}
return (
<a className="body-regular-400 v-top" href={letter.url}>
{letter.url}
<a className="body-regular-400 v-top"
href={letter.url}
target="_blank"
rel="noopener noreferrer">
{contents}
</a>
);
} else if ('me' in letter) {

4
pkg/interface/chat/src/js/components/sidebar.js
View File

@ -21,7 +21,7 @@ export class Sidebar extends Component {
render() {
const { props, state } = this;
let station = props.match.params.ship + props.match.params.station;
let station = `/${props.match.params.ship}/${props.match.params.station}`;
let sidebarItems = Object.keys(props.inbox)
.map((box) => {
@ -42,7 +42,7 @@ export class Sidebar extends Component {
};
})
.sort((a, b) => {
return b.wen - a.wen;
return b.when - a.when;
})
.map((obj) => {
let unread = props.unreads[obj.box];