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

2559 commits

Author SHA1 Message Date
Bruno Windels
1862e31396
Merge pull request #417 from MidhunSureshR/member-details 
Member Panel - PR 2 - UI
 2021-08-06 11:18:52 +00:00
RMidhunSuresh
7e8d76a95e Refactor map into switch-case 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-06 16:21:31 +05:30
RMidhunSuresh
bc8e6237d6 Merge suggestion from Github 2021-08-06 16:05:08 +05:30
R Midhun Suresh
3ff55204f3
No need for lambda here 
Co-authored-by: Bruno Windels <bruno@windels.cloud>
 2021-08-06 16:04:51 +05:30
RMidhunSuresh
dbd205701c Remove unused prop 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-06 16:03:19 +05:30
RMidhunSuresh
86ddfc1e9e Only need to emit 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-06 13:06:38 +05:30
R Midhun Suresh
974d9bf199
Don't cache powerlevel value 
Co-authored-by: Bruno Windels <bruno@windels.cloud>
 2021-08-06 13:02:58 +05:30
Danila Fedorin
21b067eaff Create new tiles instead of keeping old ones 2021-08-05 10:05:50 -07:00
Danila Fedorin
434882069e Lift tiles creator to RoomViewModel 2021-08-05 09:39:59 -07:00
Bruno Windels
73884cff0d
Merge pull request #412 from MidhunSureshR/member 
Member panel - PR 1 - Add method to fetch member
 2021-08-05 11:13:52 +00:00
RMidhunSuresh
49be4e64ca Remove object 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
fea4143af9 Use texttransform 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
d3ea26a38a Use i8n in role 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
862e8569a9 Describe what changed in emitChange() 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
a16c3aacab Create getter 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
28a0a0830f Copy over all segments after right-panel 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
0ff0850979 Remove dm user option 
- I don't know why but I thought .../open-room/<user_id> would open an
  invite view to a room with the specified user.
- Does not work like that, so removed.

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
d056a9f961 Keep memberlist until rightpanel is closed 
- This should make switching between memberlist and
  member-details panel smoother for large rooms

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
16887c3c33 Better formatting 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
448bf3cb3f Style tile 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
4784bcc590 Make the tiles link to details 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
65b1a1958a Add link to open member details 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
7dacbdb700 Show back button 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
7530b28130 Improve segment adding logic 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
ef17808fbd Fallback to memberlist if member not available 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
f9b1068bae Add links 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
fe6551ff3c Use powerlevel 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
c9224c13a7 Improve code and css 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
c2b9c3f726 Add isEncrypted to vm 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
7ef7c419e3 Add basic UI and styling 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
acdba8fc02 Add license headers 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
e4bb20575b Create navigation and add to right panel 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
fdd4caa0b7 Create vm and view 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:30 +05:30
RMidhunSuresh
7e481080b5 Return null 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-05 16:32:06 +05:30
Danila Fedorin
a9731f5a1d Clean up code for inserting emotes 2021-08-04 16:02:37 -07:00
Danila Fedorin
b4a0c31e1c Update test code with new function signature 2021-08-04 15:54:11 -07:00
Danila Fedorin
508214a46b Insert emote text after quotes 2021-08-04 15:50:42 -07:00
Danila Fedorin
b5f16468ce Add a flag to strip replies 2021-08-04 15:31:25 -07:00
Danila Fedorin
06961ff693 Add isReply flag to entries 2021-08-04 15:30:35 -07:00
Danila Fedorin
960e3ec469 Fix unsubscribing from observed events containing null 2021-08-04 11:08:35 -07:00
Danila Fedorin
2375bf061c Strip relates_to from encrypted events' original contents. 2021-08-04 10:26:03 -07:00
Danila Fedorin
fa985f8f16 Blurb isn't really the right word. 2021-08-04 09:30:02 -07:00
Danila Fedorin
611c6e9717 Move replying code into reply.js and add license 2021-08-04 09:26:26 -07:00
Bruno Windels
0dc5041f47 WIP 2021-08-04 15:23:03 +02:00
Danila Fedorin
1a0e305212 Extract ComposerViewModel to its own file 2021-08-03 14:02:11 -07:00
Danila Fedorin
f0b6384ad7 Rename 'disabled' to 'interactive' in BaseMessageView 2021-08-03 13:27:33 -07:00
Danila Fedorin
8956f6ecf4 Fuse methods and properties related to replies 2021-08-03 13:10:36 -07:00
RMidhunSuresh
c9a4c393ed Return null 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-02 23:51:19 +05:30
RMidhunSuresh
e363d32921 Return null on error 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-02 23:42:55 +05:30
RMidhunSuresh
bb68b4d367 Fetch member data from from state event if needed 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-02 23:01:44 +05:30
Bruno Windels
a9308f69b8
Merge pull request #420 from MidhunSureshR/add-license 
Add missing license headers
 2021-08-02 15:10:18 +00:00
Bruno Windels
89d9cd3782
Merge pull request #421 from MidhunSureshR/fix-avatar-lint 
Fix lint warning
 2021-08-02 15:09:31 +00:00
RMidhunSuresh
6cfb4cfbe0 Support state events 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-08-02 17:50:09 +05:30
Danila Fedorin
9bd7d1397c Preserve the m.relates_to field for message. 2021-07-30 14:37:34 -07:00
Danila Fedorin
99a630fb84 Add a note on TilesCollection and diposing of tiles 2021-07-29 10:46:17 -07:00
Danila Fedorin
28248722a3 Fix incorrect conditions for showing avatar 2021-07-28 16:17:25 -07:00
Danila Fedorin
e2ad589aa3 Go through and clean up affected files. 2021-07-27 16:51:34 -07:00
Danila Fedorin
fb54ab68a3 Tweak reply style 2021-07-27 15:12:03 -07:00
Danila Fedorin
3d911f2a22 Add escaping to replies 2021-07-26 14:49:06 -07:00
Danila Fedorin
753bb8392b Add mx-reply to dompurify's list so we can ignore it ourselves. 2021-07-26 12:21:20 -07:00
Danila Fedorin
305fab467e Send a formatted body from quotes 2021-07-23 16:45:22 -07:00
Danila Fedorin
0db6870edb Flesh out the fallback formatting a bit. 2021-07-23 16:37:23 -07:00
Danila Fedorin
c0d39a5983 Add very rudimentary fallback reply formatting code 2021-07-23 15:34:04 -07:00
Danila Fedorin
242a9c209b Handle replies in EventEntry 2021-07-23 14:34:11 -07:00
RMidhunSuresh
34f1ecc0dc Remove unused import 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-23 18:10:17 +05:30
RMidhunSuresh
281dc8bdb4 Add missing license headers 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-23 18:05:48 +05:30
Danila Fedorin
711732200e Make the reply box more distinct 2021-07-22 14:44:57 -07:00
Danila Fedorin
b0c5b2f2ce Use the proper tile view to display reply preview 2021-07-22 14:15:18 -07:00
Danila Fedorin
650389538d Add some basic styling 2021-07-22 14:07:13 -07:00
Danila Fedorin
83f7391af3 Adjust CSS to match new class structure 2021-07-22 13:39:40 -07:00
Danila Fedorin
1dcfdfc1d8 Split composer into preview and input 2021-07-22 13:37:35 -07:00
Danila Fedorin
013f187dc2 Avoid inserting li tags outside a list 2021-07-22 12:51:24 -07:00
Danila Fedorin
66f686210f Add a very basic, unstyled view of the message to the composer. 2021-07-22 12:28:24 -07:00
Danila Fedorin
94ae5faa3c Add a disabled flag to message view. 2021-07-22 11:16:34 -07:00
Danila Fedorin
7adb0e5ddc Get rid of intermediate view model 2021-07-22 10:56:30 -07:00
RMidhunSuresh
3aeb0c4d98 Indicate if no member found 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-21 18:34:55 +05:30
Danila Fedorin
d33d55376a Put reply into its own view model. 
Otherwise, we re-render the reply message on
every keystroke.
 2021-07-20 16:51:36 -07:00
Danila Fedorin
f486bc0e04 Reset reply state after successfully sending a reply 2021-07-20 13:01:04 -07:00
Danila Fedorin
46215b3c51 Add the ability to reply 2021-07-20 12:53:31 -07:00
Danila Fedorin
800b4785d1 Accomodate in_reply_to relation shape 2021-07-20 12:17:44 -07:00
Danila Fedorin
fdcafaf6d3 Add _replyTo field to ComposerViewModel that can be set from a message 2021-07-19 16:10:35 -07:00
RMidhunSuresh
05f05bb577 Add method to get member from storage 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-19 19:36:09 +05:30
Danila Fedorin
c9e937c41c Add redundancy to prevent stored nulls from causing errors. 2021-07-17 13:29:20 -07:00
Danila Fedorin
ad453555b9 Avoid storing null for invite avatars. 2021-07-17 13:23:13 -07:00
Bruno Windels
b036e48b66 too many .. 2021-07-16 23:54:19 +02:00
Bruno Windels
9044f4eebe also for inline code 2021-07-16 23:32:38 +02:00
Bruno Windels
bc69e1cdae make font on code snippets slightly smaller 2021-07-16 23:29:41 +02:00
Danila Fedorin
0c0633fdd4 Fix body.string in BaseMessageTile 2021-07-16 14:28:18 -07:00
Danila Fedorin
fb29913ef0 Add lint fixes 2021-07-16 14:21:39 -07:00
Danila Fedorin
c835dc324e Merge branch 'master' of github.com:vector-im/hydrogen-web into formatted-messages 2021-07-16 14:05:43 -07:00
Danila Fedorin
3e4314e7f3 Update comment based on 'small object' version of code. 2021-07-16 13:53:14 -07:00
Danila Fedorin
c620e9c930 Move away from Object.assign for image rendering. 2021-07-16 13:51:34 -07:00
Danila Fedorin
da48ddec83 Fix == typo 2021-07-16 13:49:33 -07:00
Danila Fedorin
7cfdd4f663 Rename TextTileFormat to BodyFormat 2021-07-16 13:46:25 -07:00
Danila Fedorin
031ce42831 Properly cache message format. 2021-07-16 13:43:40 -07:00
Danila Fedorin
9e1f57a2b1 Switch tiles to using enums and checking format. 2021-07-16 13:36:26 -07:00
Danila Fedorin
1e2945ca54 Add license headers to new files. 2021-07-16 13:12:26 -07:00
Danila Fedorin
996d0cfea8 Remove unneded attribute objects 2021-07-16 13:08:21 -07:00
Danila Fedorin
900ebfe289 Properly pass children to list block 2021-07-16 13:05:47 -07:00
Danila Fedorin
cdf85edad9 Move pill parsing into deserialize and avoid intermediate objects. 2021-07-16 13:01:33 -07:00
Danila Fedorin
eacc033929 Make code blocks accept non-code tags. 2021-07-16 11:38:41 -07:00
Danila Fedorin
2197d68279 Add fix to prevent pre overflow. 2021-07-16 11:00:54 -07:00
Bruno Windels
9aedc1d526 don't put body parts in span 2021-07-16 19:30:02 +02:00
Bruno Windels
629d58b041 limit code block height 2021-07-16 19:16:15 +02:00
Bruno Windels
2ce6cea4ff not used anymore 2021-07-16 19:16:06 +02:00
Bruno Windels
b5b19abb24 only allow links for the schemas mentioned in the spec 2021-07-16 18:32:40 +02:00
Bruno Windels
fe3bdda05a all of these should be scoped to messageBody 2021-07-16 17:27:24 +02:00
Bruno Windels
1f82aef4ad some header styling in messages 2021-07-16 16:53:33 +02:00
Bruno Windels
47c1737371 make <code> styling like element 2021-07-16 16:28:03 +02:00
Bruno Windels
2159b67ba4 make link styling like element, blue an no underline 2021-07-16 16:27:43 +02:00
Bruno Windels
f012c64fc5 fix pill styling a bit, and open in new tab/noopener 2021-07-16 16:27:22 +02:00
RMidhunSuresh
1a721fe7e8 Import from AvatarView.js 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:13:18 +05:30
RMidhunSuresh
7c9755d1a6 Fix width for smaller screens 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
86bb56ab6f Fix layout of details panel in mobile 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
436e87578e Initialize prop in constructor 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
ec4a783759 Fix disambiguator 
- Do not disambiguate name on room rejoin

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
66d5f4d1a3 Make code clearer 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
9fdfebf00d Replace get with iterator and remove lambda 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
f366479c16 Fix move bug 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
0bd1d2b291 Improve code 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
829830c0fa Fix lazylist 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
0e0976c7f5 Inline method 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
611524cdda Log instead of throwing error 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
ec8b6f9dd2 Inline method 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
c410aed672 Use flex instead of setting height 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
4946683b23 Use ifView instead of mapView 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
694b627309 Inline method 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
1f67aa34d3 Move LoadingView.js 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
da733f9f8a Move files to members directory 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
0ac3d3727b Remove TemplateView 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
9a3d7e416a Remove top padding of room details view 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
4bac98d39a More css fixes 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
c4c0e0206f Clear margin on ul 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
fe18b61688 Css fixes 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
5c0c59044f Move spinner before the text 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
60793798c7 Subscribe to powerLevels 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
960f2c283e Remove comment 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
e406aa6e45 Add jsdoc for powerlevels 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
5873ab63ba Release memberlist after panel is closed 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
5a54be2e2e Style loading view 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
be46d870aa Center names 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
c7e12c98b5 Make addPanelIfNeeded more generic 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
b126ba1370 Fix lazy list css 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
f98a8847e3 Implement UX 
- Add chevron to member count in room details
- Make some rows in panel buttons
- Add user chrome to right panel
- Style UI

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
21f47f21aa Add chevron to button 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
8e55967db3 Create UI to open memberlist from details panel 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
72f79e8bef Reduce padding 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
8ee9cb10c2 Move css to layout.css 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
fe4f6d2308 Remove listHasChangedSize 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
c073d4c0d0 Unmount child views correctly 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
2502c4024a Fix broken tests 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
8e39aed4b6 Ensure that power levels are loaded only once 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
14c00f50fc Make loadPowerLevels private 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
22fab3761a Remove timeline reader and only use roomState 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
8a976ef24b Make powerLevels observable 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
d1f465e6cc Replace slice with iterator 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
c539c38699 Account for padding in itemHeight 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
f506cf615b div --> li 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
ea0851eb94 Keep memberlist panel open on room/grid change 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
d3a8e95962 Find height of container from DOM 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
5338457ea0 Use normalized index in recreateItem 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
85924aba92 Fix update method 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
4cb9adc9ea Remove misleading comment 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
9a00143623 Improve comment 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
96e2bb0b1a Add explaining comment 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
f05574f579 Fix updates 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
452eee6767 Incorporate lazyrender code from element 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
ee072343f5 Switch to lazy list 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
0b9f4a5e1d Add LazyListView 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
1d5b16395f Export function 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
35f6043d06 Support slice 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
db515d48c1 Inline flatten method 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
53fc6a7af9 Check prev name is string 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
11d411c9a9 Add failing test 
For empty names not un-disambiguating

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
89e256e563 Return array to prevent fetching again 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
ea06d4f88e Eliminate double lookup 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
da1e981948 name changes 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
ad6122a5b6 Add explaining comment 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
41806b5e82 Remove duplication 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
ab0a48ab31 rename rightpanel to right-panel 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
3bb82e55bf Disambiguator is not async 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
e935423814 Remove duplication in RightPanelViewModel 2021-07-16 17:08:18 +05:30
RMidhunSuresh
bcfd1bd135 Support loading view for all panels 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
d64d07aee5 Move loading view into separate file 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
3fb89a81bc Add some initial styling 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
7139711314 Add avatar to tile 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
86c1550850 Switch to collator for perf reasons 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
3d4ba20150 Put up a temporary loading view 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
ef40027502 Call disambiguate on update/map 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
bcb46fc54a Make tile vm support disambiguation 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
b8542c6754 Implement name disambiguation 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
dea0cad252 Fix bug in FilteredMap 
Caused multiple updates to be triggered.

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
404129f60e Settle on MappedMap 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
f41c835e91 Support updater in MappedMap 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
0819dcb29e Use MappedList instead of MappedMap 
- MappedList supports an optional updater method

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
b62473ae79 Add update method 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
4fcaac3865 Add binding in view 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
11eb9c7783 Use set instead of add in memberlist 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
2e8c4563aa Implement set method to support update from value 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
a1e3ff3ed8 Use name instead of displayName 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
a9ff6ab026 Sort memberlist using powerlevel 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
3e23392a0e Consider powerlevels in comparator and add tests 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
cb5e598e95 Getter for powerlevel from room 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
f7a6fbd901 Make getUserLevel() public 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
ddb7a16fb8 Make member private 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
7e72d57be7 Make list scrollable 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
abd2c19bf2 Remove unused param 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
a765d7fc7d Create memberlist view from rightpanel 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
f3c7ab337d Remove code from session view/vm 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
46a6cf6adf Add memberlist to navigation 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
1418645e15 Modify CSS to reflect changes 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
dfe7385611 Accommodate "rightpanel" navigation segment 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
8b01ca502e Create RightPanel from SessionViewModel 
- Also remove old methods used in RoomDetails

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
7500bbeaad Modify navigation to work with rightpanel segment 
- Ensure that rightpanel does not show in the URL.
- Create an action of details to insert the rightpanel segment.
- Make sure rightpanel can be a child of room.

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
b74e4452dd Move rightpanel to separate view and vm 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
7e6e4ecfab Duplicate navigation from room details 
- TODO: Remove duplication

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
RMidhunSuresh
69237fce85 Basic barebones of memberlist view 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-16 17:08:18 +05:30
Danila Fedorin
c619eba8cf Add some styling to the tables. 2021-07-15 13:19:54 -07:00
Danila Fedorin
d69b78469c Add table viewing code. 2021-07-15 13:19:54 -07:00
Danila Fedorin
f6f29adacc Add a comment about avatar.js 2021-07-15 13:16:42 -07:00
Danila Fedorin
c13daedcb0 Ignore non-absolute links. 2021-07-15 13:15:56 -07:00
Bruno Windels
fb3c090de2 confirm the leave room 2021-07-15 14:30:16 +02:00
Danila Fedorin
ba7e86ac8d Add blocquote style. 2021-07-14 18:11:09 -07:00
Danila Fedorin
025ab16668 Fix /me body rendering. 2021-07-14 18:10:59 -07:00
Danila Fedorin
038b101ed7 Render matrix.to user links as pills 2021-07-14 17:57:53 -07:00
Danila Fedorin
78d7d556e4 Add blockquote and del elements. 2021-07-14 12:38:55 -07:00
Danila Fedorin
763e1cd5de Add tentative version of linkification. 2021-07-13 16:56:46 -07:00
Danila Fedorin
0c05ff459c Add another test. 2021-07-13 15:14:03 -07:00
Danila Fedorin
5e39eb8f6c Do some additional validation, blocking block nodes inside inline nodes. 2021-07-13 14:47:10 -07:00
Danila Fedorin
4b92903ddd Add a test for auto-closing tags. 2021-07-12 15:16:04 -07:00
Danila Fedorin
4022c6121b Switch to DOMPurify in platform layer for sanitization. 2021-07-12 15:00:16 -07:00
Danila Fedorin
012ef2b215 Validate w/h and avoid use of properties object. 2021-07-12 13:42:39 -07:00
Danila Fedorin
1e9cdbafd4 Move test-specific code into the testing function. 2021-07-12 13:31:33 -07:00
Danila Fedorin
fd17ffecfb Pass parameters to parseHTMLBody directly instead of via object. 2021-07-12 12:55:33 -07:00
Danila Fedorin
c261b9fb23 Avoid intermediate objects while parsing TextTiles' bodies. 2021-07-12 12:47:22 -07:00
Danila Fedorin
9304ca330e Rewrite deserialize as a class to avoid passing options around. 2021-07-12 12:19:51 -07:00
Danila Fedorin
abd62373e5 Remove copy of MediaRepository mxcUrl parsing. 2021-07-09 13:09:19 -07:00
Danila Fedorin
1435c2c9a2 Add HTML sanitization to domain layer. 2021-07-09 13:06:24 -07:00
Danila Fedorin
695bdec9fe Match the thumbnail width and height in in-message images. 2021-07-08 14:41:05 -07:00
Danila Fedorin
b3dabc2054 Limit image size 2021-07-08 00:20:35 -07:00
Danila Fedorin
d38c52d311 Display images in messages 2021-07-08 00:16:58 -07:00
Danila Fedorin
c582b723bd Start working on images. 2021-07-07 23:40:16 -07:00
Danila Fedorin
1a14719483 Wrap DOM iterables in array. 2021-07-07 14:12:24 -07:00
Danila Fedorin
92e82a76c7 Add basic styling to code block 2021-07-07 13:05:24 -07:00
Danila Fedorin
e02163b0ff Properly display ul in message bodies. 2021-07-07 13:05:10 -07:00
Danila Fedorin
eca5308742 Move deserialization into domain and fix tests. 2021-07-07 12:21:10 -07:00
Danila Fedorin
41d82c4cdd Add some deserialization tests. 2021-07-06 19:11:05 -07:00
Danila Fedorin
49df21e465 Display lists. 2021-07-06 16:48:31 -07:00
Danila Fedorin
1da35be148 Better handle list start attribute. 2021-07-06 16:14:35 -07:00
Danila Fedorin
e56b15237e Parse formatted message bodies in addition to plain ones. 2021-07-06 16:14:04 -07:00
Bruno Windels
f515407491
Merge pull request #404 from MidhunSureshR/fix-402 
Handle avatar image error
 2021-07-05 07:48:48 +00:00
Danila Fedorin
cfa686867c Make parse a function that returns a MessageBody 2021-07-02 18:20:07 -07:00
Danila Fedorin
6ba2deffef Make small tweaks to formatted representation. 2021-07-02 18:19:40 -07:00
Danila Fedorin
005580f385 Move HTML parsing into platform. 2021-07-02 15:05:50 -07:00
Danila Fedorin
8f44cc21db Correct two uses of ==. 2021-07-02 00:41:28 -07:00
Danila Fedorin
824e66a62f Add some comments. 2021-07-02 00:23:59 -07:00
Danila Fedorin
94f6c99ea6 Begin a parser implementation from HTML into an internal representation. 2021-07-02 00:18:37 -07:00
Danila Fedorin
db202b23ae Add some prototype rendering implementations. 2021-07-01 13:55:01 -07:00
Danila Fedorin
cc506756a1 Add code tag to HTML 2021-07-01 13:55:01 -07:00
Danila Fedorin
4ee15005f5 Inline code blocks don't contain other elements 2021-07-01 13:55:01 -07:00
Danila Fedorin
fd12baae3b Add some other message parts as demo. 2021-07-01 13:55:01 -07:00
Danila Fedorin
ad868818c7 Add some initial thoughts on the implementation. 2021-07-01 13:55:01 -07:00
RMidhunSuresh
191613adbe Make changes 
- use textContent where possible
- make sure we have an image before adding title

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-01 19:21:54 +05:30
RMidhunSuresh
b8c01272f4 remove listener on dispose 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-01 15:42:07 +05:30
RMidhunSuresh
93e77a3fcd Only add attribute if we have avatar 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-01 15:41:40 +05:30
RMidhunSuresh
03a913629f Pass color as data attribute 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-01 15:25:28 +05:30
Danila Fedorin
f7d6569154 Add a small comment to Invite.avatarColorId, too. 2021-06-30 15:21:11 -07:00
Danila Fedorin
b40f946b85 Add JSDoc to new Hero method 2021-06-30 15:15:08 -07:00
Danila Fedorin
ee1f1500e9 Roll back to using heroes for computing DM color 2021-06-30 15:07:40 -07:00
RMidhunSuresh
9ed6cd57f3 use textContent 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-07-01 00:01:38 +05:30
RMidhunSuresh
168b1d6247 Move AvatarView to separate file 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-30 23:51:14 +05:30
RMidhunSuresh
b469c4299f implement new approach 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-30 23:30:44 +05:30
RMidhunSuresh
bcaf84e545 Revert commits 
This reverts commit 5f1346568d.

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-30 23:28:13 +05:30
Danila Fedorin
d0f70cbdf9 Move avatar color ID computation into SummaryData 2021-06-29 18:01:08 -07:00
Danila Fedorin
dec0683145 Correctly color archived and invited rooms 2021-06-29 16:50:42 -07:00
RMidhunSuresh
b42f7e1a36 remove both handlers 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-29 19:50:37 +05:30
RMidhunSuresh
8b6ff533e8 Add and remove opposing event listeners 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-29 15:51:11 +05:30
Danila Fedorin
6527a0c677 Make the room color match up on the left panel, too. 2021-06-28 11:54:49 -07:00
Danila Fedorin
97854423c4 Ensure DM rooms have the same color in timeline and left panel. 2021-06-28 11:44:27 -07:00
RMidhunSuresh
5f1346568d Handle avatar error 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-28 23:18:07 +05:30
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
RMidhunSuresh
a4bcb21a85 Move details handling to separate function 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
7f922afe79 Reduce duplication in code 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
04933acbfb Add missing checks 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
a3587a80c6 Use internationalization for user facing strings 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
986f04aac0 Move Room details menu entry to top 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
9074caf443 Change Room Details --> Room details 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
65bd74442f Make menu-items uniform 
- Same font ,font-size and height.

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
98ef6f4321 Use optionWithButton 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
a3271fb916 Fix Menu: Use t instead of tag to get events 
- Also move constructor up

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
8d254c91e3 Undo formatting/stylistic changes 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
3273682155 Do not show room id instead of canonical alias 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
d3d65d89ba Put sidebar rows into container 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
f1fe17fe65 Make font-size equal to that of room-header 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
040c744b6a Style links and buttons similarly in menu 
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
1e96b58f85 Add link support to menu 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
426d0779ee Keep RoomInfoView open across room/grid changes 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
02d79b52a4 Prefer canonical alias over room_id if available 
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
d782c9e0bb Justify content to flex-end instead 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
eab6ca3baf Make side-bar responsive 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
9ac415fa4f Show panel when first visit contains /details 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
b5480b018b Style open button 
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
RMidhunSuresh
ecd5505af9 Bring in info icon 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
37367cde65 Make close button close the view 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
20a250dfc0 Style close button 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
c65e26ec4c Position the close button to right end 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
91f083a245 Add close button to RoomInfoView 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
b0535b5d7d Add styling for RoomInfoView 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
c96abc8892 Add css to place items appropriately 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
f42553f8cb Add avatar size for design 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
ee29d7f799 Bring in icon assets 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
653fcbbb1f Add method to create avatar section 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
0a4f8aff79 Create method to add sidebar element 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
a23e2c361a Better styling 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
d502a7f911 Make display name bold 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
aece82dff6 Make room avatar larger in RoomInfoView 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
6f1b77b6fa Add room avatar to RoomInfoView 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
0ea2843454 Add background for sidebar 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
191eb09a76 Fallback to canonical alias if no names found 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
0d11f85ab3 Add CSS to display sidebar to the right 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
9a605cc6c6 Remove unnecessary check 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
c3333f5fe8 Extract method 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
ddaa9b46c0 Dispose vm preemptively 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
7e38c3ea88 Remove right panel on grid update if needed 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
98d8d44695 Allow details to be child of rooms 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
439910f6ca Handle case when path.get() may be null 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
96959a3c4c Put name of property in emitChange 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
e39572b98b Create RoomInformationView on toggle 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
986271d02a Add code to toggle RoomInformation panel 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
c7fd0fac07 Allow details to be child of room 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
 2021-06-09 16:51:18 +05:30
RMidhunSuresh
c7ba472042 Add view and vm for RoomInformation 
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
3e47877645 Merge branch 'master' into bwindels/reactions 2021-06-04 16:33:10 +02:00
Bruno Windels
47e74bd598 add glow animation for pending reactions 2021-06-04 16:32:35 +02:00
Bruno Windels
33655ee37e forgot to export class 2021-06-04 16:32:03 +02:00
Bruno Windels
7691b28503 prevent another race between sync and openTimeline 2021-06-04 16:28:08 +02:00
Bruno Windels
bb6905bdcd don't assume localEntries exists, as load races with sync.afterSync 2021-06-04 16:05:28 +02:00
Bruno Windels
919542f8fc Don't assume container node exists when loading bundle 
Only look for the container node when needed
 2021-06-04 15:36:01 +02:00
Bruno Windels
b7402ce43c support local echo for adding a reaction 2021-06-04 15:34:44 +02:00
Bruno Windels
8bf160dfc0 handle sending relations to events that haven't been sent yet 2021-06-04 10:48:59 +02:00
Bruno Windels
2878208e94 keep the DOM small, avoid a node for reactions on every message 2021-06-04 10:08:07 +02:00
Bruno Windels
4ef5afc011 this is actually not used, so remove it 2021-06-04 10:07:52 +02:00
Bruno Windels
dde26da5a6 add mountView utility to handle error handling on mount 
and use it where errorToDOM is used currently for catching mount errors
 2021-06-04 10:07:12 +02:00
Bruno Windels
ff370d03db catch errors thrown by childview mount method on add in ListView 2021-06-04 09:37:36 +02:00
Bruno Windels
05cc1f6757 make reactions look like element 2021-06-03 21:01:59 +02:00
Bruno Windels
d91282a767 render reactions in div instead of ul 2021-06-03 21:01:47 +02:00