TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,033 Commits 46 Branches 892 Tags 484 MiB
Commit Graph

727 Commits

Author SHA1 Message Date
Harris
a67195c6cf
Treat first sync closed groups as base for restoring device (#855) 
* feat: only sync closed groups on initial sync

* fix: flip first sync bit
 2022-03-09 17:48:31 +11:00
ceokot
206505abe8
feat: Add conversation filtering for message requests (#830) 
* feat: Message requests

* Apply contact sync message

* Filter based on message requests toggle

* Add message requests screen

* Implement message requests screen

* Handle message request buttons

* Handle approval syncing

* Display message request response

* Display pending message request

* Display pending message request

* Add approval migrations

* Send message request response

* Fix conversation filters

* Add approval migration

* Handle message request response

* Update message request response proto

* Update message request response handling

* Refresh message requests

* Show message request banner on new message request

* Message request item layout tweaks

* Fix latest unapproved conversation query

* Handle sent message request responses on restore

* QA feedback tweaks

* Remove send limit on message requests

* Config message handling tweaks

* Reverse conversation upon message request approval

* Remove read receipts, delete declined conversations

* Fix contact filtering in config messages

* Fix message request order and handle deletion

* Fix message request snippet on home screen

* Refresh message request list after decline or clearing all

* Fix message request reversal

* Fix message request notifications

* Disable media buttons for message requests

* Hide message request banner after reading

* Refresh message request banner
 2022-03-04 08:46:39 +02:00
Harris
55aa266769
Bug fixes and provide conversation tooltips (#851) 
* refactor: removing unused strings and changing session header dimensions

* refactor: remove bodyTextView from LinkPreviewView.kt and changing header image colours

* fix: path layout is aligned, global search input should always prompt soft input on open

* fix: unread count and scroll to bottom button visibility properly taking into account adapter item count and RecyclerView.NO_POSITION

fixes #848

* fix: crash on error toast for failing to share logs

* feat: conversation tooltips in NewConversationButtonSetView.kt

* fix: UI issue for conversation action bar cutting off lower than baseline characters

fixes #839

* refactor (wip): replacing bindings with nullable types to try prevent mystery bug

* refactor: use the nullable bindings for ConversationActivityV2.kt and remove inputBarHeightChanged

* fix: remove recipient listener on destroy

* build: add latest strings and increase build
 2022-02-28 17:23:58 +11:00
jubb
07ccc2696b Merge remote-tracking branch 'upstream/dev' 
# Conflicts:
#	app/build.gradle
 2022-02-07 17:08:48 +11:00
Harris
dd1da6b1a4
Add a global search (#834) 
* feat: modifying search functionalities to include contacts

* feat: add global search UI input layouts and color attributes

* feat: add global search repository and model content

* feat: adding diff callbacks and wiring up global search vm to views

* feat: adding scroll to message, figuring out new query for recipient thread search

* feat: messing with the search and highlighting functionality after wiring up bindings

* fix: compile error from merge

* fix: gradlew build errors

* feat: filtering contacts by existing un-archived threads

* refactor: prevent note to self breaking, update queries and logic in search repo to include member->group reverse searches

* feat: adding home screen new redesigns for search

* feat: replacing designs and adding new group subtitle text

* feat: small design improvements and incrementing gradle build number to install on device

* feat: add scrollbars for search

* feat: replace isVisible for cancel button now that GlobalSearchInputLayout.kt replaces header

* refactor: all queries are debounced not just all but 2 char

* refactor: remove visibility modifiers for cancel icon

* refactor: use simplified non-db and context related models in display, remove db get group members call from binding data

* fix: use threadId instead of group's address

* refactor: better close on cancel, removing only yourself from group member list in open groups

* refactor: seed view back to inflated on create and visibility for empty placeholder and seed view text

* refactor: fixing build issues and new designs for message list

* refactor: use dynamic limit

* refactor: include raw session ID string search for non-empty threads

* fix: build lint errors

* fix: build issues

* feat: add in path to the settings activity

* refactor: remove wildcard imports
 2022-02-07 17:06:27 +11:00
Harris
983e4f59d3
Fix unrecycled delete actions (#836) 
* fix: set view press/swipe/long press to null if message is deleted

* fix: deselects messages once they've been deleted
 2022-02-06 12:41:35 +11:00
Harris
c70de069a4 fix: checking invalid profileKey lengths on message receive and retrieve profile avatars 2022-01-23 00:33:38 +11:00
ceokot
c2657bb785
feat: Add the option to mark a conversation as read (#816) 
* feat: Add the option to mark a conversation as read

Fixes #789

* Extract and share logic to mark all as read

* Fix merge conflict issues
 2022-01-16 19:02:39 +02:00
ceokot
c113a447cf
refactor: Use view binding to replace Kotlin synthetics (#824) 
* refactor: Migrate home screen to data binding

* Add view binding

* Migrate ConversationView to view binding

* Migrate ConversationActivityV2 to view binding

* View model refactor

* Move more functionality to the view model

* Add ui state events flow

* Update conversation item bindings

* Update profile picture view bindings

* Replace Kotlin synthetics with view bindings

* Fix qr code fragment binding and optimize imports

* View binding refactors

* Make TextSecurePreferences an interface and add an implementation to improve testability

* Add conversation repository

* Migrate remaining TextSecurePreferences functions into the interface

* Add unit conversation unit tests

* Add unit test coverage for remaining view model functions
 2022-01-14 07:56:15 +02:00
ceokot
44f5684b21
feat: Update open group avatars periodically (#807) 
* feat: Update open group avatars periodically

* Updated timestamp

* Existing job check

* Refresh avatar on the conversation

* Remove println statement

* Update profile picture on recipient modified event
 2021-12-15 08:11:55 +02:00
ceokot
15f5ac10ec
feat: Add conversation pinning (#806) 
* feat: Add conversation pinning

* Update pinned conversation icon

* Update pinned conversation column name
 2021-12-10 10:18:56 +11:00
jubb
b55d0ad270 fix: treat result as number and convert to Long 2021-11-23 09:49:01 +11:00
jubb
f2f906fd3e refactor: closed groups delete for yourself and handle unsend request if it's from yourself or author now 2021-10-27 17:26:44 +11:00
Harris
f56a16b31d refactor: remove pubkey logs from poller log spam and move attachment download job to rx queue 2021-10-06 13:56:13 +11:00
Harris
e036344c76 refactor: performance improvements in batch message processing, synchronized cache access and audible message notifications. 
Increase audible timeout on DefaultMessageNotifier.java, don't send in-thread notification based on last audible notification.

Create a batch message receive job to handle up to 20 chunked messages at a time per job instead of singular or open group poll amount

Remove synchronized access to recipient cache and replace with a concurrent cache that's lock free from perf tracing monitor contention
 2021-09-29 15:29:24 +10:00
Harris
45a6e11cf5 fix: checking if group exists and not adding it for self sends. 
may require more testing to see if it can return in the groupExists block above insert outgoing messages

fixes #723
 2021-09-15 16:09:54 +10:00
Harris
adeffbdc07 feat: replace hardcoded with const string 2021-09-02 10:21:14 +10:00
Harris
ded0370e8e feat: add gif metadata warning 2021-09-02 10:19:43 +10:00
ryanzhao
ecc881bc7c store server hash value for incoming messages 2021-08-17 14:34:49 +10:00
ryanzhao
29e355c6ab send unsend request as sync message 2021-08-16 14:03:06 +10:00
ryanzhao
4ce1bd6875 clean 2021-08-16 11:59:52 +10:00
ryanzhao
feff1c8393 fix cancel notification 2021-08-16 10:58:07 +10:00
ryanzhao
f10ddb8e3a cancel notification for unsend request 2021-08-16 10:34:28 +10:00
ryanzhao
9ab285c3be handle home screen update for unsend request 2021-08-12 14:14:37 +10:00
ryanzhao
5264d4e2f8 remove weird white space 2021-08-11 15:12:10 +10:00
ryanzhao
0ebb87ef6f allow self send and notify for unsend requests 2021-08-10 16:47:52 +10:00
ryanzhao
c3e45a308a store server hash 2021-08-10 16:42:15 +10:00
ryanzhao
bf83f9b391 WIP: message receiver handler for unsend request 2021-08-10 16:00:06 +10:00
ryanzhao
2cb91c3a0e add delete endpoint call in snode api 2021-08-10 12:52:01 +10:00
ryanzhao
c0a5a61431 add unsend request proto 2021-08-10 09:36:20 +10:00
jubb
9b48d5d203 refactor: use simpler way to generate closed group profile pictures, limit the getConversation call in MentionManagerUtilities.kt to 200 to improve link-through performance to v2 conversation activity. fix notify type not being preloaded into settings 2021-08-03 13:36:04 +10:00
Niels Andriesse
3911fce75f Disable authenticated retrieval for now 2021-07-27 10:38:05 +10:00
Niels Andriesse
c05c6049d7
Merge pull request #675 from hjubb/notification_control 
Fine-Grained Notification controls
 2021-07-26 11:30:19 +10:00
Niels Andriesse
ea5a41af52
Merge pull request #676 from oxen-io/authentication 
Implement Authenticated Message Retrieval
 2021-07-26 11:25:12 +10:00
Niels Andriesse
d79d236580 Implement authenticated message retrieval 2021-07-26 11:23:58 +10:00
Harris
285d5a6c22 Merge remote-tracking branch 'upstream/dev' into notification_control 2021-07-26 09:38:11 +10:00
Niels Andriesse
07f43121c3
Merge pull request #672 from hjubb/chat_ux_improvements 
Fixes Open Group Quote Bug
 2021-07-23 16:22:29 +10:00
Harris
3c6b1eff44 fix: open groups update the sent timestamp locally to be the returned group 2021-07-23 16:04:18 +10:00
Niels Andriesse
118447799a Handle incorrect clock setting 2021-07-23 14:09:27 +10:00
Harris
b95cb2bedb feat: add notification types for all / mentions only or none with UI and push logic 2021-07-20 16:06:59 +10:00
jubb
5f7278b9c4 refactor: OpenGroupPollerV2.kt no longer queues jobs and executes synchronously, BackgroundPollWorker.kt no longer replaces periodic tasks but keeps existing ones, removing unused references 2021-07-15 12:00:30 +10:00
Niels Andriesse
5b612806c5 Include destination info in error messages 2021-07-15 09:32:00 +10:00
jubb
6a2a04e256 feat: don't show notifications on HomeActivity.kt 2021-07-13 16:31:16 +10:00
Niels Andriesse
6b7c7d1d2a Add support for new ban and delete all endpoint 2021-07-13 14:28:25 +10:00
Niels Andriesse
d1ee7d68bc Don't retry message send jobs when rate limited 2021-07-13 09:56:14 +10:00
Niels Andriesse
1747e4a8ee Don't use testnet 2021-07-12 14:35:22 +10:00
Niels Andriesse
5168e15640 Merge branch 'dev' into security 2021-07-12 14:27:14 +10:00
Niels Andriesse
462a7ed977
Merge pull request #647 from hjubb/trusted_attachment_download 
Only Download Attachments from Trusted Contacts
 2021-07-12 10:57:30 +10:00
Niels Andriesse
b2a067cba6 Re-use existing build paths promise if possible 2021-07-12 10:02:00 +10:00
jubb
842cfc25a1 Merge branch 'dev' into trusted_attachment_download 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
 2021-07-12 09:28:14 +10:00
jubb
fa06a57ec3 fix: getting local user's ID if message is outgoing to check against that value in attachment download 2021-07-09 16:04:06 +10:00
jubb
1ee1d1795d fix: only resume AttachmentDownloadJobs and fix boolean logic on returning early in download job 2021-07-09 15:17:07 +10:00
jubb
9dfd051e63 feat: trust dialog and processing attachments for users after trusting them 2021-07-09 15:13:43 +10:00
jubb
bc4f660fb0 fix: downloads now don't automatically queue for untrusted contacts and UI to handle re-downloading failed attachments 2021-07-08 17:14:53 +10:00
Niels Andriesse
666cab9df6 Clean up TextSecurePreferences 2021-07-08 16:31:37 +10:00
Niels Andriesse
0524d42f1a Merge branch 'dev' into security 2021-07-08 10:50:25 +10:00
Niels Andriesse
d447c5c307
Merge pull request #637 from hjubb/fix_voice_update_crash 
Fix Voice Message Behavior
 2021-07-07 15:37:29 +10:00
Niels Andriesse
30b4a7ecc8
Merge pull request #613 from Brice-W/exp-timer-config-message 
Add Closed Group Expiration Timer Setting to Configuration Message
 2021-07-07 15:11:21 +10:00
Harris
683b5243bd fix: notify update for attachment's thread ID on setting audio extras 2021-07-07 14:56:53 +10:00
Niels Andriesse
09502ee9ab Remove unused resources 2021-07-07 14:00:18 +10:00
jubb
8cc2f78da7 fix: audio durations set accordingly for send and receive and doesn't break saving / uploading by exhausting the input stream 2021-07-06 16:53:44 +10:00
jubb
f4e5e5e36a fix: duplicate message send bug on attachments 2021-07-05 15:00:32 +10:00
jubb
f7bec07503 fix: raise output max buffer size to Job.MAX_BUFFER_SIZE 2021-07-05 10:46:48 +10:00
jubb
d57903aa44 fix: open group poller queues trim thread job only if received messages 
deleting quotes should now propagate to set quote missing flag in MMS and update the UI accordingly
 2021-07-05 09:59:54 +10:00
jubb
50b02323a8 fix: failing to serialize from AttachmentUploadJob.kt started from resumed pending jobs 2021-07-05 09:53:12 +10:00
jubb
b329402faf fix: audio waveforms decoded on the attachment download 2021-07-01 17:06:42 +10:00
jubb
9566120d66 fix: revert max failure count on upload and send jobs 2021-07-01 13:45:14 +10:00
jubb
8701f68292 fix: prevent crash in audio view 2021-07-01 13:43:48 +10:00
jubb
d98f34fa73 fix: only show loader if the message isn't failed, fix attachment upload and message send pending states in the conversation 2021-07-01 11:39:18 +10:00
jubb
ab876ca9b8 fix: MessageSendJob.kt sets message as sending before calling send so conversation adapter doesn't display as error / let users retry while send job is pending 2021-07-01 11:20:31 +10:00
jubb
758475f0dc fix: R.color.destructive on the error drawable in conversation and home adapter and handling message re-sending 2021-07-01 11:06:11 +10:00
Niels Andriesse
7b7a9961da
Merge pull request #620 from hjubb/ui 
Fix 421s, Fix NotifyPNServerJob Crash & Fix URL Handling
 2021-06-29 16:13:36 +10:00
Niels Andriesse
f1745448bb Hook up link preview suggestion dialog 2021-06-29 15:48:40 +10:00
jubb
8b4b264992 fix: 421 errors not being handled properly by sendOnionRequest and prevent retrying with stale swarm data, no longer crash with large NotifyPNServerJob.kt payload in Kryo deserialization 2021-06-29 15:12:33 +10:00
Niels Andriesse
8f2f1a47fd
Merge branch 'ui' into ui 2021-06-29 13:37:11 +10:00
Niels Andriesse
9f4571b0c1 Implement remaining menu actions 2021-06-29 13:26:33 +10:00
jubb
09f4cfb1ad feat: add back overflow text, increase AttachmentDownloadJob.kt max failure count, resize overflow text size, remove unused animator update listener implementation in ThumbnailProgressBar.kt 2021-06-29 11:22:59 +10:00
Niels Andriesse
18e345733e Implement a few basic contextual actions 2021-06-28 16:28:00 +10:00
jubb
1df6fa46a4 feat: clear all data dialog with local and network only options 2021-06-22 17:01:27 +10:00
jubb
05b0e5f308 feat: handling responses and using new updated params 2021-06-21 15:48:42 +10:00
Brice-W
362589f83f refactor 2021-06-21 14:06:48 +10:00
Brice-W
bb7dc318c7 delete obsolete code 2021-06-21 14:04:00 +10:00
Brice-W
a71273e813 refactor 2021-06-21 14:03:08 +10:00
Brice-W
35d5def515 adding expiration timer to configuration message 2021-06-18 16:44:58 +10:00
jubb
fdc042e6d4 feat: testnet clearing network data on delete and differentiating dialogs 2021-06-18 16:01:34 +10:00
Niels Andriesse
123cd6d486 Handle text only quote drafts 2021-06-18 15:54:24 +10:00
Harris
11f64a1d1a feat: add snode method delete_all with data class for params, refactoring ClearAllDataDialog.kt to handle async requests better and prevent ANR 2021-06-17 18:29:05 +10:00
Niels Andriesse
2188200717 Merge branch 'dev' into ui 2021-06-16 10:19:52 +10:00
Niels Andriesse
71ffaaabc2 Add documentation 2021-06-16 10:19:42 +10:00
Brice-W
1b6ab36a03 fix 2021-06-15 16:47:35 +10:00
Brice-W
7b22d14a2c using different timestamp for NEW group updates 2021-06-15 16:16:03 +10:00
Brice-W
47c989ab2e Merge branch 'dev' of https://github.com/loki-project/session-android into formation-timestamp-update 2021-06-15 11:21:55 +10:00
Niels Andriesse
ed6db6f4e7 Merge branch 'dev' into ui 2021-06-11 13:41:50 +10:00
Niels Andriesse
f4ae16239e Clean 2021-06-11 11:27:15 +10:00
Brice-W
b8efe73a3b update formation timestamp when group is rejoined after being left 2021-06-10 17:34:48 +10:00
Brice-W
3b03aef80f handle expiration timer with NEW group update type 2021-06-09 14:31:05 +10:00
Harris
51061cac0e Merge remote-tracking branch 'upstream/dev' into identity_key_encryption 2021-06-08 11:53:38 +10:00
Brice-W
14d401b27a fix 2021-06-07 14:46:54 +10:00
Harris
91aefb7c87 feat: upgrade to keystore sealed identity key preferences 2021-06-07 11:53:17 +10:00
nielsandriesse
d465fecf4c Populate conversation menu 2021-06-07 09:48:01 +10:00
nielsandriesse
3bf5a50439 Fix readability issues & simplify code 2021-06-04 16:32:19 +10:00
Brice-W
1d0b61cf89 fix to avoid zombies to be cleared when new group update received 2021-06-04 12:20:21 +10:00
Brice-W
6fb461f7d8 reset zombie members list if group already exists 2021-06-04 11:24:01 +10:00
Brice-W
1a117b0189 Merge branch 'dev' of https://github.com/loki-project/session-android into zombie-handling-update 2021-06-03 11:51:57 +10:00
nielsandriesse
dfd9bd89f9 Fix colors 2021-06-02 13:03:22 +10:00
nielsandriesse
d8ba01cf5d Clean up join open group screen 2021-06-02 10:51:36 +10:00
nielsandriesse
15d864cd2a Update documentation 2021-06-02 09:38:22 +10:00
Harris
2bdb4d18a2 fix: property name for json deserialisation 2021-05-31 14:24:43 +10:00
nielsandriesse
e1f3362c2a Fix crash 2021-05-31 13:13:25 +10:00
nielsandriesse
f872c2b9be Prepare for OGS timestamp handling changes 2021-05-31 11:23:37 +10:00
ryanzhao
e8c52961aa minor fix 2021-05-28 15:14:05 +10:00
ryanzhao
4f7d26d86e debug for new encryption 2021-05-28 12:04:37 +10:00
ryanzhao
a81c17057f Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-28 11:22:58 +10:00
ryanzhao
497405fe50 clean 2021-05-28 11:22:46 +10:00
ryanzhao
c0d4dd741c debug 2021-05-28 11:22:06 +10:00
nielsandriesse
e16322977b Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev 2021-05-28 11:01:41 +10:00
nielsandriesse
c6976ca3cd Fix naming confusion 2021-05-28 11:00:49 +10:00
Harris
4a8ce784b8 fix: no longer using the wrong deletion IDs for open group deletions 2021-05-28 10:50:07 +10:00
Ryan ZHAO
a66d2c97e0 Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-27 16:52:12 +10:00
Ryan ZHAO
592825dcc6 implement get session id from ons name api 2021-05-27 16:23:15 +10:00
Niels Andriesse
2441d86b32 Make member ordering consistent 2021-05-27 16:07:54 +10:00
jubb
72569327a9 Merge remote-tracking branch 'upstream/dev' into improve_background_jobs 2021-05-27 15:45:07 +10:00
Ryan ZHAO
0e89d88459 Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-27 15:32:00 +10:00
Niels Andriesse
85120b57ea Batch conversation updates 2021-05-27 15:05:15 +10:00
ryanzhao
ae23266058 wip: implement ons name 2021-05-26 16:34:08 +10:00
jubb
efa36d4cea refactor: trim thread is now queued after batch processing messages, for other conversations still after every persisted message 
migrate TrimThreadJob.kt to new job system

deleting more open group references in removal

open group last message / last deletion now sets after processing vs after fetching
 2021-05-26 15:22:19 +10:00
Brice-W
365ccda113 Merge branch 'dev' of https://github.com/loki-project/session-android into zombie-handling-update 2021-05-25 16:15:51 +10:00
Brice-W
5eaef76b02 don't update zombie members if current user is removed 2021-05-25 15:45:43 +10:00
Niels Andriesse
abf2c05424 Debug closed group creation issue 2021-05-25 10:56:29 +10:00
Niels Andriesse
5d9957a57d Fix merge 2021-05-24 16:21:24 +10:00
Niels Andriesse
ba116df195
Merge pull request #554 from RyanRory/fix-open-group-spam 
Fix Open Group Notification Spam Part 2
 2021-05-24 16:14:25 +10:00
Niels Andriesse
550d8b61c7 Quick fix crash 2021-05-24 15:31:46 +10:00
ryanzhao
25df4330be Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-24 14:49:56 +10:00
Niels Andriesse
c058b332da Fix typo 2021-05-24 14:14:09 +10:00
Niels Andriesse
639146cc0a Simplify & fix from_server_id usage 2021-05-24 13:48:01 +10:00
Niels Andriesse
716e768dac Merge branch 'dev' into polling-limit 2021-05-24 13:37:13 +10:00
Niels Andriesse
90dca7149a Remove redundant this 2021-05-24 13:32:16 +10:00
Brice-W
6c37e7a93f move logic from Storage to OpenGroupAPIV2 2021-05-24 13:13:07 +10:00
Brice-W
1b25de6a96 Merge branch 'dev' of https://github.com/loki-project/session-android into polling-limit-after-inactivity 2021-05-24 13:00:02 +10:00
Brice-W
becc3c7278 Merge branch 'dev' of https://github.com/loki-project/session-android into polling-limit-after-inactivity 2021-05-24 12:58:35 +10:00
Niels Andriesse
b5b3f4aebe
Merge pull request #555 from oxen-io/nicknames 
Nicknames
 2021-05-24 12:46:44 +10:00
Niels Andriesse
38f50a6dda Fix open group display name handling 2021-05-24 12:44:45 +10:00
Brice-W
dbaa51bd9a implementation of polling limit on open groups 2021-05-24 12:00:17 +10:00
Niels Andriesse
d7afcd07f8 Add contacts migration 2021-05-24 11:35:05 +10:00
Niels Andriesse
e7ae08fe7a Clean 2021-05-24 10:27:31 +10:00
ryanzhao
b186d4a670 Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-24 09:19:56 +10:00
Niels Andriesse
66e7df22bb Don't notify for closed group control messages 
This addresses an issue where:

• someone would create a closed group
• on other peoples' devices this control message would be received through a background poll or a push notification
• the received message timestamps table would be updated
• processing wouldn't be finished (during a background poll or while handling a push notification the system can cut you off at any time)
• some of the added users don't see the new closed group because when they open the app and get the control message from their swarm it's considered a duplicate and isn't processed again
 2021-05-24 08:53:27 +10:00
Niels Andriesse
dfd3ccc5d2 Clean 2021-05-21 15:56:38 +10:00
Niels Andriesse
c0f894e1b2 Clean 2021-05-21 15:36:16 +10:00
Niels Andriesse
e0c1456af4 Merge branch 'dev' into nicknames 2021-05-21 15:21:24 +10:00