forked from GNUsocial/gnu-social
		
	Start using NoParentNoticeException more widely
This commit is contained in:
		@@ -1311,7 +1311,7 @@ class Notice extends Managed_DataObject
 | 
			
		||||
                    $last = $parent;
 | 
			
		||||
                    continue;
 | 
			
		||||
                }
 | 
			
		||||
            } catch (Exception $e) {
 | 
			
		||||
            } catch (NoParentNoticeException $e) {
 | 
			
		||||
                // Latest notice has no parent
 | 
			
		||||
            }
 | 
			
		||||
            // No parent, or parent out of scope
 | 
			
		||||
@@ -1617,7 +1617,7 @@ class Notice extends Managed_DataObject
 | 
			
		||||
            $this->saveReply($parentauthor->id);
 | 
			
		||||
            $replied[$parentauthor->id] = 1;
 | 
			
		||||
            self::blow('reply:stream:%d', $parentauthor->id);
 | 
			
		||||
        } catch (Exception $e) {
 | 
			
		||||
        } catch (NoParentNoticeException $e) {
 | 
			
		||||
            // Not a reply, since it has no parent!
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
@@ -1852,7 +1852,7 @@ class Notice extends Managed_DataObject
 | 
			
		||||
                $reply = $this->getParent();
 | 
			
		||||
                $ctx->replyToID  = $reply->getUri();
 | 
			
		||||
                $ctx->replyToUrl = $reply->getUrl();
 | 
			
		||||
            } catch (Exception $e) {
 | 
			
		||||
            } catch (NoParentNoticeException $e) {
 | 
			
		||||
                // This is not a reply to something
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -328,7 +328,7 @@ class ApiAction extends Action
 | 
			
		||||
            // different story for parenting.
 | 
			
		||||
            $parent = $notice->getParent();
 | 
			
		||||
            $in_reply_to = $parent->id;
 | 
			
		||||
        } catch (Exception $e) {
 | 
			
		||||
        } catch (NoParentNoticeException $e) {
 | 
			
		||||
            $in_reply_to = null;
 | 
			
		||||
        }
 | 
			
		||||
        $twitter_status['in_reply_to_status_id'] = $in_reply_to;
 | 
			
		||||
 
 | 
			
		||||
@@ -380,7 +380,7 @@ abstract class ImPlugin extends Plugin
 | 
			
		||||
            $parent = $notice->getParent();
 | 
			
		||||
            $orig_profile = $parent->getProfile();
 | 
			
		||||
            $nicknames = sprintf('%1$s => %2$s', $profile->nickname, $orig_profile->nickname);
 | 
			
		||||
        } catch (Exception $e) {
 | 
			
		||||
        } catch (NoParentNoticeException $e) {
 | 
			
		||||
            $nicknames = $profile->nickname;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -725,8 +725,8 @@ function common_find_mentions($text, Notice $notice)
 | 
			
		||||
                }
 | 
			
		||||
            } catch (NoProfileException $e) {
 | 
			
		||||
                common_log(LOG_WARNING, sprintf('Notice %d author profile id %d does not exist', $origNotice->id, $origNotice->profile_id));
 | 
			
		||||
            } catch (ServerException $e) {
 | 
			
		||||
                // Probably just no parent. Should get a specific NoParentException
 | 
			
		||||
            } catch (NoParentNoticeException $e) {
 | 
			
		||||
                // This notice is not in reply to anything
 | 
			
		||||
            } catch (Exception $e) {
 | 
			
		||||
                common_log(LOG_WARNING, __METHOD__ . ' got exception ' . get_class($e) . ' : ' . $e->getMessage());
 | 
			
		||||
            }
 | 
			
		||||
 
 | 
			
		||||
@@ -354,7 +354,7 @@ class XmppPlugin extends ImPlugin
 | 
			
		||||
            $xs->text(": ");
 | 
			
		||||
        } catch (InvalidUrlException $e) {
 | 
			
		||||
            $xs->text(sprintf(' => %s', $orig_profile->nickname));
 | 
			
		||||
        } catch (Exception $e) {
 | 
			
		||||
        } catch (NoParentNoticeException $e) {
 | 
			
		||||
            $xs->text(": ");
 | 
			
		||||
        }
 | 
			
		||||
        if (!empty($notice->rendered)) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user