From 55ce3bdb1ec5277d6001c338adcdb97607472fd5 Mon Sep 17 00:00:00 2001
From: imlonghao <imlonghao@users.noreply.github.com>
Date: Sun, 20 Jan 2019 22:21:34 +0800
Subject: [PATCH] Fix zhihu and dribbble guid conflict (#1428)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

问题路由：

```
/zhihu/collection/26444956
/dribbble/user/google
/dribbble/keyword/player
```
---
 lib/routes/dribbble/utils.js   | 6 +++++-
 lib/routes/zhihu/collection.js | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/routes/dribbble/utils.js b/lib/routes/dribbble/utils.js
index 78c360306..26775f175 100644
--- a/lib/routes/dribbble/utils.js
+++ b/lib/routes/dribbble/utils.js
@@ -36,7 +36,11 @@ module.exports = {
                                 <strong>Views:</strong> ${item.find('.views').text()}<br>
                                 <strong>Comment:</strong> ${item.find('.cmnt').text()}<br>
                                 <strong>Favor:</strong> ${item.find('.fav').text()}`,
-                            link: `https://dribbble.com${item.find('.dribbble-link').attr('href')}`,
+                            link: `https://dribbble.com${item.find('.animated-target').attr('href') ||
+                                item
+                                    .find('.extras > a')
+                                    .attr('href')
+                                    .replace('/rebounds', '')}`,
                         };
                     })
                     .get(),
diff --git a/lib/routes/zhihu/collection.js b/lib/routes/zhihu/collection.js
index 4c30447e9..8bcd5ee30 100644
--- a/lib/routes/zhihu/collection.js
+++ b/lib/routes/zhihu/collection.js
@@ -27,7 +27,10 @@ module.exports = async (ctx) => {
             list
                 .map((index, item) => {
                     item = $(item);
-                    let linkUrl = item.find('link').attr('href') || '';
+                    let linkUrl = item
+                        .find('a.meta-item')
+                        .not('a.toggle-comment')
+                        .attr('href');
                     if (linkUrl.startsWith('/')) {
                         linkUrl = 'https://www.zhihu.com' + linkUrl;
                     }