continuwuation/continuwuity
continuwuation/continuwuity
14
108
Fork 117
Code Issues 129 Pull requests 23 Releases 35 Packages 3 Activity Actions

Ability to load connection_uri from a file #1790

Open
Allinen wants to merge 4 commits from Allinen/continuwuity:main into main
pull from: Allinen/continuwuity:main
merge into: continuwuation:main
Conversation 4 Commits 4 Files changed 5 +46 -5
Allinen commented 2026-05-20 09:31:53 +00:00
First-time contributor
Copy link

This pull request adds a new config option connection_uri_file, which does the same as connection_uri except loads it from a file. connection_uri is prioritized over the file.

Fixes: #1694

Pull request checklist:

  • This pull request targets the main branch, and the branch is named something other than
    main.
  • I have written an appropriate pull request title and my description is clear.
  • I understand I am responsible for the contents of this pull request.
  • I have followed the contributing guidelines:
This pull request adds a new config option `connection_uri_file`, which does the same as `connection_uri` except loads it from a file. `connection_uri` is prioritized over the file. Fixes: [#1694][issue] **Pull request checklist:** - [x] This pull request targets the `main` branch, and the branch is named something other than `main`. - [x] I have written an appropriate pull request title and my description is clear. - [x] I understand I am responsible for the contents of this pull request. - I have followed the [contributing guidelines][c1]: - [x] My contribution follows the [code style][c2], if applicable. - [x] I ran [pre-commit checks][c1pc] before opening/drafting this pull request. - [x] I have [tested my contribution][c1t] (or proof-read it for documentation-only changes) myself, if applicable. This includes ensuring code compiles. - [x] My commit messages follow the [commit message format][c1cm] and are descriptive. [issue]: https://forgejo.ellis.link/continuwuation/continuwuity/issues/1694 [c1]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md [c2]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/docs/development/code_style.mdx [c1pc]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#pre-commit-checks [c1t]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#running-tests-locally [c1cm]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#commit-messages
style: fix typo
Some checks failed
Auto Labeler / Apply labels based on changed files (pull_request_target) Successful in 4s
Details
Checks / Changelog / Check changelog is added (pull_request_target) Failing after 10s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been cancelled
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
Details
Checks / Prek / Check changed files (pull_request) Has been cancelled
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
1ce4d783f3
chore: added changelog.d
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 31s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been cancelled
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
Details
Checks / Prek / Check changed files (pull_request) Has been cancelled
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
b5b74bc083
ginger requested changes 2026-05-20 16:05:06 +00:00
Dismissed
src/core/config/check.rs Outdated
@ -255,2 +255,4 @@
}
if config.smtp.as_ref().is_some_and(|f| {
f.connection_uri.is_none() && f.connection_uri_file.is_none()
ginger commented 2026-05-20 16:01:10 +00:00
Owner
Copy link

These checks can use is_none_or(|v| v.is_empty())

These checks can use `is_none_or(|v| v.is_empty())`
src/core/config/mod.rs Outdated
@ -2311,0 +2311,4 @@
/// Same as `connection_uri`, except loaded from a file. If `connection_uri`
/// is defined, it is prioritized and `connection_uri_file` is ignored
pub connection_uri_file: Option<PathBuf>,
ginger commented 2026-05-20 16:01:34 +00:00
Owner
Copy link

This should end in a period, and should state that the file is only read once when the server starts, similar to the docs for registration_token_file.

This should end in a period, and should state that the file is only read once when the server starts, similar to [the docs for `registration_token_file`](https://forgejo.ellis.link/continuwuation/continuwuity/src/commit/ba2c123e820597067dc2e3e02dd1ff59b921e0a1/src/core/config/mod.rs#L636-L638).
src/service/mailer/mod.rs Outdated
@ -33,0 +27,4 @@
.as_ref()
.map(|config| -> Result<_> {
let connection_uri: String =
if let Some(uri) = &config.connection_uri {
ginger commented 2026-05-20 16:02:35 +00:00
Owner
Copy link

nit: This would be more clear as a match where (None, None) => unreachable!()

nit: This would be more clear as a `match` where `(None, None) => unreachable!()`
refactor: cleaned up code
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 30s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 29s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 50s
Details
222e9a8c27
Allinen commented 2026-05-20 18:59:36 +00:00
Author
First-time contributor
Copy link

thank you for the feedback, I am fairly new to rust so this is valuable information.

This should end in a period

Should the formatter config not be modified to automagically do this if it is a requirement?

Regardless, I have made the requested changes (hopefully) in the correct way

thank you for the feedback, I am fairly new to rust so this is valuable information. > This should end in a period Should the formatter config not be modified to automagically do this if it is a requirement? Regardless, I have made the requested changes (hopefully) in the correct way
ginger approved these changes 2026-05-27 13:08:05 +00:00
ginger commented 2026-06-04 02:32:46 +00:00
Owner
Copy link

@Allinen this has merge conflicts with main, those need to be resolved before this can be merged

@Allinen this has merge conflicts with main, those need to be resolved before this can be merged
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 30s
Required
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Required
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 29s
Required
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 50s
Required
Details
This pull request has changes conflicting with the target branch.
  • src/core/config/check.rs
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u main:Allinen-main
git switch Allinen-main
Sign in to join this conversation.
Reviewers
No reviewers
ginger
Labels
Clear labels   
Abandoned
This pull request appears to be abandoned by its author.

  
Blocked
This pull request or issue is currently blocked from being merged/closed

  
Bug
Something isn't working as intended

  
Changelog
Added
 Changelog entry added

  
Changelog
Missing
 No changelog when one is needed

  
Changelog
None
 Changelog is unnecesary for this change

  
Cherry-picking
Commits picked from other conduit projects

  
Database
This requires or includes changes to the database

  
Dependencies
Something dependency related

  
Dependencies/Renovate
Automatic dependency upgrades by Renovate

  
Difficulty
Easy
 Low difficulty to implement - touches few parts of the codebase, low complexity

  
Difficulty
Hard
 High difficulty to implement - touches many parts of the codebase, high complexity

  
Difficulty
Medium
 Medium difficulty to implement - touches more parts of the codebase, higher complexity

  
Documentation
Improvements or additions to documentation

  
Enhancement
New feature or request

  
Good first issue
Good for newcomers

  
Help wanted
Additional eyes and keyboards are required for this one

  
Inherited
Issues that have been inhereted from the project pre-fork

  
Matrix/Administration
Features pertaining to homeserver administration

  
Matrix/Appservices
Features pertaining to the appservice API

  
Matrix/Auth
Features pertaining to authentication

  
Matrix/Client
Features pertaining to client-to-server interactions

  
Matrix/Core
Issues relating to core matrix functionality, such as state resolution and PDU formats

  
Matrix/E2EE
Issues related to end to end encryption

  
Matrix/Federation
Features pertaining to server-to-server interactions

  
Matrix/Hydra
Issues related to room version 12 and related changes (temporary label)

  
Matrix/MSC
Features pertaining to unstable matrix features

  
Matrix/Media
Features pertaining to media interactions

  
Matrix/T&S
Changes or issues related to trust & safety tooling

  
Merge
This PR is ready to be merged

  
Merge/Manual
This PR should be manually merged

  
Merge/Squash
This PR should be squashed when it is merged

  
Meta
Related to housekeeping, maintenance, or other repo-meta.

  
Meta/CI
Issues related to CI changes

  
Meta/Packaging
Packaging

  
Priority
Blocking
 This issue is blocking the next release

  
Priority
High
 This issue is very important

  
Priority
Low
 This issue is of a rather low priority

  
Security
This item is related to general security

  
Status
Confirmed
 This issue has enough information and is confirmed

  
Status
Duplicate
 This issue or pull request already exists

  
Status
Invalid
 This issue doesn't seem right

  
Status
Needs Investigation
 This issue needs further investigation

  
Support
Questions or support requests

  
bob the builder
pdu logic rewrite starring nexus nicholson

No labels
Abandoned
Blocked
Bug
Changelog
Added
Changelog
Missing
Changelog
None
Cherry-picking
Database
Dependencies
Dependencies/Renovate
Difficulty
Easy
Difficulty
Hard
Difficulty
Medium
Documentation
Enhancement
Good first issue
Help wanted
Inherited
Matrix/Administration
Matrix/Appservices
Matrix/Auth
Matrix/Client
Matrix/Core
Matrix/E2EE
Matrix/Federation
Matrix/Hydra
Matrix/MSC
Matrix/Media
Matrix/T&S
Merge
Merge/Manual
Merge/Squash
Meta
Meta/CI
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
Support
bob the builder
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
continuwuation/continuwuity!1790
No description provided.