|
|
@@ -9,6 +9,8 @@ use App\Http\Requests\StoreMessageCommentRequest;
|
|
|
use App\Http\Requests\UpdatemessageRequest;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Support\Facades\DB;
|
|
|
+use Illuminate\Support\Facades\File;
|
|
|
+use Illuminate\Support\Facades\Storage;
|
|
|
|
|
|
class MessageController extends Controller
|
|
|
{
|
|
|
@@ -41,7 +43,7 @@ class MessageController extends Controller
|
|
|
* @param \App\Http\Requests\StoremessageRequest $request
|
|
|
* @return \Illuminate\Http\Response
|
|
|
*/
|
|
|
- public function store(StoremessageRequest $request)
|
|
|
+ public function store(Request $request)
|
|
|
{
|
|
|
//
|
|
|
$preview = "";
|
|
|
@@ -51,18 +53,15 @@ class MessageController extends Controller
|
|
|
$preview = strip_tags($preview);
|
|
|
$preview = mb_substr($preview, 0, 55) . "...";
|
|
|
}
|
|
|
- $imageName = time() . '.' . $request->thumbnail->extension();
|
|
|
-
|
|
|
- // Public Folder
|
|
|
- $request->thumbnail->move(public_path('images'), $imageName);
|
|
|
-
|
|
|
+ $path = $request->file('thumbnail')->store('public');
|
|
|
+ $url = Storage::url($path);
|
|
|
$message_comment = Message::create([
|
|
|
'title' => $request->title,
|
|
|
'content' => $request->content,
|
|
|
'author_id' => $request->User()->id,
|
|
|
'preview' => $preview,
|
|
|
'tag' => $request->tag,
|
|
|
- 'thumbnail' => $imageName,
|
|
|
+ 'thumbnail' => $url,
|
|
|
'created_at' => now(),
|
|
|
]);
|
|
|
return $message_comment;
|
|
|
@@ -134,10 +133,12 @@ class MessageController extends Controller
|
|
|
$preview = mb_substr($preview, 0, 55) . "...";
|
|
|
}
|
|
|
if (is_string($request->thumbnail)) {
|
|
|
- $imageName = $request->thumbnail;
|
|
|
+ $url = $request->thumbnail;
|
|
|
} else {
|
|
|
- $imageName = time() . '.' . $request->thumbnail->extension();
|
|
|
- $request->thumbnail->move(public_path('images'), $imageName);
|
|
|
+ $thumbnail = Message::where('id', $request->id)->get()[0]->thumbnail;
|
|
|
+ $path = $request->file('thumbnail')->store('public');
|
|
|
+ $url = Storage::url($path);
|
|
|
+ File::delete($thumbnail);
|
|
|
}
|
|
|
|
|
|
$message = Message::where('id', $request->id)
|
|
|
@@ -147,7 +148,7 @@ class MessageController extends Controller
|
|
|
'content' => $request->content,
|
|
|
'preview' => $preview,
|
|
|
'tag' => $request->tag,
|
|
|
- 'thumbnail' => $imageName,
|
|
|
+ 'thumbnail' => $url,
|
|
|
'updated_at' => now(),
|
|
|
]);
|
|
|
if ($message == 0) {
|
|
|
@@ -164,10 +165,22 @@ class MessageController extends Controller
|
|
|
*/
|
|
|
public function destroy(Request $request, Message $message)
|
|
|
{
|
|
|
- //
|
|
|
- $message = Message::where('id', $request->id)->delete();
|
|
|
+ $thumbnail = Message::where('id', $request->id)->get()[0]->thumbnail;
|
|
|
+ // if ($request->user()->tokenCan('Admin')) {
|
|
|
+ // $message = Message::where('id', $request->id)->delete();
|
|
|
+ // } else if ($request->user()->tokenCan('User')) {
|
|
|
+ // $message = Message::where('id', $request->id)
|
|
|
+ // ->where('author_id', $request->User()->id)->delete();
|
|
|
+ // } else {
|
|
|
+ // abort(403, '你沒有刪除此貼文的權限!');
|
|
|
+ // }
|
|
|
+ //$message > 0 && !
|
|
|
+ if (!str_contains($thumbnail, 'http')) {
|
|
|
+ Storage::delete($thumbnail);
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
- return $message;
|
|
|
+ return $thumbnail;
|
|
|
}
|
|
|
|
|
|
public function count()
|