matched common mobile subdomains to '.' in utils.js;

added related test case
getuniv · Sep 18, 2020 · 146d4ec · 146d4ec
1 parent 5e64472
commit 146d4ec
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/RSSBudTests/RSSBudTests.swift b/RSSBudTests/RSSBudTests.swift
@@ -85,6 +85,36 @@ class RSSBudTests: XCTestCase {
         wait(for: [expectation], timeout: 3.0)
     }
 
+    func testMobileSubdomains() {
+        RSSHub.Radar.rulesCenter.setRules(RSSHub.Radar.rulesCenter.bundledRules())
+
+        let expectation1 = XCTestExpectation(description: "Detect the feed from the url containing a mobile subdomain.")
+        let urlString1 = "https://m.zhaishuyuan.com/book/38082"
+        let url1 = URLComponents(autoPercentEncoding: urlString1)!
+
+        RSSHub.Radar.detecting(url: url1)
+            .sink { _ in
+
+            } receiveValue: { feeds in
+                XCTAssertEqual(feeds.count, 1, "Unexpected feed count.")
+                expectation1.fulfill()
+            }.store(in: &self.cancelBag)
+
+        let expectation2 = XCTestExpectation(description: "Detect the feed from the url containing a mobile subdomain.")
+        let urlString2 = "https://mobile.twitter.com/SwiftUILab"
+        let url2 = URLComponents(autoPercentEncoding: urlString2)!
+
+        RSSHub.Radar.detecting(url: url2)
+            .sink { _ in
+
+            } receiveValue: { feeds in
+                XCTAssertEqual(feeds.count, 3, "Unexpected feed count.")
+                expectation2.fulfill()
+            }.store(in: &self.cancelBag)
+
+        wait(for: [expectation1, expectation2], timeout: 6.0)
+    }
+
     func testRSSHubRadarRulesConsistency() {
         let expectation = XCTestExpectation(description: "Remote rules are equal to bundled rules.")
 

diff --git a/Shared/RSSHub Radar/radar-rules.js b/Shared/RSSHub Radar/radar-rules.js
@@ -1674,7 +1674,7 @@ var rules = ({
     },
     'zhaishuyuan.com': {
         _name: '斋书苑',
-        www: [
+        '.': [
             {
                 title: '最新章节',
                 docs: 'https://docs.rsshub.app/reading.html#zhai-shu-yuan',

diff --git a/Shared/RSSHub Radar/utils.js b/Shared/RSSHub Radar/utils.js
@@ -54,7 +54,7 @@ function getPageRSSHub(data) {
         if (rules[domain]) {
             let rule = rules[domain][subdomain || '.'];
             if (!rule) {
-                if (subdomain === 'www') {
+                if (subdomain === 'www' || subdomain === 'mobile' || subdomain === 'm') {
                     rule = rules[domain]['.'];
                 } else if (!subdomain) {
                     rule = rules[domain].www;