97e27cb523
Added more type-hints
2022-06-17 17:18:31 +02:00
c2e889cfae
Added more type-hints
2022-06-17 17:18:31 +02:00
5106bb2881
Added parenthesis
2022-06-17 09:41:11 +02:00
a903dbd77e
Wrong braces causing 'undefined index causer-id'. See #11632
2022-06-16 23:00:16 +02:00
6035de6883
Continued:
...
- added more type-hints
- also cannot return FALSE when array is set
2022-06-16 19:06:41 +02:00
51a7b5c584
Made also this one sweeter (null-coalscing)
2022-06-16 17:36:47 +02:00
0e1f734b03
Also make this null-coalscing
2022-06-16 17:35:01 +02:00
e8fee5644b
Ops, syntax errors get unnoticed with a simple editor. :-(
2022-06-16 17:10:02 +02:00
624e4c192c
Changed to null-coalscing style (??) as sugguested by @MrPetovan
2022-06-16 16:59:54 +02:00
962b06bf41
Added check as suggested by @MrPetovan for empty $message.
2022-06-16 16:54:51 +02:00
f2b7326650
This will 2 things:
...
1) The first change prevents "expensive" code in HTML::toBBcode() to be executed
just for an empty string which makes no sense.
2) The above change was maybe flawed as $apcontact['about'] would have never
been created, not even empty which could have side effects
Thanks to @annando to make me rethink this part of code.
2022-06-16 16:54:50 +02:00
7814ba4fc4
Fixes for bad invocations of HTML::toBBCode() (1st parameter is now string)
2022-06-16 16:54:50 +02:00
b200874f17
Ops:
...
- wrong way around (!empty($foo)) is proper
- also needed to be checked on $acitivty['content']
2022-06-16 16:54:50 +02:00
b1e4c0931a
Fixes and type-hints:
...
- added more checked type-hints as they prevent bad method invocations
- fixed TypeError for HTML::toBBCode() invocations with NULL as first (wrong)
argument, thanks to @tobias@social.diekershoff.de pointing this out.
2022-06-16 16:54:49 +02:00
e9af4b5bb9
Shorter code, thanks to @annando pointing this out
2022-06-16 13:29:30 +02:00
65da5246ca
Fixed possibble "Trying to access array offset on value of type bool" E_NOTICE
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2022-06-16 10:07:41 +02:00
5fa954208a
Changes:
...
- ops, wasn't actually fixing `return;` to proper `return '';`
- added more type-hints
- added TODO ($uid is unused)
2022-06-15 22:28:33 +02:00
a3fa95e8e4
Changes:
...
- added more type-hints
- changed `return;` to `return '';` when `string` was requested as returned type-hint
(thanks to @MrPetovan )
2022-06-15 22:05:38 +02:00
34aee64349
Added more type-hints
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2022-06-15 21:52:51 +02:00
143e4c4a18
Added more known type-hints
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2022-06-15 21:52:50 +02:00
726c4dff7d
You can now store the avatar in a separate folder and host
2022-06-15 03:59:26 +00:00
b816ae4db5
Some more default avatars
2022-06-13 20:07:54 +00:00
70b9a8114d
Improve license comment
2022-06-13 10:30:21 +00:00
d9fb081db9
Using separate avatars for different peertube account types
2022-06-13 10:27:46 +00:00
c1a64b77c0
Improved license text
2022-06-13 10:03:34 +00:00
e0a0c57c44
Use platform specific default avatar pictures
2022-06-13 05:18:54 +00:00
d7d8a6ab55
Issue 11625: Don't parse the title through Markdown
2022-06-11 06:50:59 +00:00
4cf46b9770
API: Use the type field in the query for pinned posts
2022-06-11 06:05:55 +00:00
176f0c1216
API: Improve the performance for fetching pinned posts
2022-06-10 22:38:46 +00:00
143120b9c4
Merge pull request #11626 from annando/api-status
...
API: Speed improvements when fetching posts
2022-06-10 16:52:05 -04:00
4157f816f5
Fix for account variable name
2022-06-10 20:32:21 +00:00
9a1abda314
Use "avatar" instead of "contact"
2022-06-10 20:26:57 +00:00
7e747b2f41
API: Speed improvements when fetching posts
2022-06-10 18:49:03 +00:00
37405567c1
Merge pull request #11622 from Quix0r/fixes/switch-db-current-max-update
...
Switched maximum database update with currently worked on to "current/max
2022-06-08 11:22:38 -04:00
1e890e16ac
Switched maximum database update with currently worked on to "current/max" as
...
this is understandable that update X of maximum Y is applied.
Signed-off-by: Roland Häder <roland@mxchange.org>
2022-06-08 11:48:05 +02:00
2064a2ce87
Avoid notice when a contact couldn't be fetched
2022-06-08 05:35:34 +00:00
d2772908e4
Fix: respected the account type on the community page update
2022-06-07 18:52:46 +00:00
56e88d2c4c
Fix the spelling
2022-06-06 21:52:47 +00:00
19772f29f3
API: Support for markers added
2022-06-06 21:38:59 +00:00
9c7568cffc
Merge pull request #11612 from annando/rearrange
...
Rearrange the notification settings
2022-06-06 07:33:23 -04:00
9bb371850a
Different approach for empty values
2022-06-06 07:35:28 +00:00
a07e47f50c
Improved handling with empty user configuration
2022-06-06 05:43:24 +00:00
62701b49e1
Use constants
2022-06-06 04:44:29 +00:00
da33517a2d
Rearrange the notification settings
2022-06-05 21:19:21 +00:00
557b1125e2
Hopefully make threads writable
2022-06-05 20:38:05 +00:00
1196df4895
Remove test
2022-06-05 18:16:50 +00:00
001aac9952
Issue 11602: Fix error during contact merhe
2022-06-05 18:15:10 +00:00
9daeb552dd
Suppress dislikes
2022-06-05 16:54:29 +00:00
24559b711b
Notify about shared posts again
2022-06-05 16:26:20 +00:00
d242332aa4
Add the notify type to the notification query
2022-06-05 15:02:03 +00:00
13e216032f
Use the user id instead of "local_user()"
2022-06-05 14:22:16 +00:00
57b8708425
Issue 11566: More detailled notification configuration
2022-06-05 11:41:08 +00:00
b1afcb5ebf
Merge pull request #11588 from annando/mergecontact
...
New command to merge duplicated contacts
2022-06-04 15:34:37 -04:00
f1913b28e0
Issue 11594: Ensure to create notifications in the user language
2022-06-04 14:08:11 +00:00
50a0034744
Fix avatar for messages and feeds
2022-06-04 07:57:11 +00:00
4108704ee3
Fix: Only public posts can be pinned
2022-06-04 06:11:32 +00:00
194f0f7058
No dropping
2022-06-03 20:14:38 +00:00
6e3b5d251e
Merge pull request #11596 from annando/visible-activities
...
Fix: Like/Dislike/Reshare actions should now be visible
2022-06-03 15:54:49 -04:00
0aee9a054a
Fix: Like/Dislike/Reshare actions should now be visible
2022-06-03 17:40:06 +00:00
5442d09cc1
Ensure that the avatar base path exists
2022-06-03 05:28:10 +00:00
b794c599a9
Standards fixed
2022-06-01 22:18:18 +00:00
e46354a522
New command to merge duplicated contacts
2022-06-01 22:11:03 +00:00
7b219718c4
Fix: Use correct follow notification texts
2022-05-31 14:02:43 +00:00
cc6192df02
Issue 10926: Transmit pending events to accepted contacts
2022-05-30 20:52:43 +00:00
7f711e266f
Assume unsettable system.always_my_theme pconfig value is always true
...
- This was a logged in user setting so it assumes false for anonymous users
2022-05-29 16:13:49 -04:00
220703575c
Merge pull request #11577 from annando/issue-11557
...
Issue 11557: Update all local contacts
2022-05-29 15:53:21 -04:00
1e68c90fb2
Merge pull request #11576 from annando/issue-11488
...
Issue 11488: Don't search for mentions in shared posts
2022-05-29 15:49:46 -04:00
540b3f892b
Issue 11557: Update all local contacts
2022-05-29 17:48:09 +00:00
1301a53f20
Remove relocation form from Admin Site settings
2022-05-29 13:15:23 -04:00
f1630ebb05
Add relocate console command
2022-05-29 13:13:59 -04:00
7d09ce86c4
Move relocation feature in its separate class
...
- Create Database->replaceInTableFields method
2022-05-29 12:11:18 -04:00
42d3e5c1ce
Issue 11488: Don't search for mentions in shared posts
2022-05-29 16:07:53 +00:00
697b8a6cb8
Merge pull request #11575 from annando/issue-11469
...
Issue 11469: Respect desktop notification settings
2022-05-29 08:06:32 -04:00
1dccc31508
Issue 11469: Repect desktop notification settings
2022-05-29 09:20:06 +00:00
02473d8a0e
Don't touch local avatars
2022-05-29 06:50:34 +00:00
faa3f26d3b
Merge pull request #11570 from annando/issue-11470
...
Issue 11470: Check for removed account
2022-05-28 18:32:21 -04:00
a503d5ac1b
Merge pull request #11569 from annando/issue-11431
...
Issue 11431: Only show pinned posts on contacts and your own ones
2022-05-28 18:24:37 -04:00
4ef7f42257
Issue 11470: Check for removed account
2022-05-28 16:21:41 +00:00
881c4204b4
Issue 11431: Only show pinned posts on contacts and your own ones
2022-05-28 15:55:31 +00:00
ba8088bf3c
Add timestamp data to the avatar path
2022-05-28 14:20:48 +00:00
b05aa824f7
Don't move mail and feed
2022-05-27 06:32:19 +00:00
0a43fe857c
Pass the "force" parameter to the avatar update
2022-05-27 05:36:07 +00:00
8c901ebd74
Issue-11560: Fix error when creating avatar cache file
2022-05-26 19:06:16 +00:00
488fdd9791
Merge pull request #11558 from annando/public-contact
...
Ensure that the public contact exists before adding a user contact
2022-05-25 09:06:13 -04:00
918c1eeb56
Check for phantom network
2022-05-25 11:46:58 +00:00
f5d69b3b6a
Ensure that the public contact exixts before adding a user contact
2022-05-25 11:43:29 +00:00
e8864653d8
Merge remote-tracking branch 'upstream/2022.05-rc' into move-to-avatar-cache
2022-05-25 05:38:50 +00:00
dadebdd061
Change output function
2022-05-25 05:24:31 +00:00
Michael Vogel
e5e509ea21
Calculate totals
2022-05-24 22:32:30 +02:00
2fbfc0633a
Fixed placeholder
2022-05-24 20:12:39 +00:00
d3709d8497
Delete on invalid
2022-05-24 20:02:54 +00:00
9da0e637a3
Quit on invalid avatars
2022-05-24 19:47:49 +00:00
80adad3ad2
Additional method to fetch photo avatars
2022-05-24 19:41:38 +00:00
077c6ece64
Don't use a newline at the end
2022-05-24 17:51:28 +00:00
2ead69c7a5
Delete invalid photo data
2022-05-24 17:49:29 +00:00
Michael Vogel
0374f0e523
Use correct placeholder
2022-05-24 19:45:02 +02:00
0ff8ca8053
Trim the rid
2022-05-24 17:39:02 +00:00
Michael Vogel
eddfab7122
A space in front of a message looks better
2022-05-24 19:36:48 +02:00
f764ab7429
Improved messages
2022-05-24 17:33:10 +00:00
74b102b948
Increase the delivery queue counter on drop
2022-05-24 17:28:35 +00:00
bee6ffe968
Support dropping delivery for single message transfer as well
2022-05-24 12:32:04 +00:00
034d838248
Ignore delivery problems with drops
2022-05-24 12:27:35 +00:00
8969e83134
Use a better query to fetch the relay actor
2022-05-24 08:06:48 +00:00
e68ff3b3bb
Return the actor, not the array
2022-05-24 08:02:55 +00:00
b1a2de5cb5
Resubscribe to relay servers
2022-05-24 07:02:42 +00:00
f16cb13dc7
Fixwd class description
2022-05-24 05:58:14 +00:00
7b91c4f333
Sorting by "id asc" makes more sense.
2022-05-23 15:31:37 +00:00
68599c7efa
Some more code beauty
2022-05-23 12:44:21 +00:00
299c4df8f4
Convert to tabs
2022-05-23 12:35:44 +00:00
d658c81107
Code standards
2022-05-23 12:33:25 +00:00
d6242aacf6
Console command to move avatars to the avatar cache
2022-05-23 12:15:30 +00:00
218fc0c20d
Fix unsupported animated webp parsing
2022-05-21 18:51:03 +02:00
783b05cbb1
Fix unsupported animated webp parsing
2022-05-21 18:44:03 +02:00
087ad25c87
Escape the "share" as well
2022-05-21 11:55:38 +00:00
54d7a435a3
Don't parse tags in links
2022-05-21 11:46:38 +00:00
ed350e472f
Merge pull request #11544 from annando/image-proxy
...
Only use proxied image links with images
2022-05-21 13:40:46 +02:00
49dab14215
Only use proxied image links with images
2022-05-21 06:58:26 +00:00
3444c29b0b
Avoid warning "Undefined namespace prefix"
2022-05-21 06:04:34 +00:00
11538376ed
Merge pull request #11539 from annando/worker-split
...
The worker and the delivery is split into several classes
2022-05-20 23:45:51 -04:00
Michael Vogel
7857c329cf
Only deliver own content to the relay (possibly fix relay problems)
2022-05-20 19:04:03 +02:00
9ded39eff6
Renamed variable
2022-05-20 15:49:59 +00:00
2fc5957abb
Spelling error fixed
2022-05-20 05:46:38 +00:00
653af77e5f
Further formatting fixes
2022-05-20 04:52:18 +00:00
6ce23bd9ca
Fixed code structure
2022-05-20 04:42:10 +00:00
dc16e6d471
The worker is split into several classes
2022-05-19 19:24:21 +00:00
Philipp
87e14d9d28
Merge pull request #11533 from annando/notification-cache
...
Cache notifications
2022-05-19 20:32:30 +02:00
49c47008d1
Convert class calls into DI calls
2022-05-19 09:08:04 +00:00
c33611c484
Catch exceptions for Worker::AddContact()
2022-05-18 22:37:17 +02:00
5aa798b1dc
Remove test logging
2022-05-18 20:10:14 +00:00
536ce232a7
Cache notifications
2022-05-18 20:05:29 +00:00
7d958e8804
Merge pull request #11530 from annando/logruntime
...
Configuration for logging added
2022-05-18 08:17:50 +02:00
b18880221a
Merge pull request #11531 from annando/display-polls
...
Improved poll texts for different conditions
2022-05-18 08:16:41 +02:00
4622814e5f
Configuration for logging added
2022-05-18 03:10:38 +00:00
2e6e3597e5
unused DI" removed
2022-05-18 02:19:45 +00:00
f6167b4cfd
New function to exit the program
2022-05-18 02:13:54 +00:00
4e9d7df31a
Add missing DI
2022-05-17 21:26:35 +00:00
aacaa3c2cf
Log the command, not the module
2022-05-17 21:25:01 +00:00
4016a576d5
Log the execution time
2022-05-17 20:47:23 +00:00
0b50dc363b
Caching of "noscrape"
2022-05-17 15:39:04 +00:00
c3fd8b39aa
Caching for profiles removed
2022-05-17 12:53:31 +00:00
4e3e9dc763
Cache the profile as well
2022-05-17 12:46:55 +00:00
75534fa3f3
Fix warning " Trying to access array offset on value of type bool"
2022-05-17 12:38:39 +00:00
73019284ce
Increase cache lifespan / clear cache upon changes
2022-05-17 12:32:25 +00:00
610f8a086f
Use cache key constants
2022-05-17 08:17:41 +00:00
10cdefa232
Fix: Fetch media in shared posts
2022-05-17 07:58:41 +00:00
1ccf22a496
AP endpoints are now cached
2022-05-17 04:58:54 +00:00
4daae255d8
Performance: Avoid queries where there is no media or category
2022-05-16 17:06:58 +00:00
62a1cf257e
Improved poll texts for different conditions
2022-05-16 06:04:46 +00:00
2dc9b4eda2
Vote text changed
2022-05-16 05:31:53 +00:00
a63caefe3d
Polls are now displayed
2022-05-16 04:55:15 +00:00
4829c240e9
Merge pull request #11516 from annando/issue-11472
...
Issue 11472: Store the "edit" history
2022-05-15 20:24:59 -04:00
2c511b8a23
Check the edit date before storing history
2022-05-15 21:15:31 +00:00
440b6d7956
Issue 11504: Abstract has to be plaintext
2022-05-15 21:04:01 +00:00
d77b043d9c
Fixing tests
2022-05-15 20:26:14 +00:00
324cce7a19
Issue 11472: Store the "edit" history
2022-05-15 20:21:56 +00:00
972f91436c
Issue 11492: Improvements for contact import
2022-05-15 18:40:46 +00:00
5af7c30026
Issue 11508: Sanitizing date fields for events and polls
2022-05-15 18:00:19 +00:00
30b9af10ac
Fetch featured posts through a worker
2022-05-15 09:08:35 +00:00
f0bfa9a690
Each 5xx error is a server fail
2022-05-14 13:49:01 +00:00
689b71c696
Added check for server failure
2022-05-14 11:34:00 +00:00
fbdb73cdd6
Improved log levels
2022-05-14 11:18:48 +00:00
43dbd1c396
Add additional timeout checks
2022-05-14 11:09:59 +00:00
f8d929d94e
Ensure to set the network timeout
2022-05-14 09:53:12 +00:00
a8839517fe
Fix workerqueue entries with wrong priority
2022-05-14 06:36:43 +00:00
30bcb24af7
Display the runtime
2022-05-14 06:06:38 +00:00
4b5a743645
Handle timeout
2022-05-14 05:38:01 +00:00
4ef2679ca6
Fix test
2022-05-13 19:37:50 +00:00
fab5ba39ff
Failed post deliveries are now deleted via cron
2022-05-13 18:48:13 +00:00
065d73f860
Merge remote-tracking branch 'upstream/2022.05-rc' into bulk-delivery
2022-05-13 08:53:18 +00:00
65b86fe0d5
Blanks replaced
2022-05-13 07:44:36 +00:00
0f0f4bc2c7
New worker job for deliveries without a worker
2022-05-13 07:31:00 +00:00
a662245c74
We now store the receivers as well
2022-05-13 05:52:05 +00:00
47cd1edb9f
Change the featured collection to fix communication issues with Pleroma
2022-05-13 03:42:04 +00:00
Michael Vogel
201610dfe6
Don't look at the command when archiving an inbox
2022-05-13 04:24:22 +02:00
2595b5e12f
Remove all posts of a given inbox
2022-05-13 02:18:46 +00:00
2049fbce91
Remove delivery when the inbox is archived
2022-05-13 02:11:02 +00:00
4f68be82ef
Use a simpler worker call
2022-05-12 21:28:57 +00:00
67a74c15e1
Improve item fetching
2022-05-12 21:10:59 +00:00
b0b67f1fde
Remove failing posts
2022-05-12 12:43:49 +00:00
a943dbb420
Introducing the "failed" counter
2022-05-12 06:54:58 +00:00
d5d2892f59
Simplifications for the experimental bulk delivery
2022-05-12 06:17:55 +00:00
3d7ecb4fde
Don't update the local avatar
2022-05-11 18:30:59 +00:00
afa57edf8e
Avoid warning "fileperms(): stat failed for ..."
2022-05-11 17:28:28 +00:00
47ee6fd009
Fix a warning because of an undefined array key
2022-05-11 16:01:37 +00:00
0f0b649e8d
Replace unparse function
2022-05-11 11:06:14 +00:00
34f594137e
Movwe the conversion after the cleaning
2022-05-11 10:56:44 +00:00
020ba7a4ed
The function is now usable for all formats
2022-05-11 06:58:26 +00:00
695e3d8b61
Simplifiy the split
2022-05-11 06:55:02 +00:00
47808ab0e9
Issue 11487: IDN support added
2022-05-11 06:34:25 +00:00
d9de8b6d2f
Remove test logging
2022-05-10 18:37:02 +00:00
fae414fedd
Fix local avatar, improve speed for fetching cached photos
2022-05-10 18:18:24 +00:00
776ce3f63a
Merge pull request #11484 from annando/avatar-logging
...
Improved logging for avatar storing
2022-05-10 08:03:31 -04:00
7c3173a0ae
Avoid endless loop when storing posts
2022-05-10 06:07:26 +00:00
945f5c6db2
Improved logging for avatar storing
2022-05-10 06:04:37 +00:00
d195d934be
Merge pull request #11482 from annando/inherit-permissions
...
Inherit avatar cache file permissions
2022-05-09 23:15:47 -04:00
22da88b43f
Changed log level
2022-05-10 01:14:27 +00:00
548bf469ca
Added logging
2022-05-09 22:36:25 +00:00
630d25a24b
Issue 11353: Suppress the forum sharer
2022-05-09 20:52:08 +00:00
34030a736d
Use a constant for the avatar base path
2022-05-09 19:16:14 +00:00
916aa1c9a9
Inherit avatar cache file permissions
2022-05-09 17:36:46 +00:00
e1f32f7f15
Merge pull request #11477 from annando/avatar-file-cache
...
Cache contact avatars locally as files
2022-05-09 11:13:08 -04:00
cbe4a42906
Use a warning instead
2022-05-09 14:36:41 +00:00
f785026289
Don't return a filename when it wasn't stored
2022-05-09 08:47:02 +00:00
f744dd362d
Picture shouldn't be executable
2022-05-09 08:28:23 +00:00
9d1ff0a4ce
Set permissions
2022-05-09 08:20:09 +00:00
006b7a95f0
More avatar handling isolation
2022-05-09 06:57:47 +00:00
681d19a3bc
Standards and renamed class
2022-05-09 06:31:09 +00:00
53d064c283
Avatar handling is moved to a separate class
2022-05-09 06:27:46 +00:00
e3692c0105
Replaced check with hardwired path
2022-05-09 04:26:00 +00:00
Michael Vogel
6b9f543c4e
GoToSocial added to the federation admin page
2022-05-08 20:50:11 +02:00
f220e26f00
Use new function to check for a local avatar cache file
2022-05-08 10:32:29 +00:00
805dc8e6bd
Fix config call
2022-05-08 09:34:30 +00:00
dd422a1e03
Fix contact field name
2022-05-08 08:57:41 +00:00
7b0187c4c5
Don't overwrite already replaced cache file paths
2022-05-08 08:53:18 +00:00
2d856f48b7
Use the default timeout
2022-05-08 05:51:18 +00:00
a31256412e
Cache contact avatars locally as files
2022-05-08 05:37:17 +00:00
510dacf4df
Escape BBCode tag parsing avoidance tags when processing abstracts
...
- Improve documentation for related methods
2022-05-07 22:19:50 -04:00
67c3a20c4f
Issue 11440: Hashtags are now generated again
2022-05-06 17:03:51 +00:00
4729fca5d9
Merge pull request #11457 from annando/performance
...
Improve page performance
2022-05-06 11:11:05 -04:00
Michael Vogel
1e7a55180a
Update src/Content/Conversation.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-05-05 22:40:20 +02:00
2433fee461
Changes after code review
2022-05-05 12:23:44 +00:00
4d359b7de1
Move the plink functionality to the right function
2022-05-05 07:57:52 +00:00
d34432c517
Ignore if the worker was added
2022-05-05 06:12:16 +00:00
10b453bfc2
Deprecated function removed
2022-05-04 07:49:37 +00:00
60532ee7e4
Fill the item cache when storing item
2022-05-04 06:17:34 +00:00
f6218427a4
Use the uri-id to fetch the contact
2022-05-03 21:51:56 +00:00
Balázs Úr
4171ff7563
Add Danish language to list of native language names
2022-05-03 21:13:47 +02:00
4ba28e0199
Merge remote-tracking branch 'upstream/2022.05-rc' into performance
2022-05-03 08:23:09 +00:00
49ec5e5e6e
Check for empty value
2022-05-03 08:20:48 +00:00
e6440471ae
Throw an error when the feed is invalid
2022-05-03 08:20:26 +00:00
690682a37e
Only send "accept" headers on some HTTP methods
2022-05-03 08:20:05 +00:00
632a98965c
Fetch contact via uri-id to improve performance
2022-05-03 08:19:35 +00:00
3163760343
Added configuration for the bulk delivery
2022-05-02 17:34:40 +00:00
6e394ac6ff
Whitespaces removed
2022-05-02 14:36:21 +00:00
76789acace
Reduce network request by transmitting to shared inboxes
2022-05-02 14:35:57 +00:00
fcb245947e
Fetch the receiver list from sharedinbox or personal inbox
2022-05-02 06:10:36 +00:00
9c2fe81ac6
Transmit via the sharedInbox
2022-05-02 05:53:11 +00:00
a9990db98c
Clean the worker queue directly from cron
2022-05-02 05:16:02 +00:00
40aa67f8be
Bulk transmission for AP posts
2022-05-02 05:15:27 +00:00
13e4144ba6
Use a centralized function to check the priority
2022-05-01 09:29:31 +00:00
f7b6507438
More checks for strange priorities
2022-05-01 08:58:48 +00:00
19c1b31ab2
Only add valid values to the worker
2022-05-01 07:03:10 +00:00
e19681684b
Fix worker priorities
2022-05-01 06:57:29 +00:00
1f43332a1d
Only fetch category when it exists
2022-04-30 06:57:22 +00:00
fb3353d4bd
Separate loop to fetch thread parents
2022-04-30 06:19:18 +00:00
18c642f2a7
Merge pull request #11451 from atjn/update-icon
...
Update default icon
2022-04-29 07:25:51 -04:00
a2452b33eb
Add missing fields to collection
2022-04-29 10:13:23 +00:00
8dc0ab9bb3
Test: Disable magiclink in posts
2022-04-29 09:49:16 +00:00
d3de2497bc
Use gsid for the network name
2022-04-29 07:47:24 +00:00
d44641e58c
Fetch avatar by id
2022-04-29 07:30:13 +00:00
1326239576
Reduce the amount of queries
2022-04-29 05:32:12 +00:00
aa65e3032d
Merge pull request #11455 from annando/update-avatar
...
Update contact when the avatar hadn't been found
2022-04-28 14:29:46 -04:00
9eafcf8484
Update contact when the avatar hadn't been found
2022-04-28 16:46:52 +00:00
atjn
420f4c54b7
Update app manifest icons
2022-04-28 13:26:59 +02:00
atjn
31ed9b450d
Update default icon
2022-04-28 12:41:26 +02:00
144c9f00f4
Fix: Show reshared posts on the contact page
2022-04-27 03:25:47 +00:00
171354181d
Use central function to fetch the global directory
2022-04-26 18:33:58 +00:00
83e311decb
Standards
2022-04-25 13:49:17 +00:00
990eea2c4e
We now store uncommon endpoints
2022-04-25 13:45:03 +00:00
b89f727cca
Merge pull request #11438 from MrPetovan/bug/11371-settings-forms
...
Enclose account settings panels in separate forms
2022-04-25 07:37:59 +02:00
069a008ca4
Removed unused tag entries
2022-04-24 15:27:20 +00:00
967c438312
Enclose account settings panels in separate forms
...
- This prevents auto-filled password fields to abort settings save
- Move single-use settings/nick_set template HTML to settings/account
2022-04-24 08:36:53 -04:00
90368d7484
Remove unused settings_post and settings_form hooks
...
- Addons should use the addon_form hook instead
2022-04-24 01:21:49 -04:00
64330f9895
Move /settings to src/
2022-04-24 01:21:48 -04:00
4af6e730d3
Use different collections
2022-04-23 12:32:29 +00:00
0a3c5cc40c
Add the function documentation
2022-04-23 11:43:30 +00:00
060597f619
Store the tag type for the post targets
2022-04-23 11:39:19 +00:00
9b646dad97
API: We can now display polls
2022-04-22 19:24:22 +00:00
f34b7b91fa
API: New Mastodon endpoints added
2022-04-21 19:58:56 +00:00
666b3bbca3
Use "received" for starred posts
2022-04-21 13:58:24 +00:00
5a41c2039a
Order starred posts and posts with mention by the last comment date
2022-04-21 05:52:08 +00:00
eb1f38df22
Issue 11427: id values of OrderedCollections have to contain the page number
2022-04-21 04:29:08 +00:00
2236e5cfb0
Issue 11425: Additional sorting by creation date
2022-04-20 21:03:33 +00:00
94a8f430e3
Avoid warning " Undefined variable $browsershare"
2022-04-20 12:03:09 +00:00
8d25094719
Fix test
2022-04-20 06:33:14 +00:00
834844573b
We can now store incoming questions
2022-04-20 06:28:02 +00:00
62b31900a6
Renamed "share" with "share via"
2022-04-19 21:04:55 +00:00
0380a3e216
Fix: The language detection only searched for farsi
2022-04-19 06:16:44 +00:00
cca7d40a8f
Fix: Webfinger returned xml when json has been requested and vice versa
2022-04-18 05:42:05 +00:00
627e91f209
Merge pull request #11413 from annando/vote-preparation
...
Preparation for storing incoming polls
2022-04-15 10:22:41 -04:00
eaa8163201
Preparation for storing incoming polls
2022-04-15 09:11:50 +00:00
0696da3d1b
Fixes notice
2022-04-15 04:14:21 +00:00
0d8cf06e4a
Experimental feature to enter a custom creation date
2022-04-13 05:31:32 +00:00
30e5ef928a
Avoid wrong server type detection / Owncast added
2022-04-12 05:34:34 +00:00
62367923e0
Fix several notices
2022-04-11 18:57:30 +00:00
3842f02b02
Merge pull request #11402 from annando/featured-endpoint
...
We now offer an endpoint for featured posts
2022-04-11 11:17:56 -04:00
c88d306a41
Use the correct content type
2022-04-11 06:07:50 +00:00
989ac2fda8
Some more "exit" replaced
2022-04-10 11:03:24 +00:00
4a22034be6
Unified output via the "httpExit" function
2022-04-10 08:31:55 +00:00
d15023fe4b
Unified JSON exit
2022-04-09 11:58:01 +00:00
344e12c4fc
Use $request
2022-04-09 08:17:26 +00:00
a1e675ded1
use jsonexit
2022-04-09 03:41:24 +00:00
d7df0825db
We now offer an endpoint for featured posts
2022-04-08 21:25:31 +00:00
4eecf733e1
Merge pull request #11389 from nupplaphil/feat/http_client_arg
...
Introduce explicit HttpClient "Accept" parameter
2022-04-08 15:05:40 -04:00
3033f79529
head fixings
2022-04-08 20:48:57 +02:00
8e2cc678dc
head fixings
2022-04-08 20:41:25 +02:00
277cd51433
fix doc
2022-04-08 20:11:51 +02:00
Michael Vogel
b2b8b23ed6
Update src/Model/Contact.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-04-08 13:59:43 +02:00
69b7923df2
Use centralized function to fetch query results
2022-04-08 06:04:50 +00:00
2764859350
Remove unfeatured posts from collection
2022-04-08 04:49:23 +00:00
6c8ea1d0d8
Updated messages.po / type added to query
2022-04-08 04:17:52 +00:00
75bc4eccb7
Display featured posts for contacts
2022-04-07 21:52:25 +00:00
65071ffc9e
Issue 11393: Fix failing preview
2022-04-06 16:26:51 +00:00
5a3fe900f0
Fix test
2022-04-06 15:32:14 +00:00
a1dd299eb3
Preparations for "featured" posts
2022-04-06 13:34:11 +00:00
e6ea015cb4
"Person" is "Account"
2022-04-05 20:06:04 +00:00
c0b3c527d6
Added processing of incoming block notices
2022-04-05 19:14:29 +00:00
dcbca0c6a3
Store "View" activity from Peertube
2022-04-05 07:48:38 +00:00
a5a5a4b603
Cleaned code
2022-04-05 05:53:17 +00:00
61abc6377d
Preparation for "Featured" collection added
2022-04-04 23:07:44 +00:00
e6caed7b5f
Merge remote-tracking branch 'upstream/develop' into new-acitivities
2022-04-04 16:05:02 +00:00
aa2a32d16f
Store the "EmojiReact" activity
2022-04-04 16:03:53 +00:00
eceaf782cc
Merge pull request #11385 from annando/ap-receiver-unhandled
...
Added handling of some previously unhandled activities
2022-04-04 10:59:35 -04:00
04866195b4
Remove accept parameter for head/post again
2022-04-03 19:33:09 +02:00
1475f53e21
Merge branch 'ap-receiver-unhandled' of github.com:annando/friendica into ap-receiver-unhandled
2022-04-03 07:45:19 +00:00
39a1745361
Prevent the warning of an Undefined array key "object_object_type"
2022-04-03 07:45:15 +00:00
5290f0cd51
Improved handling of invalid links
2022-04-03 07:31:42 +00:00
029daef997
Only use and accept valid http links as links to an external resource
2022-04-03 07:21:36 +00:00
Michael Vogel
5fe75ed50d
Update src/Protocol/ActivityPub/Receiver.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-04-02 23:04:44 +02:00
4aeccd3157
Added license
2022-04-02 21:22:14 +02:00
e299fc67c8
Introduce "accept_header" as specific argument to the http client
2022-04-02 21:16:53 +02:00
73c3b21665
Move ACCEPT constants to own "enum" class
2022-04-02 20:26:11 +02:00
1db3143dc5
added empty object type
2022-04-01 21:27:40 +00:00
71afbabbd8
Added handling of some previously unhandled activities
2022-04-01 11:20:17 +00:00
2ca51f752d
Use appropriate "accept" values
2022-03-30 14:39:53 +00:00
3e21b035b7
Added logging
2022-03-29 17:26:31 +00:00
94b7c1fc77
Use a more specific "accept" value
2022-03-29 14:02:10 +00:00
28e3eee91b
Add "Accept" to "head"
2022-03-29 13:34:54 +00:00
908d2594ed
Use "HttpClientOptions"
2022-03-29 08:57:38 +00:00
1fae0123ec
Some more "accept" parameters are added
2022-03-29 06:24:20 +00:00
51b2bf6f70
Avoid returning of the actor when requesting friendica/json
2022-03-28 13:12:45 +00:00
ff70f74952
"accept" constants introduced and used
2022-03-28 10:33:06 +00:00
80a533ddab
Add Default Accept for HTTP Calls
2022-03-26 22:15:44 +01:00
c1fd163b97
Merge pull request #11376 from annando/no-group
...
Don't display Peertube groups as forums
2022-03-24 13:19:34 +01:00
8c34c3b8ae
Don't display Peertube groups as forums
2022-03-24 11:30:32 +00:00
212eba327b
Improve the compatibility with Lemmy
2022-03-24 10:57:55 +00:00
6f43821ebf
Issue 11368: Prevent namespace prefix warning
2022-03-22 21:07:35 +00:00
2438eb78dd
Merge pull request #11369 from annando/empty-item
...
Prevent further processing of incoming posts when thay are rejected
2022-03-22 08:54:20 -04:00
53ba68e222
Remove "blubb"
2022-03-22 12:31:14 +00:00
45199b498d
Prevent further processing of incoming posts when thay are rejected
2022-03-22 12:28:47 +00:00
13addaf901
Always provide the title variable
2022-03-22 07:07:33 +00:00
be016b0c45
Prioritize the title over the content warning
2022-03-22 07:00:44 +00:00
a2a5f05a19
Issue 11310: Show pinned posts when not logged in
2022-03-21 22:58:23 +00:00
4dace46159
Fix link to post in notification
2022-03-20 19:59:35 +00:00
e738428876
Merge pull request #11360 from annando/announce-notification
...
Don't create empty announce notifications
2022-03-19 14:53:34 -04:00
e4a5094c90
Don't show double introductions
2022-03-19 18:38:59 +00:00
91905bea89
Don't create empty announce notifications
2022-03-19 17:53:41 +00:00
014c7b5943
Merge pull request #11359 from annando/notification
...
Avoid empty notifications / fixed link to the content
2022-03-19 11:31:46 -04:00
fb6a435a6a
Avoid empty notifications / fixed link to the content
2022-03-19 15:25:00 +00:00
351e9a307c
Fixed placeholder
2022-03-19 11:24:09 +00:00
4e45987f74
Merge remote-tracking branch 'upstream/develop' into fetch-usage
2022-03-19 11:21:38 +00:00
4329f5381b
Merge pull request #11355 from annando/notifications
...
Fixes for the notifications
2022-03-19 06:52:04 -04:00
aef9cb9992
Moved "ignore" check to a better location
2022-03-19 09:48:50 +00:00
1fe756b5b6
Fixes for the notifications
2022-03-19 09:27:49 +00:00
9eb6299f19
Check array key existence in ActivityPub\Transmitter::createPermissionBlockForItem
...
- APContact::getByURL can return empty array
- Address https://github.com/friendica/friendica/issues/11218#issuecomment-1066753232
2022-03-19 03:15:08 -04:00
0aa229489f
Improved function description
2022-03-18 07:24:45 -04:00
040abc7743
Use a nicer GUID style format
2022-03-18 07:24:44 -04:00
04ac4841f9
Add support for notification visibility settings
2022-03-16 22:03:26 -04:00
0b10806ce3
Fix the problem that the post update never stopped on larger systems
2022-03-16 22:00:34 -04:00
Michael Vogel
f5bcc4ad4b
Merge pull request #11346 from MrPetovan/bug/11343-memcached-bad-key
...
Suppress a couple MemcachedException
2022-03-16 15:19:40 +01:00
8d64cf4f9b
typo
2022-03-16 06:25:21 +01:00
7b9e62198e
Suppress a couple MemcachedException
...
- Replace URL by uri-id in apcontact
- Replace date with a space and nurl by nick and Zulu time in mod/poco
2022-03-15 10:54:00 -04:00
a07f840c74
Add correct ordering for detailed notifications
2022-03-15 07:05:59 -04:00
02b6ac3ed3
limit parameter was missing from docblock
2022-03-15 08:46:26 +01:00
12038d45d0
PHP deprecation warning due wrong order of function parameters
...
With PHP 8.0 I got the following PHP Deprecation message
```
PHP Deprecated: Required parameter $limit follows optional parameter $ids in src/Worker/UpdateContacts.php on line 104
```
this PR fixes the wrong order of the parameters.
2022-03-15 08:44:17 +01:00
Michael Vogel
e252b5972e
Merge pull request #11336 from MrPetovan/task/4639-soapbox-intro-notification
...
Add exception when message is empty in FormatteNavNotification::createFromNotification
2022-03-15 07:09:24 +01:00
07d4cdbdde
Fix misleading notification message strings
...
- The mentioned title is from the top-level post, not the liked post
2022-03-14 22:56:46 -04:00
36e85b01c6
Hide like notifications from menu again
2022-03-14 22:56:46 -04:00
73c7b88fb2
Add exception when message is empty in FormatteNavNotification::createFromNotification
...
- Filter out message less notifications in Ping
2022-03-14 22:56:44 -04:00
371b2b22bd
Merge pull request #11333 from annando/feed-guid
...
Don't use the GUID value directly
2022-03-14 18:02:29 -04:00
7940b31685
Don't use the GUID value directly
2022-03-14 21:09:14 +00:00
e6f745bcb1
Delete follow notification on unfollow
...
- Fix translation string typo
2022-03-14 07:58:39 -04:00
49971b1465
Switch data source from notify to notification in Module\Notifications\Ping
...
- Change unused FormattedNotification classes to FormattedNavNotification classes
2022-03-14 07:58:38 -04:00
1ae7cac236
Move mod/ping to module class
2022-03-14 07:57:41 -04:00
5a12bd87f3
Replace Javascript notification string formatting with Smarty templates
2022-03-14 07:56:58 -04:00
b7cee324b0
Add legacy notification endpoint for deprecated Notify entity
...
- Add dependencies to Notifications\Notification module class
2022-03-14 07:56:21 -04:00
deafdcde95
Use public contact ID in Model\Post\UserNotification::insertNotification
...
- Add localRelationship dependency to Notification factory
- Remove dependencies from Factory\Notification->getMessageFromNotification method
2022-03-14 07:56:20 -04:00
7ce97459d4
Deprecated the notify table/classes
2022-03-14 07:56:20 -04:00
0956d1dd64
Don't send forum posts to the user's followers
2022-03-14 06:07:51 +00:00
2642996171
Send community posts only to the community
2022-03-13 19:31:21 +00:00
ca086b880b
Some small improvements for importing feeds
2022-03-13 15:29:07 +00:00
12d7c99f46
Don't send notifications for activities caused by the community contact
2022-03-13 05:44:29 +00:00
9e3dbfab3e
Merge pull request #11323 from annando/direction
...
Issue 11309: improved check for wanted posts
2022-03-12 13:42:08 -05:00
314bf92ead
Added Documentation
2022-03-12 17:29:46 +00:00
fb13890341
Added parameter values
2022-03-12 15:27:56 +00:00
8c778ca02e
Improved completion check for AP
2022-03-12 11:17:33 +00:00
56cd98b38b
Further improved logging
2022-03-12 07:48:31 +00:00
c1bb1cf0fc
Improved logging
2022-03-12 07:34:30 +00:00
Michael Vogel
5c4871fe6d
Merge pull request #11321 from MrPetovan/bug/11319-wrong-path-subfolder-install
...
Normalize base URL usage in admin templates
2022-03-12 08:10:07 +01:00
5a16a424ac
Issue 11309: improved check for wanted posts
2022-03-12 07:08:10 +00:00
073a6afaaf
Reduce amount of notifications by communities
2022-03-12 04:20:19 +00:00
d15ebb6fd3
Normalize base URL usage in admin templates
2022-03-11 23:14:21 -05:00
5eb647585d
Issue 11315: Fix for all receivers in "to"
2022-03-11 20:39:03 +00:00
f264923cad
Issue 11309: Check if a post is wanted
2022-03-11 14:00:05 +00:00
2f97d61a09
Estimate active server users when not provided by the system
2022-03-10 21:50:00 +00:00
03d38d9e35
Show permissions for all posts when possible
2022-03-10 07:38:12 +00:00
38fbe281f9
API: Fixed the bookmarking
2022-03-08 22:38:06 +00:00
00aa905c15
Merge pull request #11307 from annando/api-reply-fix
...
API: Fix "in_reply_to_status_id"
2022-03-08 15:53:12 -05:00
0f9a239d59
Merge pull request #11306 from annando/abstract-space
...
Replace abstract content with a space to prevent missing spaces
2022-03-08 15:52:48 -05:00
c13ae36256
Merge pull request #11305 from annando/api-spoiler
...
API: Improve support for the summary field
2022-03-08 15:48:46 -05:00
4803b99157
API: Fix "in_reply_to_status_id"
2022-03-08 20:46:26 +00:00
e0295abdab
Replace abstract content with a space to prevent missing spaces
2022-03-08 19:58:55 +00:00
e0468ac914
API: Improve support for the summary field
2022-03-08 18:32:09 +00:00
8039ab731f
Type hints reverted
2022-03-08 18:26:59 +00:00
285ff75482
Merge pull request #11294 from annando/fix-mail-setting
...
Fix storing mail settings
2022-03-06 10:17:02 -05:00
Michael Vogel
acba7d25a0
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-03-06 14:15:59 +01:00
31dbdd3677
variable type for the return value is added
2022-03-06 12:21:27 +00:00
903bc9b679
Improved support for Mastodon style content warnings
2022-03-06 11:49:55 +00:00
Michael Vogel
1ec1adf904
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-03-06 05:49:49 +01:00
421dd028ce
Fix storing mail settings
2022-03-05 13:08:09 +00:00
5539e42743
API: Support for the "direct" visibility
2022-03-05 06:14:30 +00:00
15de709b89
API: We can now post to groups via the Mastodon endpoint
2022-03-04 05:50:33 +00:00
f059e56e0f
Fix test / Use new expandTags function
2022-03-02 17:17:07 +00:00
f853d58198
API: Forum mentions are now working
2022-03-02 06:59:07 +00:00
1f1d3b2578
API: Only display active incoming contact requests
2022-03-02 05:05:49 +00:00
772294494e
API: Fix display of reshares / return value of activities
2022-02-28 20:10:42 +00:00
f36d4891bc
Merge pull request #11282 from annando/api-fix
...
API: several fixes to the Twitter/Statusnet API
2022-02-25 16:11:18 -05:00
6415fc62a0
Fix missing field
2022-02-25 19:27:25 +00:00
bf5c8a2c43
API: several fixes to the Twitter/Statusnet API
2022-02-25 19:16:40 +00:00
419fe67c6c
Merge pull request #11265 from k-alin/6606-k-alin-mysql-unix-socket
...
Enable MySQL unix socket connection
2022-02-25 10:36:43 -05:00
k-alin
e4cfd4a7c3
Update src/Database/Database.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-02-25 16:09:54 +01:00
k-alin
8a10b0c635
add socket to database settings in the autoinstaller
2022-02-25 15:01:02 +01:00
k-alin
33c4fbf2a6
Update src/Database/Database.php
...
Correct indent
Co-authored-by: Philipp <admin+Github@philipp.info>
2022-02-25 12:09:54 +01:00
k-alin
470be2b5e4
Update src/Database/Database.php
...
Correct indent
Co-authored-by: Philipp <admin+Github@philipp.info>
2022-02-25 12:09:30 +01:00
k-alin
335be6f032
Update src/Database/Database.php
...
Correct indent
Co-authored-by: Philipp <admin+Github@philipp.info>
2022-02-25 12:09:12 +01:00
cddead2343
Move follow revoke protocol to worker task
...
- Switch to public contact for revoke_follow hook
2022-02-24 09:35:55 -05:00
6a1f9a7fa3
Move unfollow protocol to worker task
...
- Add uid parameter to unfollow hook
- Rework and unify Contact::unfollow, Contact::removeSharer and Contact::terminateFriendship
- Add missing twitterUser property to Twitter\Friendships\Destroy module
2022-02-24 09:35:54 -05:00
48e2963ac7
Remove unused variable in Core\Worker::defer
2022-02-24 09:35:54 -05:00
52f5d924b7
Replace remaining instances of DBA::update('contact') with Contact::update()
...
- This was breaking the synchronisation between the contact and user-contact tables
2022-02-24 09:35:54 -05:00
d32b9d5d95
Display the BCC receiver when it is the local user
2022-02-24 07:09:34 +00:00
1d779c6193
Ensure the private message recipient is valid in Mail::send
...
- Arbitrary input could be used to circumvent most restrictions regarding recipients (except contact relationship)
2022-02-23 21:30:18 -05:00
59630a2c82
Improve the name of the "followers" receiver
2022-02-23 20:18:37 +00:00
Michael Vogel
948405a486
Merge pull request #11267 from MrPetovan/task/11264-mastodon-api-version
...
Update Mastodon API version string to include Mastodon version compatibility
2022-02-23 05:38:25 +01:00
ec0b05d826
Display announces identital for starting posts and comments
2022-02-21 05:17:54 +00:00
d7b573c6d7
Update Mastodon API version string to include Mastodon version compatibility
2022-02-20 20:22:39 -05:00
e0ea51818e
Add constructors to a couple of Mastodon API value objects
2022-02-20 16:17:03 -05:00
2321c7a55b
Updated messages.po
2022-02-20 20:47:08 +00:00
d6725437b0
Merge remote-tracking branch 'upstream/develop' into display-permissions
2022-02-20 20:45:32 +00:00
39e820e6a3
Display the post receivers
2022-02-20 19:25:55 +00:00
k-alin
ff439272b9
mysql connection via socket if location of mysqld.sock was specified
2022-02-20 17:45:51 +01:00
k-alin
50580fd04c
Merge branch 'friendica:develop' into 6606-k-alin-mysql-unix-socket
2022-02-20 17:27:03 +01:00
c86cc83524
Merge pull request #11260 from mkljczk/develop
...
API: add list members editing
2022-02-20 09:45:25 -05:00
marcin mikołajczak
0209892631
Apply suggestions
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-20 14:10:57 +01:00
446775cdc8
Merge pull request #11261 from annando/notices
...
Avoid warning and notice
2022-02-20 07:23:53 +01:00
Michael Vogel
d5373c583b
Merge pull request #11258 from MrPetovan/bug/11234-categories-profile
...
Show only the user's categories on their profile
2022-02-20 06:35:37 +01:00
311c1fdd81
Avoid warning and notice
2022-02-20 05:14:36 +00:00
marcin mikołajczak
9c6f6bcb95
API: add list members editing
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-19 23:22:54 +01:00
00f39cd308
Reverted change
2022-02-19 20:32:19 +00:00
22952f88ca
SImplify code
2022-02-19 19:45:27 +00:00
9aa0f6f547
Merge remote-tracking branch 'upstream/develop' into conversation-receivers
2022-02-19 13:52:45 +00:00
