Merge branch 'main' of https://github.com/LeetaoGoooo/RSSAid

Author: LeetaoGoooo

lib/common/common.dart

@@ -44,6 +44,7 @@ class Common {
       httpClient.connectionTimeout = Duration(seconds: 10);
       var request = await httpClient.getUrl(uri);
       request.headers.set("User-Agent", "RSSAid");
+
       var response = await request.close();
       if (response.statusCode == HttpStatus.ok) {
         content = await response.transform(utf8.decoder).join();

lib/models/radar.dart

@@ -1,4 +1,6 @@
-class Radar {
+import 'package:equatable/equatable.dart';
+
+class Radar extends Equatable{
   String? title;
   String? path;
   bool isRssHub = true;
@@ -18,4 +20,8 @@ class Radar {
         ? []
         : json.map((value) => Radar.fromJson(value)).toList();
   }
+
+  @override
+  List<Object?> get props => [title, path];
+
 }

lib/radar/rsshub.dart

@@ -43,17 +43,17 @@ class RssHub {
       return radars;
     }
 
-    List<dynamic> rules = rssHubRules[domain][subdomain ?? "."];
+    List<dynamic>? rules = rssHubRules[domain][subdomain ?? "."];
 
-    if (rules.isEmpty) {
-      if (subdomain == "www") {
+    if (rules == null || rules.isEmpty) {
+      if (subdomain == "www" || subdomain == 'mobile' || subdomain == 'm') {
         rules = rssHubRules[domain]["."];
       } else if (subdomain!.isEmpty) {
         rules = rssHubRules[domain]['www'];
       }
     }
 
-    if (rules.isEmpty) {
+    if (rules == null || rules.isEmpty) {
       return radars;
     }
 

lib/radar/urlUtils.dart

@@ -0,0 +1,25 @@
+import 'dart:io';
+
+import 'package:rssaid/common/common.dart';
+
+class UrlUtils {
+  static getPcWebSiteUrl(String url) async {
+    try {
+      var httpClient = await new HttpClient().autoProxy();
+      httpClient.connectionTimeout = Duration(seconds: 10);
+      var request = await httpClient.getUrl(Uri.parse(url));
+      // TODO random pc user-agent
+      request.headers.set("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36");
+      request.followRedirects = false;
+      var response = await request.close();
+      if (response.isRedirect) {
+        final location = response.headers.value(HttpHeaders.locationHeader);
+        return location;
+      }
+       return url;
+    } catch (error) {
+      print('get content by url failed:$error');
+    }
+    return url;
+  }
+}

lib/views/home.dart

@@ -12,6 +12,7 @@ import 'package:rssaid/models/radar.dart';
 import 'package:rssaid/radar/rss_plus.dart';
 import 'package:rssaid/radar/rsshub.dart';
 import 'package:rssaid/radar/rule_type/page_info.dart';
+import 'package:rssaid/radar/urlUtils.dart';
 import 'package:rssaid/shared_prefs.dart';
 import 'package:rssaid/views/components/not_found.dart';
 import 'package:rssaid/views/config.dart';
@@ -149,8 +150,11 @@ class _HomePageState extends State<HomePage> {
       showToast(AppLocalizations.of(context)!.loadRulesFailed);
       return [];
     }
-    List<Radar> radarList = rssHub.getPageRSSHub(PageInfo(url: url, rules: rules));
-    return [...radarList, ...await RssPlus.detecting(url)];
+    var pcUrl = await UrlUtils.getPcWebSiteUrl(url);
+    print("pcUrl:$pcUrl");
+    List<Radar> radarList = rssHub.getPageRSSHub(PageInfo(url: pcUrl, rules: rules));
+    var radars = [...radarList, ...await RssPlus.detecting(url)];
+    return radars.toSet().toList();
   }
 
   @override

pubspec.lock

@@ -145,6 +145,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.6"
+  equatable:
+    dependency: "direct main"
+    description:
+      name: equatable
+      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.5"
   fake_async:
     dependency: transitive
     description:

pubspec.yaml

@@ -39,6 +39,7 @@ dependencies:
   package_info_plus: ^8.0.0
   any_link_preview: ^3.0.2
   tldts: ^0.0.1-beta
+  equatable: ^2.0.5
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.