Commit Graph

18692 Commits

Author SHA1 Message Date
Jared Tobin
6ef155b82b
Merge branch 'fix-chat-autojoin' (#2749)
* origin/fix-chat-autojoin:
  chat-js: fix auto-join and a chatSynced error
  chat-js: fix issue with autojoining

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-16 16:53:59 +04:00
Jared Tobin
b655105a38
Merge branch 'liam-fitzgerald/lf/link-ios-crash' (#2742)
* liam-fitzgerald/lf/link-ios-crash:
  link-js: fix pages disappearing on small screens

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-16 16:53:36 +04:00
Liam Fitzgerald
a7a539bb24 link: leave collection on leaving associated group
Automatically leaves a collection when the user is removed from a group
2020-04-16 21:45:58 +10:00
Liam Fitzgerald
945fb3fca6 chat-js: render markdown in messages
Renders markdown in text messages but not url or code messages.
2020-04-16 20:21:29 +10:00
Liam Fitzgerald
9574765de6 chat-js: use CodeMirror for chat input
swaps out the textarea for a CodeMirror in markdown mode. Resolves an
issue related to the input shrinking with the content.
2020-04-16 20:21:29 +10:00
Liam Fitzgerald
a424312d12 chat-js: add CodeMirror dependency
Adds CodeMirror dependency and related css
2020-04-16 20:21:27 +10:00
Fang
947b68f0df
Merge pull request #2750 from urbit/m/dbug-not-silent
dbug: avoid printing nothing at all
2020-04-16 11:20:57 +02:00
Fang
4c4858f198
chat-hook: clarify backlog wire handling logic 2020-04-16 01:44:36 +02:00
Fang
d1feabd1fb
dbug: print result with priority
To give it some color, making it less easy to miss.
2020-04-15 23:50:53 +02:00
Logan Allen
e98605c1bb chat-js: fix chat ordering and pending messages 2020-04-15 16:48:33 -04:00
Fang
e2034eca19
dbug: avoid printing nothing at all
Previously, if filtering subscriptions turned up no results, nothing was
printed. With this change, we explicitly print "no matching subscriptions"
instead.
2020-04-15 22:28:59 +02:00
Logan Allen
c497d5a6a6 chat-js: fix auto-join and a chatSynced error 2020-04-15 15:58:03 -04:00
Logan Allen
f035070387 chat-js: fix issue with autojoining 2020-04-15 15:04:54 -04:00
Fang
0f05ed3149
chat-hook: consistently pull backlog subs
We weren't accounting for backlog subscriptions with non-zero message
indexes in their wires. Now, we look through all of our outgoing
subscriptions to identify relevant backlog subscriptions, and leave all
of those.

The more proper fix here is to not include message indexes in the wire
in the first place, since we don't ever reuse that anywhere. But that's
a more invasive change, so we just leave a TODO for it instead.
2020-04-15 19:26:58 +02:00
Jared Tobin
65cad93b1b
Merge branch 'liam-fitzgerald/lf/chat-input-line-height' (#2743)
* liam-fitzgerald/lf/chat-input-line-height:
  chat-js: adjust line height in chat input

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-15 20:18:14 +04:00
Jared Tobin
e6eaae43c4
Merge branch 'liam-fitzgerald/lf/code-links-dark-mode' (#2741)
* liam-fitzgerald/lf/code-links-dark-mode:
  publish: increase legibility for code in dark mode

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-04-15 20:17:58 +04:00
Fang
084ce356a8
chat-hook: on %remove, try our best to pull subs
Previously, we were removing the relevant entry from the `synced` map
before calling `+pull-wire`, which requires an entry to still be there.
This lead to subscriptions not actually being pulled, commonly leading
to "subscribe wire not unique" errors on re-join.

In addition to fixing that, `%remove` actions now try to pull the
subscription regardless of whether they have an entry in the `synced`
map or not. `%leave` is always safe, and we might want to clean up
subscriptions that shouldn't be there anymore in the first place.
2020-04-15 16:29:26 +02:00
Liam Fitzgerald
8b48f3fa0f chat-js: adjust line height in chat input
Set the line height of the input to be the same as a sent message.
Additionally fixes an issue that would cause unnecessary scrollbars to
be shown.
2020-04-15 15:08:42 +10:00
Liam Fitzgerald
536e3121b6 link-js: fix pages disappearing on small screens
The rightPanelHide prop was being improperly set on the home, settings
and members screens, causing them to be blank on small screen sizes

Fixes #2727
2020-04-15 14:27:29 +10:00
Liam Fitzgerald
50dca97b07 publish: increase legibility for code in dark mode
Makes the rules that set both a background and foreground color come
last in the CSS, increasing their specificity. Changes the highlight to a
lighter grey, to better stand out. Correctly aligns highlights with code
block backgrounds.

Fixes #2684
2020-04-15 13:45:22 +10:00
Liam Fitzgerald
ba18737b5e chat-fe: move cancel button below comment edit 2020-04-15 10:59:56 +10:00
Liam Fitzgerald
b538cfd3ea chat-fe: address review comments 2020-04-15 10:48:46 +10:00
Liam Fitzgerald
963d04831d Merge branch 'master' into lf/publish-del-edit 2020-04-15 10:07:29 +10:00
Liam Fitzgerald
595acd17ff publish-js: lift editing state to comment list 2020-04-15 09:57:43 +10:00
Liam Fitzgerald
c46642af8d publish: fix check on edit-comment delta
An incorrect check caused comment editing to never be propagated.
2020-04-15 09:57:07 +10:00
ixv
b978d4f824
Merge pull request #2736 from urbit/ixv/fix-comment-grow
publish: fix bug in comment mark
2020-04-14 15:53:26 -07:00
Logan Allen
0145981542 contact-js: made channel handle onChannelError 2020-04-14 18:16:44 -04:00
Logan Allen
bfcaf6468e contact-hook: tested it, got /synced path working, and subscriptions loading 2020-04-14 18:05:32 -04:00
Logan Allen
b6e4566e61 contacts: fix group deletion and do some quality of life fixes 2020-04-14 21:33:01 +00:00
ixv
5bb9776b70
Merge pull request #2730 from liam-fitzgerald/lf/chat-synced-fix
chat-fe: resubscribe message iff chatSynced is populated
2020-04-14 11:40:45 -07:00
ixv
e5cf4fb813
Merge pull request #2720 from urbit/la-channel-err
channel.js: added way to handle event source errors more smoothly, and implemented in chat
2020-04-14 11:40:02 -07:00
Isaac Visintainer
113c86037c publish: fix bug in comment mark 2020-04-14 11:23:06 -07:00
Fang
7b5f7cde6b
link-listen-hook: partially revert 05e6519
We still want to auto-opt-in to new collections for _unmanaged groups_,
because we have no other way to join them.
2020-04-14 16:12:09 +02:00
Liam Fitzgerald
a3fed45af1 publish-js: avoid unnecessary scrollbars on note view
the root container had height: 100% but also a margin-top set on it. This
caused unnecessary scrollbars to appear when the content did not
actually overflow the container.
2020-04-14 20:38:35 +10:00
Liam Fitzgerald
d63cc0d7de publish-js: allow deletion and editing of comments
Adds interface affordances for the addition and removal of comments.
2020-04-14 20:20:59 +10:00
Liam Fitzgerald
fa92d1cb7f publish: use @tas for comment ref in marks
Comment references in publish actions are @tas of a rendered @da. The
mark expected @da, causing a mismatch.
2020-04-14 20:15:57 +10:00
Liam Fitzgerald
9ddf06d2a1 chat-fe: correct FF scroll behaviour
Firefox treats the reflow in the scroll container weirdly so for the
scrollback case, we save the position to restore later, when the backlog
messages come in. For the 'locked at bottom' case we add a new state
variable and rescroll based on that.
2020-04-14 16:34:10 +10:00
Isaac Visintainer
d8cdbfdeb8 release: urbit-os-v1.0.13 2020-04-13 19:26:13 -07:00
ixv
2c56937f0d
Merge pull request #2701 from lukechampine/syntax-error-src
ford: print source line on syntax error
2020-04-13 19:03:05 -07:00
Liam Fitzgerald
a6c5e96902 chat-fe: don't redirect if creating group 2020-04-14 11:50:47 +10:00
Liam Fitzgerald
786f2518e7 chat-fe: resubscribe message iff chatSynced is populated
Previously, if a room was navigated to directly, the resubscribe message
would show before the chatSynced state was loaded. Initialises
chatSynced as null and checks it is not null before showing the
resubscribe message.
2020-04-14 11:41:38 +10:00
Matilde Park
a4d37c0313 Merge branch 'master' into mp/chat/firefox-take-2 2020-04-13 21:38:27 -04:00
Liam Fitzgerald
1d81107d72 Merge branch 'master' into lf/profile-overlay 2020-04-14 11:04:52 +10:00
Liam Fitzgerald
a2998bdc41 chat-fe: redirect to DMs on trivial new group case
Create or view a DM upon trying to create an invite-only group with one invitee.
2020-04-14 11:01:31 +10:00
ixv
a7f20c37c1
Merge pull request #2700 from liam-fitzgerald/lf/invite-search-short
invite-search: handle suggestions for short searches
2020-04-13 16:56:26 -07:00
ixv
2d30886b65
Merge pull request #2724 from urbit/ixv/install-mousetrap
publish: install mousetrap before we use it....
2020-04-13 16:55:40 -07:00
ixv
228bee42e4
Merge pull request #2707 from urbit/ixv/cache-posts
publish: eagerly store your own changes
2020-04-13 16:54:41 -07:00
ixv
3526cfa4e6
Merge pull request #2618 from urbit/chat-reverse-messages
chat: reversed order that messages are stored in for faster performance
2020-04-13 16:54:16 -07:00
Isaac Visintainer
78023b8eff publish: ignore edit updates if they originated with us 2020-04-13 13:34:50 -07:00
Isaac Visintainer
7edcd65699 publish: add facilities for managing limbo state 2020-04-13 13:33:34 -07:00