add some more safety checks before turning the conversation request messages back on

2 files changed, 6 insertions, 4 deletions

diff --git a/include/photos.php b/include/photos.php
index badbbd791..adb7c988a 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -178,7 +178,7 @@ function photo_upload($channel, $observer, $args) {
 	if($args['title'])
 		$p['title'] = $args['title'];
 	if($args['description'])
-		$p['desciprion'] = $args['description'];
+		$p['description'] = $args['description'];
 
 
 	$r1 = $ph->save($p);
diff --git a/include/zot.php b/include/zot.php
index 24ace9cbb..153fa28bf 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1448,11 +1448,13 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
 				// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
 				// Also don't do this if this comment came from a conversation request packet. It's possible that comments are allowed but posting
 				// isn't and that could cause a conversation fetch loop. We can detect these packets since they are delivered via a 'notify' packet type 
-				// that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request). 
+				// that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request).
+				// We'll also check the send_stream permission, because if it isn't allowed the top level post is unlikely to be imported and
+				// this is just an exercise in futility.   
 
-				if((! $relay) && (! $request))
+				if((! $relay) && (! $request) && (! $public) && perm_is_allowed($channel['channel_id'],$sender['hash'],'send_stream')) {
 					proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
-
+				}
 				continue;
 			}
 			if($relay) {