mystiq/hydrogen-web
Archived
4
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity
3163 commits 367 branches 115 tags 16 MiB
Commit graph

378 commits

Author SHA1 Message Date
Bruno Windels
09aba78803
Merge branch 'master' into room-info 2021-06-24 15:06:37 +00:00
Bruno Windels
dbaef5117a
Merge pull request #384 from vector-im/bwindels/reactions 
Reactions
 2021-06-24 15:01:44 +00:00
Bruno Windels
bb6417dab9 fix lint 2021-06-24 15:24:53 +02:00
Bruno Windels
5984e8dd6d don't show reactions for redacted messages 2021-06-24 14:49:43 +02:00
Bruno Windels
787308375c prevent toggling in vm while already busy 
otherwise the check in SendQueue to prevent duplicates might fail
 2021-06-24 14:33:16 +02:00
Bruno Windels
299294daff prevent re(d)action in left/kicked room 2021-06-24 14:24:22 +02:00
Bruno Windels
3fa0f234bb not used 2021-06-24 14:12:55 +02:00
Bruno Windels
366d3761b8 remove waiting for update event (it might not come in case of dupe) 
also remove duplicate logging impl for re(d)action at cost of
double haveAnnotation call
 2021-06-24 13:35:59 +02:00
Bruno Windels
7557e2f437 not used 2021-06-24 13:26:14 +02:00
Bruno Windels
38b465cb9d rename vm.toggleReaction to vm.toggle 2021-06-24 13:15:20 +02:00
Bruno Windels
a4a7c23148 use pending re(d)action timestamp to have stable reaction sorting order 
also move more logic into the matrix layer, from Reaction(s)ViewModel
to PendingAnnotation
 2021-06-24 12:26:38 +02:00
Bruno Windels
c585d76ce5 also clear pending reaction promise when an error is thrown 2021-06-23 17:47:47 +02:00
Bruno Windels
1a5a64864a don't double log redactReaction 2021-06-23 17:47:18 +02:00
Bruno Windels
48588687a5 share logic whether have reacted already between basemsgtile & reactvm 2021-06-23 15:38:12 +02:00
Bruno Windels
a1d24894eb this will block if we have a pending redaction & reaction 
so the reaction won't be aborted
 2021-06-23 11:45:24 +02:00
Bruno Windels
442d4cce03 make the react/redactReaction promise only return after update happened 2021-06-23 11:44:53 +02:00
Bruno Windels
18562d30d8 integration tests for local echo of toggling reactions 2021-06-23 11:43:14 +02:00
Bruno Windels
b153613200 determine toggle state correctly with both pending redaction & reaction 2021-06-23 11:41:28 +02:00
RMidhunSuresh
12305be06a Fix issue #397 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-19 16:01:02 +05:30
Bruno Windels
099f99a96b check power levels to see if we can react 2021-06-17 09:41:25 +02:00
Bruno Windels
fd54539e1c clarify comment 2021-06-17 09:41:10 +02:00
Bruno Windels
94635a18e0 actually, 0 or -1 mean you have a local redaction 2021-06-16 12:41:42 +02:00
Bruno Windels
3b629622d9 need to keep pending count around if 0 or less for redaction local echo 
also need to be able to tell the difference between no pending reactions
and redactions and the sum being 0 (having both a redaction and
reaction) so we keep isPending to true
 2021-06-16 10:23:22 +02:00
Bruno Windels
e5c1094153 WIP 2021-06-15 19:06:41 +02:00
RMidhunSuresh
97e484b8e6 Rename toggle --> open 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-15 14:30:27 +05:30
Bruno Windels
75ee509361 fix lint 2021-06-11 11:30:11 +02:00
Bruno Windels
81a721f880 make equality stable in comparator for reaction 2021-06-11 11:04:48 +02:00
Bruno Windels
1d9709d4e3 also compare by key if the timestamps are the same 2021-06-11 11:02:31 +02:00
Bruno Windels
757e08c62c WIP 4 2021-06-10 18:29:10 +02:00
RMidhunSuresh
008f3601ca Remove link support from Menu 
- Not needed anymore since every link item has been rewritten as a
  button.

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
eb870cfc23 Use url instead of link 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
fcc2afba08 Do not compute link in getter 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
04065847dc Remove unused getter 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
00dbd3db06 Add menu entry to launch RoomInfoView 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
2dcec6343d Info icon should open/close view alternatively 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
4edc58ebcf Add button in Room header to open details 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
Bruno Windels
206d18f498 WIP2 2021-06-08 16:56:17 +02:00
Bruno Windels
2ebadb36c3 WIP 2021-06-08 13:20:55 +02:00
Bruno Windels
280de98858 fix lint 2021-06-04 16:41:37 +02:00
Bruno Windels
b7402ce43c support local echo for adding a reaction 2021-06-04 15:34:44 +02:00
Bruno Windels
3e2b7ba5fa obsolete, already provided in parent class 2021-06-03 21:01:26 +02:00
Bruno Windels
1385a22e60 don't recreate the reactions after clearing it with the last one removed 2021-06-03 21:00:57 +02:00
Bruno Windels
cc444fa207 we actually don't need any of the view model infrastructure 
all the updates go over the observable list
 2021-06-03 21:00:25 +02:00
Bruno Windels
8d4d9c6e8d WIP 2021-06-03 19:57:48 +02:00
Bruno Windels
2eb2e4e9b3 more stable sorting order for reactions 2021-06-03 19:57:29 +02:00
Bruno Windels
bb8acbefa3 support undoing a reaction 2021-06-03 19:57:16 +02:00
Bruno Windels
20abb01ee8 very basic way of sending a reaction 2021-06-03 19:16:53 +02:00
Bruno Windels
2152d5e833 expose reactions on base message tile as vm with observable list 2021-06-03 19:15:49 +02:00
Bruno Windels
b05345ee27 only show redacted messages 2021-06-03 16:50:37 +02:00
Bruno Windels
b83613924c don't assume there is at least 1 tile before loading at top 
it can happen that all tiles are not renderable, and we should just
keep calling loadAtTop
 2021-06-03 09:25:56 +02:00
Bruno Windels
7a96f84cab also show redaction reason for redaction local echo 2021-06-02 12:17:09 +02:00
Bruno Windels
15f6ab8b7e only show cancel option if not already sending 2021-06-02 11:56:15 +02:00
Bruno Windels
dc2e21495b explain why this is needed 2021-05-31 15:46:57 +02:00
Bruno Windels
8196a02f9d don't even need isOwn member anymore 2021-05-31 15:25:01 +02:00
Bruno Windels
00231443d3 timeline has the own member, so can just use timeline, not ownUserId 2021-05-31 15:18:44 +02:00
Bruno Windels
606d40c9d4 simplify canRedact logic in view by overriding in RedactedTile 2021-05-31 13:55:08 +02:00
Bruno Windels
23459aad52 check if you are allowed to redact a message 2021-05-31 13:52:03 +02:00
Bruno Windels
762ed96a3b Not needed as both evententry and pendingevententry return timestamp 2021-05-31 11:58:01 +02:00
Bruno Windels
0596ca06b1 emit remove before linking up sibling tiles 
otherwise emitting the update from updatePreviousSibling has
the wrong idx
 2021-05-31 11:56:41 +02:00
Bruno Windels
c6e2607f1f guard against updates emitted while populating during first subscription 
This came up now because Timeline uses a MappedList to map PendingEvents
to PendingEventEntries. In the map function, we setup links between
entries to support local echo for relations. When opening a timeline
that has unsent relations, the initial populating of the MappedList
will try to emit an update for the target entry in remoteEntries.
This all happens while the ListView of the timeline is calling subscribe
and all collections in the chain are populating themselves based on
their sources.

This usually entails calling subscribe on the source,
and now you are subscribed, iterate over the source (as you're not
allowed to query an unsubscribed observable collection, as it might not
be populated yet, and even if it did, it wouldn't be guaranteed to be
up to date as events aren't flowing yet).

So in this concrete example, TilesCollection hadn't populated its tiles
yet and when the update to the target of the unsent relation reached
TilesCollection, the tiles array was still null and it crashed.

I thought what would be the best way to fix this and have a solid model
for observable collections to ensure they are always compatible with
each other. I considered splitting up the subscription process in two
steps where you'd first populate the source and then explicitly start
events flowing.

I didn't go with this way because it's really only updates that
make sense to be emitted during setup.
A missed update wouldn't usually bring the collections out of sync
like a missed add or remove would. It would just mean the UI isn't
updated (or any subsequent filtered collections are not updated),
but this should be fine to ignore during setup, as you can rely
on the subscribing collections down the chain picking up the update
while populating. If we ever want to support add or remove events
during setup, we would have to explicitly support them, but for now
they are correct to throw.

So for now, just ignore update events that happen during setup
where needed.
 2021-05-27 10:02:05 +02:00
Bruno Windels
a8e43d4850 remove leftover logging 2021-05-27 09:18:22 +02:00
Bruno Windels
56495c9d13 fix gap failing to fill 2nd time + unit regression test 2021-05-27 09:10:10 +02:00
Bruno Windels
ca4d09e923 add logging and return promise from Tile.redact 2021-05-26 13:08:54 +02:00
Bruno Windels
ce7147e463 put redactions in their own view, and allow aborting while still queued 2021-05-26 13:07:56 +02:00
Bruno Windels
cb622be653 rerender tile when becoming or stopped being redacted 2021-05-25 12:58:20 +02:00
Bruno Windels
8a8c5569dc provide redact method on tile and room 
also add some logging
 2021-05-20 14:53:17 +02:00
Bruno Windels
b655c34bbb also show reason for redaction 2021-05-20 13:20:12 +02:00
Bruno Windels
780ad44032 render redacted messages 2021-05-20 13:15:35 +02:00
Bruno Windels
df8686099f
Merge pull request #356 from MidhunSureshR/linkify-doc 
Add jsdoc comments for clickable link code + Minor Changes
 2021-05-18 13:30:23 +00:00
Bruno Windels
754e7e7bb2 clarify with comments 2021-05-18 11:54:18 +02:00
Bruno Windels
f92b1df4fc update copyright comments 2021-05-18 11:54:10 +02:00
Bruno Windels
2cf100efaa refine unknown room view 2021-05-18 11:46:55 +02:00
Bruno Windels
c04a8140a3 offer to rejoin archived room from menu 2021-05-18 11:07:46 +02:00
Bruno Windels
03be63572d ask to join when room id is unknown 2021-05-18 11:07:19 +02:00
RMidhunSuresh
72f58b6001 Change lines[i] to line 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-18 14:26:56 +05:30
RMidhunSuresh
11d551f8a3 Add js-doc for parsePlainBody 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-17 20:39:23 +05:30
RMidhunSuresh
d671bcec31 Add js-docs for linkify function 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-17 20:32:35 +05:30
Bruno Windels
645470cd03 no need for private prop here 2021-05-17 12:45:55 +02:00
Bruno Windels
ce976226f9 rename MessageTile to BaseMessageTile 
since MessageTile doesn't have a shape property anymore
 2021-05-17 12:15:13 +02:00
Bruno Windels
67714040e7 rename BaseTextMessageTile to BaseTextTile 2021-05-17 12:14:15 +02:00
Bruno Windels
054c51b82f add caching MessageBody in BaseTextMessageTile,use in EncryptedEventTile 
missing body in EncryptedEventTile was what caused the bug
 2021-05-17 11:27:30 +02:00
Bruno Windels
01b8b397b6 expose sourceString on result of parsing message body 
and also do some cleanup
 2021-05-17 11:26:30 +02:00
Bruno Windels
62bb891e79 don't accept closing parenthesis as last character of url 2021-05-12 22:49:34 +02:00
Bruno Windels
93c08c16c1
Merge pull request #345 from MidhunSureshR/linkify 
Render URLs as clickable links in timeline
 2021-05-12 15:40:46 +00:00
Bruno Windels
b30b62416c add option to forget archived room 2021-05-12 15:38:54 +02:00
Bruno Windels
f331d84292 add options menu in room header with leave room option 2021-05-12 13:59:08 +02:00
RMidhunSuresh
851e8d34a4 Incorporate better regex from review 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-12 16:15:30 +05:30
RMidhunSuresh
00bcdbab37 Fix broken test 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-12 16:15:07 +05:30
RMidhunSuresh
bb74656348 Grammar fix 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-12 15:59:44 +05:30
RMidhunSuresh
2e657fbbbd Add failing test for link ending with < 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-12 15:56:33 +05:30
RMidhunSuresh
55b7c55efe Pull callback args into variables 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-12 15:52:05 +05:30
RMidhunSuresh
9d898bdf47 Change word to improve meaning 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 22:32:05 +05:30
RMidhunSuresh
b521797f4d Explain the reason for double escapes 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 22:28:14 +05:30
RMidhunSuresh
ef15968a3d Add some helpful pointers 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 22:26:45 +05:30
RMidhunSuresh
c6d7cef491 Refactor regex to improve readability 
- Split regex into components
- Add informative comments

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 22:21:37 +05:30
RMidhunSuresh
31740f4ec6 Put regex into separate file 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 22:18:52 +05:30
RMidhunSuresh
6f0362802a Move linkify.js to separate directory 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 22:17:08 +05:30
RMidhunSuresh
027f6020e7 Modified regex to allow unicode in fragment 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 22:15:36 +05:30
RMidhunSuresh
e20810b0cb Add test for unicode after fragment without path 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 20:44:39 +05:30
RMidhunSuresh
7be9f93909 Make regex module-level constant 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 20:32:36 +05:30
RMidhunSuresh
03208b88d5 Move link tests to linkify 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 20:19:29 +05:30
Bruno Windels
8b8214cd1b reference count archived rooms and keep track of active ones 
so we don't create two instances for the same id, one for sync, and one
for displaying, and hence updates from sync being pushed on a different
instance than the one displaying, and not updating the view.
 2021-05-11 16:09:58 +02:00
RMidhunSuresh
dbe76e973e Add braces to all blocks 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 17:59:03 +05:30
Bruno Windels
e3c1644d09 show leave reason instead of composer for archived room 2021-05-11 13:11:11 +02:00
RMidhunSuresh
3830a95af2 Cache result in TextTile 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 16:03:14 +05:30
RMidhunSuresh
051771397c Fix bug in which links preceeded text 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 13:59:45 +05:30
RMidhunSuresh
3beaf88a8b Rename messageFormat to body 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 13:46:38 +05:30
RMidhunSuresh
070bc96186 Fallback to empty string if content is undefined 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 13:43:54 +05:30
RMidhunSuresh
577883a1d4 Refactor loop 
Don't handle last element separately

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 13:31:33 +05:30
RMidhunSuresh
03b971d898 Added tests for new linkify 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-11 12:55:39 +05:30
RMidhunSuresh
17be7c4f4d Add newline to message 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-10 22:10:50 +05:30
RMidhunSuresh
fc3b391aa9 Use MessageBodyBuilder instead of linkify 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-10 21:41:57 +05:30
RMidhunSuresh
55f2d79d07 Move newline handling to MessageBodyBuilder 
- Also add a insert method to reflect new design.

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-10 21:37:27 +05:30
RMidhunSuresh
787d438a74 Refactored Linkifier class into single function 
Modified design so that linkify interacts with MessageBodyBuilder
through callbacks.

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-10 21:30:11 +05:30
RMidhunSuresh
dca649dfd4 Moved files into more appropriate locations 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-10 19:53:40 +05:30
RMidhunSuresh
2f883d049c Return new message format instead of message text 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-05-08 19:20:07 +05:30
Bruno Windels
a8d4ee0dd6 different room view models don't need to initiate switching now 
as this is triggered by observing the room status
 2021-05-07 13:11:17 +02:00
Bruno Windels
e1d4c75d18 pass avatar sizes from view to view model rather than repeating there 
and risk a mismatch resulting in too large/small image
 2021-04-28 14:11:35 +02:00
Bruno Windels
15dfb6c202 clarify 2021-04-28 10:05:21 +02:00
Bruno Windels
32d9f6e830 expose inviter user id 2021-04-27 15:01:35 +02:00
Bruno Windels
a95df54978 scale down inviter avatar 2021-04-27 15:01:20 +02:00
Bruno Windels
15fba7a07d missing semicolon 2021-04-27 14:43:26 +02:00
Bruno Windels
781235cb07 scale up room avatar 2021-04-27 14:43:13 +02:00
Bruno Windels
f902f255a4 add roomDescription property 2021-04-27 14:42:37 +02:00
Bruno Windels
b6573258fb always show inviter if present 2021-04-27 14:42:12 +02:00
Bruno Windels
f2d7f5e4da refresh vm when left room receives invite 
clean up room vm switching in the process
 2021-04-23 18:06:38 +02:00
Bruno Windels
0cc95f5083 first draft of InviteViewModel 2021-04-21 15:45:51 +02:00
Bruno Windels
16f275ca34 make pass-through props smaller 2021-04-21 15:34:35 +02:00
Bruno Windels
a91a584201 not used anymore 2021-04-21 15:33:45 +02:00
RMidhunSuresh
3d1ddccbd8 Add previous name in name change announcement 
- Fixes issue 269 in which the announcement generated when a member
  changes their name would show as :
  <new_name> changed their name to <new_name>
  instead of:
  <old_name> changed their name to <new_name>

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-03-19 23:28:50 +05:30
Bruno Windels
9506bf1b81 clean up video upload error handling 2021-03-10 13:43:55 +01:00
Bruno Windels
a672b0c78a better error handling in video decoding 2021-03-10 13:40:11 +01:00
Bruno Windels
948249bb3d better error reporting for unsupported codecs when uploading 2021-03-10 13:39:34 +01:00
Bruno Windels
35e6dffd0b don't rely on mime-types to decide to use main url for thumbnail 
so it does not break when clients forget to set the mimetype
 2021-03-10 10:01:07 +01:00
Bruno Windels
c6ff56a942 send video messages 2021-03-09 19:35:25 +01:00
Bruno Windels
ee6f3e5457 render video messages 2021-03-09 19:35:10 +01:00
Bruno Windels
299fcfd4d1 extract base class from image tile to inherit from for video tile 2021-03-09 19:33:54 +01:00
Bruno Windels
2d4003379e Fix #97 2021-03-08 22:25:18 +01:00
Bruno Windels
961d0cb224
Merge pull request #249 from vector-im/bwindels/ui-sent-status 
show message already as black when sent but no remote echo yet
 2021-03-03 13:08:46 +00:00
Bruno Windels
6f6346d5c3 detect when hitting beginning of timeline when loading timeline 2021-03-02 19:29:55 +01:00
Bruno Windels
856001160b show message already as black when sent but no remote echo yet 2021-02-26 10:40:08 +01:00
Bruno Windels
1093895133 log opening timeline 
also load the timeline when opening it in the room, so logging
starts in the room (and we don't need to pass the logger to Timeline)
and also API-wise it makes more sense to
not return uninitialized objects
 2021-02-24 11:21:04 +01:00
Bruno Windels
2f0f168c6e show 'sending' while waiting for remote echo for filetile instead of unknown status 2020-11-20 16:38:16 +01:00
Bruno Windels
9ab81eea02 add setting for image compression level 2020-11-20 15:51:16 +01:00
Bruno Windels
f7a07a9e79 adjust fileview/tile to pendingevent changes 2020-11-20 11:45:14 +01:00
Bruno Windels
8b8d06cf3e show error for attachments still need upload but missing after refresh 2020-11-19 14:42:29 +01:00
Bruno Windels
59a92bdf97 vm changes for improved image view 2020-11-18 20:10:05 +01:00
Bruno Windels
f6dbb23f79 better error handling for file and picture upload 2020-11-18 20:07:31 +01:00
Bruno Windels
47147f2d46 progress bar for upload, add cancel button, no lightbox while uploading 2020-11-18 20:06:34 +01:00
Bruno Windels
a930dec8db adjust ImageTile to state machine changes 2020-11-18 13:05:10 +01:00