Merge pull request #1954 from pixelfed/staging

Update Story model, hide json attribute by default

CHANGELOG.md

@@ -13,6 +13,8 @@
 
 ### Updated
 - Updated presenter components, load fallback image on errors ([273170c5](https://github.com/pixelfed/pixelfed/commit/273170c5))
+- Updated Story model, hide json attribute by default ([de89403c](https://github.com/pixelfed/pixelfed/commit/de89403c))
+- Updated compose view, add deprecation notice for v3 ([57e155b9](https://github.com/pixelfed/pixelfed/commit/57e155b9))
 
 ### Changed
 

app/Story.php

@@ -30,6 +30,8 @@ class Story extends Model
 
 	protected $visible = ['id'];
 
+	protected $hidden = ['json'];
+
 	public function profile()
 	{
 		return $this->belongsTo(Profile::class);

resources/views/status/compose.blade.php

@@ -5,6 +5,11 @@
 <div class="compose-container container mt-5 d-none">
 	<div class="row">
 		<div class="col-12 col-md-6 offset-md-3">
+			<div class="alert alert-info text-center">
+				<span class="font-weight-bold">ComposeUI v3 is deprecated</span>
+				<br>
+				It will be removed after June 1st, 2020
+			</div>
 			<p class="lead text-center">
 				<a href="javascript:void(0)" class="btn btn-primary font-weight-bold" data-toggle="modal" data-target="#composeModal">Compose New Post</a>
 			</p>