From ab3db8c89971fc6148fbc8e0c031f9518c280bf1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 21 Feb 2010 16:20:30 -0500
Subject: Combine code that finds mentions into one place and add hook points

Combined the code that finds mentions of other profiles into one place.

common_find_mentions() finds mentions and calls hooks to allow
supplemental syntax for mentions (like OStatus).

common_linkify_mentions() links mentions.

common_linkify_mention() links a mention.

Notice::saveReplies() now uses common_find_mentions() instead of
trying to parse everything again.
---
 EVENTS.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'EVENTS.txt')

diff --git a/EVENTS.txt b/EVENTS.txt
index c108606ce..d3c2fb7bf 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -748,3 +748,18 @@ EndDisfavorNotice: After saving a notice as a favorite
 - $profile: profile of the person faving (can be remote!)
 - $notice: notice being faved
 
+StartFindMentions: start finding mentions in a block of text
+- $sender: sender profile
+- $text: plain text version of the notice
+- &$mentions: mentions found so far. Array of arrays; each array
+  has 'mentioned' (array of mentioned profiles), 'url' (url to link as),
+  'title' (title of the link), 'position' (position of the text to
+  replace), 'text' (text to replace)
+
+EndFindMentions: end finding mentions in a block of text
+- $sender: sender profile
+- $text: plain text version of the notice
+- &$mentions: mentions found so far. Array of arrays; each array
+  has 'mentioned' (array of mentioned profiles), 'url' (url to link as),
+  'title' (title of the link), 'position' (position of the text to
+  replace), 'text' (text to replace)
-- 
cgit v1.2.3-54-g00ecf


From 8ccc9e2c386824c71aca2da7ae311d2787338483 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Mon, 22 Feb 2010 17:03:28 +0100
Subject: Added before and after event hooks for subscriptions content

---
 EVENTS.txt                |  6 ++++++
 actions/subscriptions.php | 43 ++++++++++++++++++++++++-------------------
 2 files changed, 30 insertions(+), 19 deletions(-)

(limited to 'EVENTS.txt')

diff --git a/EVENTS.txt b/EVENTS.txt
index d3c2fb7bf..c387274c0 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -763,3 +763,9 @@ EndFindMentions: end finding mentions in a block of text
   has 'mentioned' (array of mentioned profiles), 'url' (url to link as),
   'title' (title of the link), 'position' (position of the text to
   replace), 'text' (text to replace)
+
+StartShowSubscriptionsContent: before showing the subscriptions content
+- $action: the current action
+
+EndShowSubscriptionsContent: after showing the subscriptions content
+- $action: the current action
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 0ef31aa9f..ba6171ef4 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -79,32 +79,37 @@ class SubscriptionsAction extends GalleryAction
 
     function showContent()
     {
-        parent::showContent();
+        if (Event::handle('StartShowSubscriptionsContent', array($this))) {
+            parent::showContent();
 
-        $offset = ($this->page-1) * PROFILES_PER_PAGE;
-        $limit =  PROFILES_PER_PAGE + 1;
+            $offset = ($this->page-1) * PROFILES_PER_PAGE;
+            $limit =  PROFILES_PER_PAGE + 1;
 
-        $cnt = 0;
+            $cnt = 0;
 
-        if ($this->tag) {
-            $subscriptions = $this->user->getTaggedSubscriptions($this->tag, $offset, $limit);
-        } else {
-            $subscriptions = $this->user->getSubscriptions($offset, $limit);
-        }
+            if ($this->tag) {
+                $subscriptions = $this->user->getTaggedSubscriptions($this->tag, $offset, $limit);
+            } else {
+                $subscriptions = $this->user->getSubscriptions($offset, $limit);
+            }
 
-        if ($subscriptions) {
-            $subscriptions_list = new SubscriptionsList($subscriptions, $this->user, $this);
-            $cnt = $subscriptions_list->show();
-            if (0 == $cnt) {
-                $this->showEmptyListMessage();
+            if ($subscriptions) {
+                $subscriptions_list = new SubscriptionsList($subscriptions, $this->user, $this);
+                $cnt = $subscriptions_list->show();
+                if (0 == $cnt) {
+                    $this->showEmptyListMessage();
+                }
             }
-        }
 
-        $subscriptions->free();
+            $subscriptions->free();
+
+            $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
+                              $this->page, 'subscriptions',
+                              array('nickname' => $this->user->nickname));
 
-        $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
-                          $this->page, 'subscriptions',
-                          array('nickname' => $this->user->nickname));
+
+            Event::handle('EndShowSubscriptionsContent', array($this));
+        }
     }
 
     function showScripts()
-- 
cgit v1.2.3-54-g00ecf