From 7d726dbb0c2c4dd34b2274a587010d13e20ea37b Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 30 Jun 2019 13:33:33 -0400
Subject: [PATCH] Improve Module\Admin\Item\Source

- Use router parameter
- Accept full URLs with GUID in form
- Fix 500 error when item with guid doesn't exist
---
 src/Module/Admin/Item/Source.php | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/Module/Admin/Item/Source.php b/src/Module/Admin/Item/Source.php
index e35eafd2f2..f736582fa7 100644
--- a/src/Module/Admin/Item/Source.php
+++ b/src/Module/Admin/Item/Source.php
@@ -33,15 +33,7 @@ class Source extends BaseAdmin
 	{
 		parent::content($parameters);
 
-		$a = DI::app();
-
-		$guid = null;
-		// @TODO: Replace with parameter from router
-		if (!empty($a->argv[3])) {
-			$guid = $a->argv[3];
-		}
-
-		$guid = $_REQUEST['guid'] ?? $guid;
+		$guid = basename($_REQUEST['guid'] ?? '') ?: $parameters['guid'];
 
 		$source = '';
 		$item_uri = '';
@@ -50,12 +42,14 @@ class Source extends BaseAdmin
 		if (!empty($guid)) {
 			$item = Model\Item::selectFirst(['id', 'uri-id', 'guid', 'uri'], ['guid' => $guid]);
 
-			$conversation = Model\Conversation::getByItemUri($item['uri']);
+			if ($item) {
+				$conversation = Model\Conversation::getByItemUri($item['uri']);
 
-			$item_id = $item['id'];
-			$item_uri = $item['uri'];
-			$source = $conversation['source'];
-			$terms = Model\Tag::getByURIId($item['uri-id'], [Model\Tag::HASHTAG, Model\Tag::MENTION, Model\Tag::IMPLICIT_MENTION]);
+				$item_id = $item['id'];
+				$item_uri = $item['uri'];
+				$source = $conversation['source'];
+				$terms = Model\Tag::getByURIId($item['uri-id'], [Model\Tag::HASHTAG, Model\Tag::MENTION, Model\Tag::IMPLICIT_MENTION]);
+			}
 		}
 
 		$tpl = Renderer::getMarkupTemplate('admin/item/source.tpl');