424 Commits

Author	SHA1	Message	Date
Krille Fear	1ef2af0a82	fix: Colors	2021-11-15 07:36:07 +01:00
Krille Fear	a7a15f9481	fix: Do not display bottombar in selectmode	2021-11-15 07:27:19 +01:00
Krille Fear	226c97526e	fix: Color in bottom bar	2021-11-15 07:24:58 +01:00
Krille Fear	ae0a720d16	feat: Use SalomonBottomBar	2021-11-15 07:24:05 +01:00
Krille Fear	10480ec408	fix: Contrast in dark mode	2021-11-14 22:15:37 +01:00
Krille Fear	86566c2584	Merge branch 'krille/redesign-multiaccount-spaces' into 'main' ... feat: Redesign multiaccounts and spaces See merge request famedly/fluffychat!547	2021-11-14 21:09:17 +00:00
Krille Fear	4c97044f1c	feat: Multiple mute, pin and mark unread	2021-11-14 20:59:25 +01:00
Krille Fear	76d8dbbe09	fix: Remove opacity from video widget	2021-11-14 20:24:17 +01:00
Krille Fear	397c6ed292	feat: Nicer images, stickers and videos	2021-11-14 18:57:48 +01:00
Krille Fear	e7a3e78712	feat: Redesign multiaccounts and spaces	2021-11-14 18:47:18 +01:00
Krille Fear	055b99bc85	feat: New Public room bottom sheet	2021-11-14 13:56:36 +01:00
Krille Fear	f5c9057509	fix: Sender name prefix in DM rooms	2021-11-14 13:25:56 +01:00
Krille Fear	66a66cefa3	design: Remove cupertino icons	2021-11-14 13:24:01 +01:00
Krille Fear	dbc56c2cf2	fix: Minor design fixes	2021-11-14 12:00:49 +01:00
Krille Fear	c1cb91dc79	fix: Minor padding bugs	2021-11-14 11:53:43 +01:00
Krille Fear	c64c988910	fix: Typing indicator too large	2021-11-14 11:18:33 +01:00
Krille Fear	14fe60d8e0	feat: Display typing indicators with gif	2021-11-14 09:36:35 +01:00
Krille Fear	862d23c0b9	feat: New chat details design	2021-11-13 21:42:54 +01:00
Krille Fear	15ccd043d9	feat: New settings design	2021-11-13 21:21:13 +01:00
Krille Fear	cc00032c10	feat: Move styles one settings level up	2021-11-13 20:44:47 +01:00
Krille Fear	f03cc9b786	feat: New chat design	2021-11-13 20:37:51 +01:00
Krille Fear	fbb92cbfe1	chore: Adjust image chat design	2021-11-13 20:17:11 +01:00
Krille Fear	917dde5a1c	fix: Minor design fixes	2021-11-13 19:36:39 +01:00
Krille Fear	6b3a94011f	chore: Make default orange darker	2021-11-13 19:28:33 +01:00
Krille Fear	9425aab475	chore: Adjust design	2021-11-13 19:22:11 +01:00
Krille Fear	bc41ff3e36	fix: Center inputfield	2021-11-13 19:02:26 +01:00
Krille Fear	1fb7e03fc6	fix: Seenby fontsize	2021-11-13 18:56:34 +01:00
Krille Fear	2f89913e36	feat: Nicer design of images an stickers	2021-11-13 18:55:05 +01:00
Krille Fear	86af401cfc	change: Encrypted by design, all users valid is normal not green	2021-11-13 18:47:05 +01:00
Krille Fear	eb429267b1	fix: Hide FAB in new chat page if textfield has focus	2021-11-13 18:09:16 +01:00
Krille Fear	fcc41a8d1d	feat: Make the main color editable for users	2021-11-13 17:57:55 +01:00
Krille Fear	39f7fd6c0b	fix: Chat background	2021-11-13 17:13:09 +01:00
Krille Fear	e2cdad27e0	feat: new design	2021-11-13 16:10:16 +01:00
Krille Fear	7e2148fa9b	refactor: Make methods shorter	2021-11-13 11:54:23 +01:00
Krille Fear	a817773de8	fix: Dont enable encryption with bots	2021-11-13 11:51:35 +01:00
Krille Fear	2311039e83	refactor: Split chat view into multiple files	2021-11-13 10:20:09 +01:00
Krille Fear	07033ab9b0	fix: Wait for loading before bootstrap	2021-11-11 19:52:56 +01:00
Krille Fear	762139d43d	fix: Bootstrap loop	2021-11-11 19:39:55 +01:00
Krille Fear	43fd4c903f	feat: Sembast store	2021-11-11 18:09:04 +01:00
Krille Fear	563a67eabd	fix: Crash when there is no prev message	2021-11-11 18:05:12 +01:00
Krille Fear	d46667b097	refactor: Pages folder structure	2021-11-09 21:32:16 +01:00
Krille Fear	3342071acf	fix: Chat list flickering	2021-11-09 17:30:04 +01:00
Krille Fear	bcd0d56bea	fix: Move to latest null safe sdk	2021-11-09 16:55:28 +01:00
Krille Fear	7cf9fc479f	Merge branch 'main' of gitlab.com:famedly/fluffychat	2021-11-09 13:26:45 +01:00
Krille Fear	b903bf8472	feat: Speed up app start	2021-11-09 13:07:57 +01:00
Krille Fear	66cae6cc85	design: Floating input bar	2021-11-06 11:18:32 +01:00
Krille Fear	40f383261c	fix: Signup on matrix.org	2021-11-04 17:10:16 +01:00
Krille Fear	c51ba11fcb	chore: Add localizations to signup page	2021-11-04 16:13:02 +01:00
Krille Fear	d24558f675	fix: Sending ThreepidCreds in UIA	2021-11-04 16:09:12 +01:00
Krille Fear	b48cf2ecdc	feat: Nicer registration form	2021-10-30 14:06:10 +02:00
Krille Fear	bc78647fb6	fix: Mark voice messages with msc3245	2021-10-30 11:03:33 +02:00
Krille Fear	f8cc559ab3	fix: Record voice messages	2021-10-30 10:39:00 +02:00
Krille Fear	eec73cb16a	fix: Display amplitude	2021-10-27 17:01:27 +02:00
Krille Fear	699b99bcf8	feat: Nicer audio message design and send duration	2021-10-27 16:53:31 +02:00
Krille Fear	15ee1f02b5	refactor: Sort imports	2021-10-26 18:50:34 +02:00
Krille Fear	fcdf5a7ee4	refactor: Magic numbers	2021-10-26 18:47:05 +02:00
Krille Fear	56646cb697	Merge branch 'ignore_from_sheet' into 'main' ... feature: ignore from bottom sheet Closes #574 See merge request famedly/fluffychat!537	2021-10-26 16:34:56 +00:00
Krille Fear	5705ebdaab	fix: Enable E2EE by default in all start chat cases	2021-10-25 11:51:38 +02:00
Raatty	e17376c5a2	feature: ignore from bottom sheet	2021-10-25 22:42:18 +13:00
Krille Fear	f884e8082f	chore: Update SDK	2021-10-25 10:46:58 +02:00
Krille Fear	a2f247920c	fix: Format	2021-10-17 14:15:29 +02:00
Krille Fear	12cdee068d	fix: Disable matrix registration again	2021-10-16 10:46:52 +02:00
Krille Fear	4a8d50c201	design: Make homepicker page nicer	2021-10-16 10:28:50 +02:00
Krille Fear	e879278186	refactor: Add code quality reports	2021-10-16 09:59:38 +02:00
Krille Fear	44ce92e8fb	refactor: Switch to flutter_lints	2021-10-14 18:09:30 +02:00
Krille Fear	79766a6d69	chore: Adjust settings account design	2021-10-14 17:02:42 +02:00
Krille Fear	dd5f9b2c42	fix: Bootstrap column design	2021-10-14 16:56:08 +02:00
Krille Fear	fdcb34e3a3	fix: Disable registration for matrix.org	2021-10-13 14:21:17 +02:00
Krille Fear	4ab57c2900	CircularProgressIndicator.adaptive(	2021-10-10 13:39:34 +02:00
Krille Fear	eca3905e0c	fix: column design for bootstrap	2021-10-10 13:35:16 +02:00
Krille Fear	741d4ddba3	feat: Account settings displays current matrix ID	2021-10-10 12:57:28 +02:00
Krille Fear	8f221f3ca2	feat: More finetuning for font sizes	2021-10-10 12:41:43 +02:00
Krille Fear	1d16706ab3	feat: Nicer verification dialog	2021-10-10 12:11:59 +02:00
Krille Fear	127275782a	fix: QR Code scanning	2021-10-10 11:42:18 +02:00
Krille Fear	0433d8cf81	feat: Nicer chat backup design	2021-10-10 11:40:08 +02:00
Krille Fear	849a3d95e4	design: Change design of verification page	2021-10-10 10:58:03 +02:00
Krille Fear	f2e37b20ff	feat: Enable E2EE by default for new rooms	2021-10-10 10:43:50 +02:00
Krille Fear	9ff97d0162	feat: Make QR Code clickable	2021-10-08 07:30:41 +02:00
Krille Fear	fadcad5926	fix: One space always missing	2021-09-27 08:13:50 +02:00
Krille Fear	fb4337272e	feat: Implement nice profile bottom sheet	2021-09-24 15:51:33 +02:00
Sorunome	4ee2ecc286	feat: Open user bottom sheet on tapping user pills	2021-09-22 15:13:17 +02:00
Krille Fear	4623519997	Merge branch 'soru/multiaccount-typing' into 'main' ... fix: Stop typing when switching sending client Closes #565 See merge request famedly/fluffychat!526	2021-09-21 09:16:19 +00:00
Krille Fear	c36b48302c	Merge branch 'soru/navigate-to-room' into 'main' ... fix: navigate to /rooms when switching bundle Closes #566 See merge request famedly/fluffychat!527	2021-09-21 07:20:56 +00:00
Sorunome	57088bf741	fix: navigate to /rooms when switching bundle	2021-09-21 09:16:57 +02:00
Sorunome	d647d8cc64	fix: Stop typing when switching sending client	2021-09-21 09:15:25 +02:00
Sorunome	7867af858d	fix: Only use prefix switching if we have complex bundles	2021-09-21 09:08:18 +02:00
Christian Pauly	d2b4ac4d9f	fix: Display account picker only if complex bundles is true	2021-09-20 17:43:37 +02:00
Krille Fear	03dfd87a65	fix: Multi-Account setup with well-known	2021-09-20 09:02:04 +02:00
Christian Pauly	9115d44b65	chore: Adjust colors	2021-09-19 22:03:57 +02:00
Christian Pauly	3d5eb6e061	fix: EmptyPage appbar on dark mode	2021-09-19 22:00:54 +02:00
Krille Fear	deab7c83e3	feat: Allow loading of multiple clients in main.dart	2021-09-19 11:48:23 +00:00
Christian Pauly	64cef3429e	fix: Password reset	2021-09-19 13:08:33 +02:00
Christian Pauly	b2417fe1f3	fix: Possibly fix voice messages on iOS	2021-09-18 10:20:57 +02:00
Sorunome	e36a6aed74	fix: emote settings	2021-09-16 14:36:28 +02:00
Krille Fear	e5b62d893d	refactor: Upgrade to Flutter 2.5	2021-09-13 17:41:53 +02:00
Krille Fear	7aa72c3c08	chore: Update SDK	2021-09-13 15:28:35 +02:00
Christian Pauly	c779577f00	fix: Import sdk	2021-09-10 11:23:40 +02:00
Christian Pauly	3dd56e02ed	chore: Update SDK	2021-09-10 10:44:24 +02:00
Christian Pauly	6984206d66	feat: Implement in-app signup	2021-09-10 10:31:18 +02:00
Christian Pauly	0f3f17c2f1	design: Make divider more thin	2021-09-07 14:25:26 +02:00
Christian Pauly	f7ec11a592	fix: Status bar on Android tablets invisible	2021-09-07 14:22:47 +02:00
Krille Fear	032b40868d	Merge branch 'soru/fix-empty-timeline' into 'main' ... fix: Empty timeline crashing See merge request famedly/fluffychat!511	2021-09-07 12:21:12 +00:00
Raatty	b3eb29844b	removeExile was a source of confusion	2021-09-07 17:18:22 +12:00
Krille Fear	6d5e06a723	Merge branch 'soru/fix-load-member-in-timeline' into 'main' ... fix: Properly re-render the timeline etc. when the full userinformation was fetched See merge request famedly/fluffychat!500	2021-09-06 18:25:53 +00:00
Sorunome	1b01cdc379	fix: Empty timeline crashing	2021-09-06 20:16:01 +02:00
Christian Pauly	55d82d3437	chore: Add label to homeserver textfield	2021-09-02 10:01:29 +02:00
Christian Pauly	888935cf4d	design: CircularProgressIndicator looks better here	2021-09-01 10:31:31 +02:00
Christian Pauly	a7cf8e91b8	refactor: Rethrow history request fails	2021-09-01 10:31:19 +02:00
Christian Pauly	c336bd8b21	chore: Remove gradient and add login wallpaper	2021-08-31 11:51:39 +02:00
Bram van den Heuvel	4250fa9223	Explicitly add Content-Type header on emote upload	2021-08-29 17:44:56 +00:00
Krille Fear	1c4b0bdba6	Merge branch 'soru/missing-null-check' into 'main' ... fix: Make sure that you deselect rooms on leaving, even if that fails See merge request famedly/fluffychat!504	2021-08-29 15:17:08 +00:00
Christian Pauly	f65fb7d955	chore: Slightly enhance tombstone design	2021-08-29 16:57:50 +02:00
Sorunome	b0ecc408b5	fix: Make sure that you deselect rooms on leaving, even if that fails	2021-08-29 13:21:18 +02:00
Christian Pauly	161791a07d	chore: Adjust some colors	2021-08-29 12:15:51 +02:00
Christian Pauly	114685ef87	feat: New chat background colors and chatlist design	2021-08-29 11:29:14 +02:00
Sorunome	f4c527a933	fix: Properly re-render the timeline etc. when the full userinformation was fetched	2021-08-28 18:31:37 +02:00
Christian Pauly	12b114ba69	fix: Display space as room if it contains unread events in timeline	2021-08-28 18:02:01 +02:00
Sorunome	6026c8976d	feat: Dismiss keyboard on scroll in iOS	2021-08-28 17:36:23 +02:00
Krille Fear	b3b1ea33dd	Merge branch 'soru/fix-devices-page' into 'main' ... fix: missing null check Closes #527 See merge request famedly/fluffychat!496	2021-08-28 09:10:05 +00:00
Christian Pauly	8aa0670e83	fix: Open matrixTo links	2021-08-28 10:50:12 +02:00
Christian Pauly	abe200f90a	fix: send on enter	2021-08-28 10:35:11 +02:00
Sorunome	e3e815ecf0	fix: missing null check	2021-08-27 16:56:12 +02:00
Christian Pauly	dcee386da4	fix: Analyzer bugs	2021-08-26 19:03:08 +02:00
Christian Pauly	54aacc1c35	feat: Send on enter	2021-08-24 20:43:21 +02:00
Christian Pauly	4f3083461f	fix: Analyzer	2021-08-24 14:41:37 +02:00
Christian Pauly	956d766a3f	fix: Open matrix.to urls	2021-08-24 14:15:35 +02:00
Christian Pauly	0728a30565	feat: Beautify qr code scanner	2021-08-24 14:07:49 +02:00
Christian Pauly	d29729c27c	fix: QR Scanner permission	2021-08-23 18:36:13 +02:00
Christian Pauly	14586297dc	change: Polish new chat design	2021-08-23 18:32:57 +02:00
Christian Pauly	4b93382fb9	fix: Sharing invite link	2021-08-23 08:40:01 +02:00
Christian Pauly	f9111b6bb3	fix: Padding and colors	2021-08-22 21:50:19 +02:00
Christian Pauly	6a432ae8de	feat: Implement qr code scanner	2021-08-22 21:19:22 +02:00
Christian Pauly	b5c3d7b1e3	feat: New design for new chat page	2021-08-22 21:09:05 +02:00
Krille Fear	b02b77716f	Merge branch 'fix_wallpaper' into 'main' ... fix: wallpaper on linux Closes #489 See merge request famedly/fluffychat!493	2021-08-22 10:05:50 +00:00
Krille Fear	e05a99293a	Merge branch 'soru/escape-routes' into 'main' ... fix: Properly encode and decode vRouter paths See merge request famedly/fluffychat!487	2021-08-22 10:05:30 +00:00
Raatty	2bf64c35ea	fix: wallpaper on linux	2021-08-22 16:03:18 +12:00
Krille Fear	12a3b04142	Merge branch 'soru/no-autocorrect-homeserver-url' into 'main' ... fix: Disable autocorrect for the homeserver url field Closes #515 See merge request famedly/fluffychat!490	2021-08-20 17:58:43 +00:00
Sorunome	e04137cddb	fix: Re-add login fixes with the new SDK	2021-08-20 16:58:59 +02:00
Krille Fear	6dddf566a2	refactor: Migrate to new matrix sdk API	2021-08-18 15:24:59 +00:00
Sorunome	4ae099fa5d	fix: Disable autocorrect for the homeserver url field	2021-08-16 18:38:22 +02:00
Krille Fear	68a29007a6	Merge branch 'soru/join-rooms' into 'main' ... fix: Joining room aliases not published into the room directory Closes #514 See merge request famedly/fluffychat!486	2021-08-16 06:19:59 +00:00
Krille Fear	ff45b17227	Merge branch 'soru/empty-room' into 'main' ... fix: Empty timelines crashing the room view See merge request famedly/fluffychat!488	2021-08-16 06:18:53 +00:00
Christian Pauly	2475921599	fix: Report content localizations	2021-08-15 20:43:38 +02:00
Sorunome	2c6b962c37	fix: Empty timelines crashing the room view	2021-08-15 19:44:38 +02:00
Sorunome	e283b6a346	fix: use vrouter.toSegments	2021-08-15 13:27:58 +02:00
Sorunome	dbadbc59e2	fix: Joining room aliases not published into the room directory	2021-08-15 09:14:23 +02:00
Sorunome	95bcb467c7	feat: Implement official emoji translations for emoji verification	2021-08-14 16:46:20 +02:00
Christian Pauly	8cfe2a1899	fix: Requirements when to display report event button	2021-08-12 21:40:55 +02:00
Christian Pauly	e6358996e6	fix: Dont add/remove DMs to space	2021-08-12 21:11:57 +02:00
Christian Pauly	22ae2608e0	change: Nicer design for selecting items	2021-08-12 21:10:26 +02:00
Christian Pauly	689e298865	feat: Add remove rooms to and from spaces	2021-08-12 20:46:27 +02:00
Christian Pauly	3ebf3ed26c	fix: Load space members to display DM rooms	2021-08-12 20:34:14 +02:00
Christian Pauly	51d9a56058	fix: Display loading dialog on start DM	2021-08-12 12:15:43 +02:00
Christian Pauly	386144f0bc	fix: Reply with voice messages	2021-08-12 09:59:42 +02:00
Christian Pauly	493987fe74	feat: Cupertino style record dialog	2021-08-12 09:48:10 +02:00
Christian Pauly	ca3d409714	fix: Display amplitude	2021-08-12 09:44:19 +02:00
Christian Pauly	8ca1151f3e	fix: Missing null check	2021-08-11 22:04:55 +02:00
Christian Pauly	47bce19d4a	feat: Display amplitude	2021-08-11 21:21:08 +02:00
Christian Pauly	ddba6c2ad6	fix: Keep display alive while recording	2021-08-11 21:17:11 +02:00
Marcus Hoffmann	5707120fc1	chore: switch image_picker back to upstream ... https://github.com/flutter/plugins/pull/3194 has finally been merged. Also update to non-deprecated pick* methods.	2021-08-10 14:01:15 +02:00
Krille Fear	5bb070b318	Merge branch 'soru/autofill-hints' into 'main' ... fix: Wrap login form into `AutofillGroup` Closes #503 See merge request famedly/fluffychat!481	2021-08-09 08:46:50 +00:00
Sorunome	e2a194484f	fix: Wrap login form into AutofillGroup	2021-08-08 19:30:51 +02:00
Sorunome	7443309b15	feat: Add option to not autoplay stickers and emotes	2021-08-08 19:21:34 +02:00
Sorunome	e8376b56f1	Merge branch 'soru/video-player' into 'main' ... feat: Add video player Closes #192 See merge request famedly/fluffychat!479	2021-08-08 16:47:23 +00:00
Sorunome	0e29f0057b	feat: Add video player	2021-08-08 18:31:16 +02:00
Sorunome	eabb548215	fix: Allow fallback to previous url if there is no homeserver on the mxid domain	2021-08-08 08:46:19 +02:00
Christian Pauly	c66009543c	change: Placeholder at username login field should be just username	2021-08-07 14:47:55 +02:00
Sorunome	d22b1689c4	feat: Add location sharing	2021-08-06 12:59:19 +02:00
Sorunome	92674b4424	fix: missing null check	2021-08-05 18:16:52 +02:00
Christian Pauly	c77ea2e325	fix: Space settings routing problems	2021-08-04 10:15:42 +02:00
Christian Pauly	1d92af38cb	refactor: Chat list view	2021-08-04 10:09:55 +02:00
Christian Pauly	36fac99de6	fix: Do not copy room list	2021-08-04 10:08:48 +02:00
Christian Pauly	fcc66d2820	fix: Remove old workaround	2021-08-04 10:08:21 +02:00
Christian Pauly	2297195ba7	feat: Nicer spaces list	2021-08-04 10:05:58 +02:00
Christian Pauly	d487ddc05b	feat: Space settings route	2021-08-04 09:56:05 +02:00
Christian Pauly	e7044e0e67	fix: display space invites in chat list	2021-08-04 09:49:34 +02:00
Christian Pauly	afbd3c41a5	fix: Wrong uri subscription	2021-08-02 18:41:09 +02:00
Christian Pauly	ac7ee03bd9	fix: Add missing null check	2021-08-01 16:06:34 +02:00
Christian Pauly	d6728783a2	fix: Wait for first sync on bootstrap	2021-08-01 16:05:32 +02:00
Christian Pauly	a6ab9a2ab0	fix: Wait for first sync on bootstrap	2021-08-01 15:48:27 +02:00
Christian Pauly	0135780f65	fix: Missing null check and bootstrap ask	2021-08-01 15:45:41 +02:00
Christian Pauly	bb7c095ae3	fix: Logic which rooms belong to a space	2021-08-01 15:33:26 +02:00
Christian Pauly	648e690a0d	refactor: ChatListView and enforce bootstrap	2021-08-01 15:21:02 +02:00
Christian Pauly	3226dc5a11	feat: Implement new space view	2021-08-01 08:05:40 +02:00
Christian Pauly	2ebefddbe0	feat: Implement basic space editing	2021-08-01 07:54:44 +02:00
Christian Pauly	d3f87aeaad	feat: Light implementation of spaces drawer	2021-08-01 07:45:34 +02:00
Sorunome	a5fc4521cb	Merge branch 'soru/image-pack-creator' into 'main' ... chore: cleanup image pack editor to attach metadata and prepare to make it more general See merge request famedly/fluffychat!466	2021-07-31 15:30:27 +00:00
Sorunome	5a44b3b3d1	chore: cleanup image pack editor to attach metadata and prepare to make it more general	2021-07-31 17:13:35 +02:00
Sorunome	493c88649d	feat: Rate limit streams so that large accounts have a smoother UI	2021-07-31 12:55:02 +02:00
Christian Pauly	b78b6542a2	fix: Reset bootstrap on bad ssss	2021-07-24 11:45:27 +02:00
Christian Pauly	b71dd4bc08	fix: Hide stickers button when there is not sticker pack	2021-07-24 10:52:54 +02:00
Christian Pauly	4c2e690125	fix: Record voice messages on iOS	2021-07-24 10:35:18 +02:00
Sorunome	205d7e8f5f	feat: Add sticker picker	2021-07-23 19:33:04 +02:00
Sorunome	99bc8198e9	feat: Nicer mentions	2021-07-20 17:54:48 +02:00
Sorunome	b05189230f	chore: Update image pack file format to match that of the emote msc	2021-07-18 20:00:20 +02:00
Christian Pauly	befd8e1160	feat: Android SSO in webview	2021-07-18 19:04:09 +02:00
Christian Pauly	12eb09f553	Merge branch 'main' of gitlab.com:famedly/fluffychat	2021-07-18 12:37:03 +02:00
Christian Pauly	6821a421b6	fix: Make sure the textfield is unfocused before opening the camera	2021-07-18 12:17:56 +02:00
Christian Pauly	ba685b7a1f	fix: Close safariviewcontroller on SSO	2021-07-15 14:04:29 +02:00
Krille Fear	f97216d8af	Merge branch 'soru/set-prefered-jitsi' into 'main' ... fix: Check for jitsi server in well-known lookup also on login screen See merge request famedly/fluffychat!436	2021-07-13 16:31:09 +00:00