mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-24 12:04:57 +01:00
Code Issues Projects Releases Wiki Activity
2,465 Commits 491 Branches 136 Tags 34 MiB
3d4ba20150
Commit Graph

1929 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
eee1be1ceb safari doesn't like empty string key paths 🙄 2021-06-24 16:16:15 +02: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
575f3fa966 fix tests 2021-06-24 14:28:10 +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
20ae21ead5 add some more emoji fonts that might be install by default 2021-06-24 14:12:41 +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
b148368d5b test different keys do work still 2021-06-24 13:29:13 +02:00
Bruno Windels
7557e2f437 not used 2021-06-24 13:26:14 +02:00
Bruno Windels
668c0aff36 drop duplicate reactions in send queue, as last measure of defence 2021-06-24 13:25:58 +02:00
Bruno Windels
38b465cb9d rename vm.toggleReaction to vm.toggle 2021-06-24 13:15:20 +02:00
Bruno Windels
c46c330efb prevent duplicate redactions from distorting reaction local echo 2021-06-24 13:14:54 +02:00
Bruno Windels
061f44f475 extract methods here 2021-06-24 12:56:23 +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
RMidhunSuresh
eb35f46214 Make sure room does exist before creating vm 
- This will stop the code from throwing when opening /details on
  UnknownRoomView.

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-24 14:58:02 +05:30
RMidhunSuresh
a273b25bac Remove css assumption 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-24 14:52:48 +05:30
RMidhunSuresh
e2fd90bdc2 Remove Segment import 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-24 13:48:53 +05:30
Bruno Windels
52957beb82 don't encrypt reactions 2021-06-23 17:49:27 +02:00
Bruno Windels
3c7ccc90b2 fix css for reaction view and do some renaming 
also add some user-select:none
 2021-06-23 17:48:21 +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
e125599a47 prevent decryption result getting lost after reaction updates entry 2021-06-23 17:38:52 +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
4d19f8d21d this should return any promise returned, otherwise breaks tests 2021-06-23 11:42:32 +02:00
Bruno Windels
8991632105 add redaction mock utility fn 2021-06-23 11:42:16 +02:00
Bruno Windels
b153613200 determine toggle state correctly with both pending redaction & reaction 2021-06-23 11:41:28 +02:00
Bruno Windels
616d701ebb add test that redaction for non-sending event aborts it 2021-06-21 19:02:42 +02:00
Bruno Windels
0e750db9ae write unit tests for (re)aggregating annotations in RelationWriter 2021-06-21 18:16:21 +02:00
Bruno Windels
d1345d0f83 write test for redaction in RelationWriter 2021-06-21 17:52:02 +02:00
Bruno Windels
81f06f565e write tests for AsyncMappedList 2021-06-21 17:26:08 +02:00
RMidhunSuresh
12305be06a Fix issue #397 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-19 16:01:02 +05:30
Bruno Windels
1fc1d2c79b fix lint 2021-06-18 15:09:34 +02:00
Bruno Windels
11fba12083 add tests for remote reaction target being added after pending event 2021-06-18 15:09:14 +02:00
Bruno Windels
0703cf8915 cleanup 2021-06-18 15:06:49 +02:00
Bruno Windels
5bea8130f2 more timeline annotation tests 2021-06-18 14:39:54 +02:00
Bruno Windels
9f99cf4b1e fix lint in tests 2021-06-18 11:52:09 +02:00
Bruno Windels
8092713faa add tests for local echo of adding and removing reaction 2021-06-18 11:51:02 +02:00
Bruno Windels
f000e98619 no point in reacting to redacted messages 2021-06-17 16:48:58 +02:00
Bruno Windels
64f1abdfed show quick reactions in message menu 2021-06-17 16:46:06 +02:00
Bruno Windels
4312610e7d support menu options with custom DOM 2021-06-17 16:45:53 +02:00
Bruno Windels
70d64f38eb spelling 2021-06-17 16:07:32 +02:00
Bruno Windels
cad884aa41 fix local redaction echo while already sending target 2021-06-17 16:07:09 +02:00
Bruno Windels
a77ef02677 cleanup 2021-06-17 10:12:45 +02:00
Bruno Windels
cbee498d41 a bit more brief 2021-06-17 10:03:32 +02:00
Bruno Windels
bf84b59e39 more accurate test name and also test >= 2021-06-17 09:59:24 +02:00
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
150f58a6b3 don't aggregate relations on redacted events 2021-06-16 18:00:50 +02:00
Bruno Windels
ce5409dc26 aggregate relations when seeing event target during back-pagination 2021-06-16 17:40:29 +02:00
Bruno Windels
9099a76f45 fix spelling in comment 2021-06-16 17:30:48 +02:00
Bruno Windels
bbcf0d2572 more local echo fixes for redacting a reaction + cleanup 2021-06-16 12:46:44 +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
4f10174e48 clarify comment 2021-06-16 10:28:17 +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
e161f61319 Remove selector list 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-15 15:11:32 +05:30
RMidhunSuresh
5e4db2f5dc Change font size 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-15 14:52:07 +05:30
RMidhunSuresh
1772fc04f9 Remove text(..) 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-15 14:45:46 +05:30
RMidhunSuresh
4f05d9a5b7 Make navigation changes in one go 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-15 14:34:26 +05:30
RMidhunSuresh
97e484b8e6 Rename toggle --> open 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-15 14:30:27 +05:30
RMidhunSuresh
88a1e34987 Unsubscribe on dispose 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-14 21:04:44 +05:30
RMidhunSuresh
7b811aa927 Remove space after brace in two places 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-14 20:33:32 +05:30
RMidhunSuresh
e10b455b27 Rename method 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-14 20:32:05 +05:30
Bruno Windels
75ee509361 fix lint 2021-06-11 11:30:11 +02:00
Bruno Windels
6bdbbee83e undo forced offline mode 2021-06-11 11:05:34 +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
Bruno Windels
cb051ad161 WIP3 2021-06-09 16:52:30 +02:00
RMidhunSuresh
e2443a8b09 Undo spillover from earlier formatting havoc 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
b2f2d51594 Make formatting consistent with the codebase 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
dd9a19b7f0 Make formatting consistent 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
4005d70bb9 Increase height to make element more centered 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
fa67c5e248 Refactor function 
- Move related parameters closer together.
- Remove unused parameter.

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
95512b5144 Remove margin from top 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
6086d157e2 Make value multiple of 4 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
2c0176f3f2 Remove unwanted width 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
f3f1436bb0 Rename room info to room details everywhere 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
f917730a21 Stick to naming convention for css/html classes 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
efd37d811f Update on changes to vm 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
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
332fbdda84 Move variable to scope of conditional 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
7fbcf89539 Remove unncessary empty line 
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
c6f3b1fbbe Do not use private props from room summary 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
4700009c68 Add new test for parseUrlPath 
Make sure that the details panel stays open during room change.

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
4c962943b2 Modify setters in MenuOption to support chaining 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
0d63ce9a3a Change SideBarActive --> right-shown 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
5b74038912 Check value of details everywhere 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
b2448e1207 Calculate path when button is clicked 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
37e052c061 details do not need to be child of rooms 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30