Plume
/
Plume
8
16
Çatalla 22
Kod Konular 174 Değişiklik İstekleri 8 Sürüm 8 Wiki Aktivite

Etiketler Kilometre Taşları

Edit blogs, and add blog icons and banners #460

Birleştirildi
elegaanz 5 yıl önce blog-edit içindeki 14 işlemeyi master ile birleştirdi
Sohbet 2 İşleme 14 Değiştirilen Dosyalar 41
elegaanz 5 yıl önce yorum yaptı (github.com konumundan göç edildi)

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] 5 yıl önce yorum yaptı (github.com konumundan göç edildi)

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 (github.com konumundan göç edildi) 5 yıl önce incelendi
igalic (github.com konumundan göç edildi) bir yorum yaptı

👀

👀
plume-models/src/blogs.rs
igalic (github.com konumundan göç edildi) 5 yıl önce yorum yaptı

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 (github.com konumundan göç edildi) 5 yıl önce yorum yaptı

isn't the Avatar also optional?

isn't the Avatar also optional?
trinity-1686a 5 yıl önce incelendi
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 5 yıl önce yorum yaptı
Sahibi

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 (github.com konumundan göç edildi) 5 yıl önce incelendi
plume-models/src/blogs.rs
elegaanz (github.com konumundan göç edildi) 5 yıl önce yorum yaptı

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 (github.com konumundan göç edildi) 5 yıl önce incelendi
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 (github.com konumundan göç edildi) 5 yıl önce yorum yaptı

duh, thanks!

duh, thanks!
trinity-1686a 5 yıl önce incelendi
migrations/sqlite/2019-03-06-115212_blog_images/down.sql
trinity-1686a 5 yıl önce yorum yaptı
Sahibi

👀

:eyes:
plume-models/src/blogs.rs
trinity-1686a 5 yıl önce yorum yaptı
Sahibi

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 5 yıl önce yorum yaptı
Sahibi

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 5 yıl önce yorum yaptı
Sahibi

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 5 yıl önce yorum yaptı
Sahibi

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 (github.com konumundan göç edildi) 5 yıl önce incelendi
plume-models/src/blogs.rs
igalic (github.com konumundan göç edildi) 5 yıl önce yorum yaptı

not if my pr gets merged first

not if my pr gets merged first
elegaanz (github.com konumundan göç edildi) 5 yıl önce incelendi
plume-models/src/blogs.rs
elegaanz (github.com konumundan göç edildi) 5 yıl önce yorum yaptı

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 5 yıl önce incelendi
plume-models/src/blogs.rs
trinity-1686a 5 yıl önce yorum yaptı
Sahibi

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 5 yıl önce incelendi
src/routes/blogs.rs
trinity-1686a 5 yıl önce yorum yaptı
Sahibi

Does this function actually do what it says it does?

Does this function actually do what it says it does?
elegaanz (github.com konumundan göç edildi) 5 yıl önce incelendi
src/routes/blogs.rs
elegaanz (github.com konumundan göç edildi) 5 yıl önce yorum yaptı

Looks like I pushed too fast… 😅

Looks like I pushed too fast… :sweat_smile:
trinity-1686a 5 yıl önce yorum yaptı
Sahibi

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 5 yıl önce bu değişiklikleri onayladı
trinity-1686a bir yorum yaptı
Sahibi

👍

:+1:
plume-models/src/blogs.rs
@ -47,3 +51,4 @@
pub banner_id: Option<i32>,
}
#[derive(Default, Insertable)]
trinity-1686a 5 yıl önce yorum yaptı
Sahibi

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 (github.com konumundan göç edildi) 5 yıl önce incelendi
plume-models/src/blogs.rs
@ -47,3 +51,4 @@
pub banner_id: Option<i32>,
}
#[derive(Default, Insertable)]
elegaanz (github.com konumundan göç edildi) 5 yıl önce yorum yaptı

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 5 yıl önce incelendi
plume-models/src/blogs.rs
@ -47,3 +51,4 @@
pub banner_id: Option<i32>,
}
#[derive(Default, Insertable)]
trinity-1686a 5 yıl önce yorum yaptı
Sahibi

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 (github.com konumundan göç edildi) 5 yıl önce incelendi
plume-models/src/blogs.rs
@ -47,3 +51,4 @@
pub banner_id: Option<i32>,
}
#[derive(Default, Insertable)]
igalic (github.com konumundan göç edildi) 5 yıl önce yorum yaptı

not according to our extensive tests

not according to our extensive tests
trinity-1686a 5 yıl önce incelendi
plume-models/src/blogs.rs
@ -47,3 +51,4 @@
pub banner_id: Option<i32>,
}
#[derive(Default, Insertable)]
trinity-1686a 5 yıl önce yorum yaptı
Sahibi

Test in production ™️

Test in production :tm:
elegaanz (github.com konumundan göç edildi) 5 yıl önce incelendi
plume-models/src/blogs.rs
@ -47,3 +51,4 @@
pub banner_id: Option<i32>,
}
#[derive(Default, Insertable)]
elegaanz (github.com konumundan göç edildi) 5 yıl önce yorum yaptı

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.

Gözden Geçirenler

trinity-1686a 5 yıl önce bu değişiklikleri onayladı
Değişiklik isteği bdfad844d7 olarak birleştirildi.
komut satırı talimatlarını da görüntüleyebilirsiniz.

1. Adım:

Proje deponuzdan yeni bir dala göz atın ve değişiklikleri test edin.
git checkout -b blog-edit master
git pull origin blog-edit

2. Adım:

Forgejo'daki değişiklikleri ve güncellemeleri birleştirin.
git checkout master
git merge --no-ff blog-edit
git push origin master
Bu konuşmaya katılmak için oturum aç.
Gözden Geçirenler
İnceleme iste
Değerlendirici yok
trinity-1686a
Etiketler
Etiketleri uygula
Etiketleri temizle   
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
Etiket Yok
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
Kilometre Taşı
Kilometre taşı ayarla
Kilometre Taşlarını Temizle
Öge yok
Kilometre Taşı Yok
Alpha 2
Atananlar
Kullanıcı ata
Atamaları Temizle
Atanan Kişi Yok
2 Katılımcı
Bildirimler
Bitiş Tarihi
Bitiş tarihi geçersiz veya aralık dışında. Lütfen 'yyyy-aa-gg' biçimini kullanın.

Bitiş tarihi atanmadı.

Bağımlılıklar

Bağımlılık yok.

Referans: Plume/Plume#460
Yaz Önizleme
Yükleniyor…
İptal
Kaydet
Henüz bir içerik yok.
'blog-edit' Dalını Sil

Bir dalı silmek kalıcıdır. GERİ ALINAMAZ. Devam edilsin mi?

Hayır
Evet