Plume
/
Plume
8
16
Fork 22
Code Issues 174 Pull Requests 8 Releases 8 Wiki Activity

Labels Milestones

Add some feedback when performing some actions #552

Merged
elegaanz merged 7 commits from action-feedback into master 5 years ago
Conversation 6 Commits 7 Files Changed 40
elegaanz commented 5 years ago (Migrated from github.com)

Here is an example of what it looks like (this is just a test, in reality you can only have one of these messages at the same time):

Screenshot_2019-04-27 Plume unu ⋅ Plume

I don't know if there is a simpler way to do it. Also, I added msg: Option<FlashMessage> to almost all routes to be sure that if a message was present it would be rendered, but maybe it is not necessary and only make the code harder to read? And maybe msg should go in PlumeRocket as it is used almost everywhere?

Fixes #468

Here is an example of what it looks like (this is just a test, in reality you can only have one of these messages at the same time): ![Screenshot_2019-04-27 Plume unu ⋅ Plume](https://user-images.githubusercontent.com/16254623/56852089-77178700-690e-11e9-88fc-acb089b58fef.png) I don't know if there is a simpler way to do it. Also, I added `msg: Option<FlashMessage>` to almost all routes to be sure that if a message was present it would be rendered, but maybe it is not necessary and only make the code harder to read? And maybe `msg` should go in `PlumeRocket` as it is used almost everywhere? Fixes #468
👍 1
codecov[bot] commented 5 years ago (Migrated from github.com)

Codecov Report

Merging #552 into master will increase coverage by 0.02%.
The diff coverage is 5.12%.

@@            Coverage Diff             @@
##           master     #552      +/-   ##
==========================================
+ Coverage   44.08%   44.11%   +0.02%     
==========================================
  Files          68       68              
  Lines        7937     7984      +47     
==========================================
+ Hits         3499     3522      +23     
- Misses       4438     4462      +24
# [Codecov](https://codecov.io/gh/Plume-org/Plume/pull/552?src=pr&el=h1) Report > Merging [#552](https://codecov.io/gh/Plume-org/Plume/pull/552?src=pr&el=desc) into [master](https://codecov.io/gh/Plume-org/Plume/commit/787eb7f3992e43e7a149288f3378c90dd4fe4bf8?src=pr&el=desc) will **increase** coverage by `0.02%`. > The diff coverage is `5.12%`. ```diff @@ Coverage Diff @@ ## master #552 +/- ## ========================================== + Coverage 44.08% 44.11% +0.02% ========================================== Files 68 68 Lines 7937 7984 +47 ========================================== + Hits 3499 3522 +23 - Misses 4438 4462 +24 ```
trinity-1686a commented 5 years ago
Owner

And maybe msg should go in PlumeRocket as it is used almost everywhere?

Considering how it must be everywhere, I think it can go in PlumeRocket, as well as in template BaseContext. Also BaseContext could implement From<PlumeRocket> so it is easier to build and reduce duplication

> And maybe `msg` should go in `PlumeRocket` as it is used almost everywhere? Considering how it must be everywhere, I think it can go in `PlumeRocket`, as well as in template `BaseContext`. Also `BaseContext` could implement `From<PlumeRocket>` so it is easier to build and reduce duplication
👍 1 🚀 1
igalic (Migrated from github.com) reviewed 5 years ago
igalic (Migrated from github.com) left a comment

maybe we should hold on committing the translations in such prs?

do then regularly elsewhere

maybe we should hold on committing the translations in such prs? do then regularly elsewhere
po/plume/hr.po
igalic (Migrated from github.com) commented 5 years ago

this is supposed to be

Ti nisi autor ovog(a?) bloga

but i just realised that fuzzy means it was auto translated…

this is supposed to be > Ti nisi autor ovog(a?) bloga but i just realised that fuzzy means it was auto translated…
elegaanz commented 5 years ago (Migrated from github.com)

@igalic I don't really know… it is true it pollutes a little bit the diff, but at the same time it makes sense to have them with the change in the interface.

@igalic I don't really know… it is true it pollutes a little bit the diff, but at the same time it makes sense to have them with the change in the interface.
elegaanz (Migrated from github.com) reviewed 5 years ago
po/plume/hr.po
elegaanz (Migrated from github.com) commented 5 years ago

Yes, it was auto-translated. Once it will be on Crowdin, you will be able to fix it. 😉

Yes, it was auto-translated. Once it will be on Crowdin, you will be able to fix it. :wink:
trinity-1686a commented 5 years ago
Owner

I'd be to not pollute pr with this, and have something that autocommit the changes once a week, or after each merge

I'd be to not pollute pr with this, and have something that autocommit the changes once a week, or after each merge
👍 1
trinity-1686a reviewed 5 years ago
trinity-1686a left a comment
Owner

👀

:eyes:
src/template_utils.rs
@ -17,0 +27,4 @@
&Connection,
&Catalog,
Option<User>,
Option<(String, String)>,
trinity-1686a commented 5 years ago
Owner

why not implementing From<PlumeRocket> for Context? It will auto implement Into<Context> for PlumeRocket, and you should be able to use into() with no need to import this trait everywhere

why not implementing `From<PlumeRocket>` for Context? It will auto implement `Into<Context>` for PlumeRocket, and you should be able to use `into()` with no need to import this trait everywhere
elegaanz (Migrated from github.com) reviewed 5 years ago
src/template_utils.rs
@ -17,0 +27,4 @@
&Connection,
&Catalog,
Option<User>,
Option<(String, String)>,
elegaanz (Migrated from github.com) commented 5 years ago

Because Rust is complaining about the fact that all the parameters of the trait comes from another crate, and that it could cause conflicts, while I don't think it can? 🤷‍♀️ But yeah, I tried it, and it doesn't work.

Because Rust is complaining about the fact that all the parameters of the trait comes from another crate, and that it could cause conflicts, while I don't think it can? :woman_shrugging: But yeah, I tried it, and it doesn't work.
trinity-1686a reviewed 5 years ago
src/template_utils.rs
@ -17,0 +27,4 @@
&Connection,
&Catalog,
Option<User>,
Option<(String, String)>,
trinity-1686a commented 5 years ago
Owner

ho, it's because BaseContext is not a true struct but a typedef to a tuple of basic types (in theory it could cause conflict, because the exact same trait can be implemented in plume-model, thus creating a conflict). This mean we can either convert BaseContext to be a true type, or implement Into in plume-models. I've tried the first one, but it requires some small but ugly changes so I'm not sure it would be better (you can take a look at the patch here)

ho, it's because BaseContext is not a true struct but a typedef to a tuple of basic types (in theory it could cause conflict, because the exact same trait can be implemented in plume-model, thus creating a conflict). This mean we can either convert BaseContext to be a true type, or implement Into in plume-models. I've tried the first one, but it requires some small but ugly changes so I'm not sure it would be better (you can take a look at the patch [here](https://framadrop.org/r/aXcBuKkLEW#rzbPsNSdq+XCFboTnRLdY8Qt3RNqqUYGgrnA8bfUoQQ=))
trinity-1686a approved these changes 5 years ago
trinity-1686a left a comment
Owner

👍

:+1:
elegaanz commented 5 years ago (Migrated from github.com)

Do you want me to apply your patch before merging?

Do you want me to apply your patch before merging?
trinity-1686a commented 5 years ago
Owner

It was just to show what I came up with, but having &(&rockets).into() everywhere is definitely worse than importing a trait

It was just to show what I came up with, but having `&(&rockets).into()` everywhere is definitely worse than importing a trait
👍 1

Reviewers

trinity-1686a approved these changes 5 years ago
The pull request has been merged as 8f1ab3485e.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b action-feedback master
git pull origin action-feedback

Step 2:

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff action-feedback
git push origin master
Sign in to join this conversation.
Reviewers
Request review
No reviewers
trinity-1686a
Labels
Apply labels
Clear labels   
A: API

Related to the REST API   
A: Backend

Code running on the server   
A: Federation

Stuff related to Federation   
A: Front-End

Related to the front-end   
A: I18N

Translations, and related code   
A: Meta

More about project management or code than the project itself   
A: Security
   
Build

The building, or installation process of Plume   
C: Bug

Something isn't working   
C: Discussion

We need to talk   
C: Enhancement

New feature or request   
C: Feature

This is a new feature   
Compatibility

Compatibility with different browsers, readers and OS   
Dependency

Related to an external package that Plume uses   
Design

UI/UX related issues and PRs   
Documentation
   
Good first issue

Good for newcomers   
Help welcome

Extra attention is needed   
Mobile

Issues affecting only mobile UX   
Rendering

How elements're rendered out for the end user   
S: Blocked

Something else needs to be fixed first   
S: Duplicate

This issue or pull request already exists   
S: Incomplete

This PR is not complete yet   
S: Instance specific

Issues concern a limited number of instances   
S: Invalid

This doesn't seem right   
S: Needs Voting/Discussion

Need to be discussed by the community (on Loomio)   
S: Ready for review

This PR is ready to be reviewed   
Suggestion

Proposed ideas worth considering   
S: Voted on Loomio

This is issue has been created after a vote on Loomio   
S: Wontfix

This will not be worked on
No Label
A: API
A: Backend
A: Federation
A: Front-End
A: I18N
A: Meta
A: Security
Build
C: Bug
C: Discussion
C: Enhancement
C: Feature
Compatibility
Dependency
Design
Documentation
Good first issue
Help welcome
Mobile
Rendering
S: Blocked
S: Duplicate
S: Incomplete
S: Instance specific
S: Invalid
S: Needs Voting/Discussion
S: Ready for review
Suggestion
S: Voted on Loomio
S: Wontfix
Milestone
Set milestone
Clear milestone
No items
No Milestone
Assignees
Assign users
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: Plume/Plume#552
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'action-feedback'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes