Merge lp:~ken-vandine/unity-lens-friends/libunity7-compatible_strip_links into lp:~unity-team/unity-lens-friends/libunity7-compatible

[Ken VanDine]

strip links from content, the lens can't render them

strip links from content, the lens can't render them

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-friends-libunity7-compatible-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-friends-libunity7-compatible-raring-amd64-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-friends-libunity7-compatible-ci/2/rebuild

review: Approve (continuous-integration)

[lp:~ken-vandine/unity-lens-friends/libunity7-compatible_strip_links]

58. By Ken VanDine on 2013-03-27

simplified regex

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:58
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-friends-libunity7-compatible-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-friends-libunity7-compatible-raring-amd64-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-friends-libunity7-compatible-ci/3/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Nice, simple regex. I like it ;-)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-22 18:22:23 +0000
+++ debian/changelog	2013-03-27 00:39:23 +0000
@@ -1,7 +1,4 @@
-unity-lens-friends (0.1.1bzr13.03.14-0ubuntu1) UNRELEASED; urgency=low
-
-  [ Ken VanDine ]
-  * Ported to the flatter schema
+unity-lens-friends (0.1.1bzr13.03.26-0ubuntu1) UNRELEASED; urgency=low
 
   [ James Henstridge ]
   * Require new libunity.
@@ -11,8 +8,19 @@
   * transition from gwibber lens to the friends one
   * Automatic snapshot from revision 43 (boostrap)
 
+  [ Ken VanDine ]
+  * strip links from content, the lens can't render them
+
  -- Ken VanDine <[e-mail]>  Thu, 14 Mar 2013 10:12:48 -0400
 
+unity-lens-friends (0.1.1bzr13.03.20-0ubuntu1) raring; urgency=low
+
+  * Ported to the flatter schema (LP: #1156941)
+  * debian/control
+    - depend on friends (>= 0.1.3) for schema changes (LP: #1156941)
+
+ -- Ken VanDine <[e-mail]>  Wed, 20 Mar 2013 15:46:20 -0400
+
 unity-lens-friends (0.1.1bzr13.02.25-0ubuntu1) raring; urgency=low
 
   * Dropped src/stream-model-schema.vala, the schema is defined 

=== modified file 'debian/control'
--- debian/control	2013-03-22 08:09:33 +0000
+++ debian/control	2013-03-27 00:39:23 +0000
@@ -21,6 +21,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         friends (>= 0.1.3),
 Conflicts: unity-lens-gwibber,
 Provides: unity-lens-gwibber,
 Replaces: unity-lens-gwibber,

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-03-22 06:41:51 +0000
+++ src/daemon.vala	2013-03-27 00:39:23 +0000
@@ -27,6 +27,7 @@
     /* DBus name for the place. Must match out .place file */
     const string BUS_NAME = "com.canonical.Unity.Scope.Friends";
     const string ICON_PATH = Config.DATADIR + "/icons/unity-icon-theme/places/svg/";
+    const string STRIP_LINKS = """</?a[^>]*>""";
 
     /**
      * The Daemon class implements all of the logic for the place.
@@ -520,7 +521,7 @@
                                   ResultType.PERSONAL,
                                   "text/html",
                                   GLib.Markup.escape_text (_model.get_string(iter, StreamModelColumn.SENDER)),
-                                  _model.get_string(iter, StreamModelColumn.MESSAGE),
+                                  sanitize_message (_model.get_string(iter, StreamModelColumn.MESSAGE)),
                                   uri,
                                   empty_asv);
         }
@@ -582,7 +583,7 @@
                     var likes = model.get_uint64 (iter, StreamModelColumn.LIKES);
                     var sender = model.get_string (iter, StreamModelColumn.SENDER);
                     var timestring = utils.create_time_string (model.get_string (iter, StreamModelColumn.TIMESTAMP));
-                    var content = model.get_string (iter, StreamModelColumn.MESSAGE);
+                    var content = sanitize_message (_model.get_string(iter, StreamModelColumn.MESSAGE));
                     string title = timestring;
                     preview = new Unity.SocialPreview (sender, title, content, avatar);
                     // work around bug 1058198
@@ -691,6 +692,13 @@
             return preview;
         }
 
+        private string sanitize_message (string msg)
+        {
+            var remove_links_regex = new Regex (STRIP_LINKS, RegexCompileFlags.CASELESS);
+            string _msg_cleaned = remove_links_regex.replace (msg, msg.length, 0, "");
+            return _msg_cleaned;
+        }
+
         private void parse_comments (Unity.SocialPreview preview, string _message_id)
         {
             if (_message_id != null)
@@ -706,7 +714,7 @@
                     if (_stream == _message_id)
                     {
                         debug ("stream: %s", _stream);
-                        var text = _model.get_string (iter, StreamModelColumn.MESSAGE);
+                        var text = sanitize_message (_model.get_string (iter, StreamModelColumn.MESSAGE));
                         var name = GLib.Markup.escape_text (_model.get_string (iter, StreamModelColumn.SENDER));
                         var time_string = utils.create_time_string (_model.get_string (iter, StreamModelColumn.TIMESTAMP));
                         preview.add_comment (new Unity.SocialPreview.Comment (name, name, text, time_string));