Plume
/
Plume
8
16
Fork 22
Koodi Ongelmat 174 Pull-pyynnöt 8 Julkaisut 8 Wiki Toiminta

Tunnisteet Merkkipaalut

Edit blogs, and add blog icons and banners #460

Yhdistetty
elegaanz yhdistetty 14 committia lähteestä blog-edit kohteeseen master 5 vuotta sitten
Keskustelu 2 Commitit 14 Muuttuneet tiedostot 41
elegaanz kommentoi 5 vuotta sitten (Migrated from github.com)

Also adds a parameter to md_to_html to only render inline elements (so that we don't have titles or images in blog descriptions). And moves the delete button for the blog on the edition page.

I still have to update the SQLite migration once others PRs with migrations will be merged.

Also, there will be a problem when you edit a blog while not owning its banner or icon: when validating they will be reset to their default values… I don't see a good solution to this until we have a better way to handle uploads with Rocket (the same is probably happening for articles btw).

And the icon/banner are not federated yet, I don't know if I should add it to this PR or if it can come after?

image
image

Fixes #453
Fixes #454

Also adds a parameter to `md_to_html` to only render inline elements (so that we don't have titles or images in blog descriptions). And moves the delete button for the blog on the edition page. I still have to update the SQLite migration once others PRs with migrations will be merged. Also, there will be a problem when you edit a blog while not owning its banner or icon: when validating they will be reset to their default values… I don't see a good solution to this until we have a better way to handle uploads with Rocket (the same is probably happening for articles btw). And the icon/banner are not federated yet, I don't know if I should add it to this PR or if it can come after? ![image](https://user-images.githubusercontent.com/16254623/53894510-7d853300-4030-11e9-8a2c-f5c0b0c7f512.png) ![image](https://user-images.githubusercontent.com/16254623/53894539-8b3ab880-4030-11e9-8113-685a27be8d7c.png) Fixes #453 Fixes #454
codecov[bot] kommentoi 5 vuotta sitten (Migrated from github.com)

Codecov Report

Merging #460 into master will increase coverage by 0.05%.
The diff coverage is 25.26%.

@@            Coverage Diff             @@
##           master     #460      +/-   ##
==========================================
+ Coverage   26.83%   26.89%   +0.05%     
==========================================
  Files          65       65              
  Lines        8746     8966     +220     
==========================================
+ Hits         2347     2411      +64     
- Misses       6399     6555     +156
# [Codecov](https://codecov.io/gh/Plume-org/Plume/pull/460?src=pr&el=h1) Report > Merging [#460](https://codecov.io/gh/Plume-org/Plume/pull/460?src=pr&el=desc) into [master](https://codecov.io/gh/Plume-org/Plume/commit/6cd9c8a01ad8b664fe361f543bc9c6b2caf59e4a?src=pr&el=desc) will **increase** coverage by `0.05%`. > The diff coverage is `25.26%`. ```diff @@ Coverage Diff @@ ## master #460 +/- ## ========================================== + Coverage 26.83% 26.89% +0.05% ========================================== Files 65 65 Lines 8746 8966 +220 ========================================== + Hits 2347 2411 +64 - Misses 6399 6555 +156 ```
igalic (Migrated from github.com) reviewed 5 vuotta sitten
igalic (Migrated from github.com) jätti kommentin

👀

👀
plume-models/src/blogs.rs
igalic (Migrated from github.com) kommentoi 5 vuotta sitten

or all three?

or all three?
templates/blogs/details.rs.html
@ -33,0 +47,4 @@
<a class="author p-author" href="@uri!(user::details: name = &author.fqn)">@author.name()</a>}
</p>
@Html(blog.summary_html.clone())
</main>
igalic (Migrated from github.com) kommentoi 5 vuotta sitten

isn't the Avatar also optional?

isn't the Avatar also optional?
trinity-1686a reviewed 5 vuotta sitten
templates/blogs/details.rs.html
@ -33,0 +47,4 @@
<a class="author p-author" href="@uri!(user::details: name = &author.fqn)">@author.name()</a>}
</p>
@Html(blog.summary_html.clone())
</main>
trinity-1686a kommentoi 5 vuotta sitten
Omistaja

icon_url returns either the blog avatar, or the default one (see https://github.com/Plume-org/Plume/pull/460/files#diff-a4a32b57517e9459ff561610609f8044R364 )

icon_url returns either the blog avatar, or the default one (see https://github.com/Plume-org/Plume/pull/460/files#diff-a4a32b57517e9459ff561610609f8044R364 )
elegaanz (Migrated from github.com) reviewed 5 vuotta sitten
plume-models/src/blogs.rs
elegaanz (Migrated from github.com) kommentoi 5 vuotta sitten

Yes, at the time I wrote the comment summary_html was not here yet. 😁

Yes, at the time I wrote the comment `summary_html` was not here yet. :grin:
igalic (Migrated from github.com) reviewed 5 vuotta sitten
templates/blogs/details.rs.html
@ -33,0 +47,4 @@
<a class="author p-author" href="@uri!(user::details: name = &author.fqn)">@author.name()</a>}
</p>
@Html(blog.summary_html.clone())
</main>
igalic (Migrated from github.com) kommentoi 5 vuotta sitten

duh, thanks!

duh, thanks!
trinity-1686a reviewed 5 vuotta sitten
migrations/sqlite/2019-03-06-115212_blog_images/down.sql
trinity-1686a kommentoi 5 vuotta sitten
Omistaja

👀

:eyes:
plume-models/src/blogs.rs
trinity-1686a kommentoi 5 vuotta sitten
Omistaja

I find it a bit strange that one function return a default String and the other an Option (also, unwrap_or(xxx.to_string()), @igalic would get mad if it reached master

I find it a bit strange that one function return a default String and the other an Option (also, `unwrap_or(xxx.to_string())`, @igalic would get mad if it reached master
plume-models/src/comments.rs
trinity-1686a kommentoi 5 vuotta sitten
Omistaja

I'm not sure comments should be allowed to contain pictures and titles

I'm not sure comments should be allowed to contain pictures and titles
src/routes/blogs.rs
@ -173,0 +282,4 @@
blog.summary = form.summary.clone();
blog.summary_html = SafeString::new(&utils::md_to_html(&form.summary, "", true).0);
blog.icon_id = form.icon;
blog.banner_id = form.banner;
trinity-1686a kommentoi 5 vuotta sitten
Omistaja

user can provide the id of a media they don't own, or of a non-picture media

user can provide the id of a media they don't own, or of a non-picture media
templates/blogs/details.rs.html
trinity-1686a kommentoi 5 vuotta sitten
Omistaja

if let Some(banner) = blog.banner_url(ctx0) would make more sense here, so there is no unwrap_or_default

`if let Some(banner) = blog.banner_url(ctx0)` would make more sense here, so there is no unwrap_or_default
igalic (Migrated from github.com) reviewed 5 vuotta sitten
plume-models/src/blogs.rs
igalic (Migrated from github.com) kommentoi 5 vuotta sitten

not if my pr gets merged first

not if my pr gets merged first
elegaanz (Migrated from github.com) reviewed 5 vuotta sitten
plume-models/src/blogs.rs
elegaanz (Migrated from github.com) kommentoi 5 vuotta sitten

It makes sense to me that they don't have the same return type: in one case we provide a fallback URL, in the other case we just want to not display any image.

And I don't know what would be the correct way to replace this unwrap_or… 😅

It makes sense to me that they don't have the same return type: in one case we provide a fallback URL, in the other case we just want to not display any image. And I don't know what would be the correct way to replace this `unwrap_or`… :sweat_smile:
trinity-1686a reviewed 5 vuotta sitten
plume-models/src/blogs.rs
trinity-1686a kommentoi 5 vuotta sitten
Omistaja

unwrap_or_else because you're calling a function, so let's not call it if it's not necessary

`unwrap_or_else` because you're calling a function, so let's not call it if it's not necessary
trinity-1686a reviewed 5 vuotta sitten
src/routes/blogs.rs
trinity-1686a kommentoi 5 vuotta sitten
Omistaja

Does this function actually do what it says it does?

Does this function actually do what it says it does?
elegaanz (Migrated from github.com) reviewed 5 vuotta sitten
src/routes/blogs.rs
elegaanz (Migrated from github.com) kommentoi 5 vuotta sitten

Looks like I pushed too fast… 😅

Looks like I pushed too fast… :sweat_smile:
trinity-1686a kommentoi 5 vuotta sitten
Omistaja

There is no way to remove pictures once you set theme, you can just replace with something else

There is no way to remove pictures once you set theme, you can just replace with something else
trinity-1686a hyväksyi nämä muutokset 5 vuotta sitten
trinity-1686a jätti kommentin
Omistaja

👍

:+1:
plume-models/src/blogs.rs
@ -47,3 +51,4 @@
pub banner_id: Option<i32>,
}
#[derive(Default, Insertable)]
trinity-1686a kommentoi 5 vuotta sitten
Omistaja

I don't understand what this does, but apparently it did the trick

I don't understand what this does, but apparently it did the trick
elegaanz (Migrated from github.com) reviewed 5 vuotta sitten
plume-models/src/blogs.rs
@ -47,3 +51,4 @@
pub banner_id: Option<i32>,
}
#[derive(Default, Insertable)]
elegaanz (Migrated from github.com) kommentoi 5 vuotta sitten

It is an option for the #[derive(AsChangeset)], that tells diesel to consider Option fields that are None to be considered as NULL in SQL, instead of not being included in the query at all.

It is an option for the `#[derive(AsChangeset)]`, that tells diesel to consider `Option` fields that are `None` to be considered as `NULL` in SQL, instead of not being included in the query at all.
trinity-1686a reviewed 5 vuotta sitten
plume-models/src/blogs.rs
@ -47,3 +51,4 @@
pub banner_id: Option<i32>,
}
#[derive(Default, Insertable)]
trinity-1686a kommentoi 5 vuotta sitten
Omistaja

Ok, doesn't this potentially break other things that relied on it before in our code?

Ok, doesn't this potentially break other things that relied on it before in our code?
igalic (Migrated from github.com) reviewed 5 vuotta sitten
plume-models/src/blogs.rs
@ -47,3 +51,4 @@
pub banner_id: Option<i32>,
}
#[derive(Default, Insertable)]
igalic (Migrated from github.com) kommentoi 5 vuotta sitten

not according to our extensive tests

not according to our extensive tests
trinity-1686a reviewed 5 vuotta sitten
plume-models/src/blogs.rs
@ -47,3 +51,4 @@
pub banner_id: Option<i32>,
}
#[derive(Default, Insertable)]
trinity-1686a kommentoi 5 vuotta sitten
Omistaja

Test in production ™️

Test in production :tm:
elegaanz (Migrated from github.com) reviewed 5 vuotta sitten
plume-models/src/blogs.rs
@ -47,3 +51,4 @@
pub banner_id: Option<i32>,
}
#[derive(Default, Insertable)]
elegaanz (Migrated from github.com) kommentoi 5 vuotta sitten

Ok, doesn't this potentially break other things that relied on it before in our code?

It only affects the AsChangeset implementation, which is used when UPDATEing blogs, so I think it is the only place we are doing that.

> Ok, doesn't this potentially break other things that relied on it before in our code? It only affects the `AsChangeset` implementation, which is used when `UPDATE`ing blogs, so I think it is the only place we are doing that.

Reviewers

trinity-1686a hyväksyi nämä muutokset 5 vuotta sitten
The pull request has been merged as bdfad844d7.
You can also view command line instructions.

Vaihe 1:

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

Vaihe 2:

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff blog-edit
git push origin master
Sign in to join this conversation.
Reviewers
Request review
No reviewers
trinity-1686a
Tunnisteet
Aseta tunniste
Tyhjennä tunnisteet   
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
Ei tunnistetta
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
Merkkipaalu
Aseta merkkipaalu
Tyhjennä merkkipaalu
Ei kohteita
Ei merkkipaalua
Alpha 2
Käsittelijä
Osoita käyttäjille
Tyhjennä käsittelijä
Ei käsittelijää
2 osallistujaa
Ilmoitukset
Määräpäivä
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

Määräpäivää ei asetettu.

Riippuvuudet

Riippuvuuksia ei asetettu.

Reference: Plume/Plume#460
Kirjoita Esikatselu
Ladataan…
Peruuta
Tallenna
Sisältöä ei vielä ole.
Poista haara 'blog-edit'

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

Ei
Kyllä